Skip to content

Commit 9161d52

Browse files
committed
Make compile definitions for libumf and pool private
They are only intended to be used by umf itself. Making them public makes them visible to the users of umf which is not desired.
1 parent af5050f commit 9161d52

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

src/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ set(UMF_SOURCES_WINDOWS libumf_windows.c)
7070
# Compile definitions for UMF library.
7171
#
7272
# TODO: Cleanup the compile definitions across all the CMake files
73-
set(UMF_PUBLIC_COMPILE_DEFINITIONS "")
73+
set(UMF_PRIVATE_COMPILE_DEFINITIONS "")
7474

7575
set(UMF_SOURCES_LINUX
7676
${UMF_SOURCES_LINUX}
@@ -106,8 +106,8 @@ if(UMF_BUILD_SHARED_LIBRARY)
106106
LIBS ${UMF_LIBS}
107107
LINUX_MAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/libumf.map
108108
WINDOWS_DEF_FILE ${CMAKE_CURRENT_SOURCE_DIR}/libumf.def)
109-
set(UMF_PUBLIC_COMPILE_DEFINITIONS ${UMF_PUBLIC_COMPILE_DEFINITIONS}
110-
"UMF_SHARED_LIBRARY")
109+
set(UMF_PRIVATE_COMPILE_DEFINITIONS ${UMF_PRIVATE_COMPILE_DEFINITIONS}
110+
"UMF_SHARED_LIBRARY")
111111
set_target_properties(umf PROPERTIES RUNTIME_OUTPUT_DIRECTORY
112112
${CMAKE_UMF_OUTPUT_DIRECTORY})
113113
else()
@@ -119,13 +119,13 @@ else()
119119
endif()
120120

121121
if(UMF_ENABLE_POOL_TRACKING)
122-
set(UMF_PUBLIC_COMPILE_DEFINITIONS ${UMF_PUBLIC_COMPILE_DEFINITIONS}
123-
"UMF_ENABLE_POOL_TRACKING")
122+
set(UMF_PRIVATE_COMPILE_DEFINITIONS ${UMF_PRIVATE_COMPILE_DEFINITIONS}
123+
"UMF_ENABLE_POOL_TRACKING")
124124
endif()
125125

126126
target_link_directories(umf PRIVATE ${UMF_PRIVATE_LIBRARY_DIRS})
127127

128-
target_compile_definitions(umf PUBLIC ${UMF_PUBLIC_COMPILE_DEFINITIONS})
128+
target_compile_definitions(umf PRIVATE ${UMF_PRIVATE_COMPILE_DEFINITIONS})
129129

130130
if(UMF_BUILD_LEVEL_ZERO_PROVIDER)
131131
target_sources(umf PRIVATE provider/provider_level_zero.c)

src/pool/CMakeLists.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ if(UMF_BUILD_LIBUMF_POOL_DISJOINT)
1515
TYPE STATIC
1616
SRCS pool_disjoint.cpp ${POOL_EXTRA_SRCS}
1717
LIBS ${POOL_EXTRA_LIBS})
18-
target_compile_definitions(disjoint_pool PUBLIC ${POOL_COMPILE_DEFINITIONS})
18+
target_compile_definitions(disjoint_pool
19+
PRIVATE ${POOL_COMPILE_DEFINITIONS})
1920

2021
add_library(${PROJECT_NAME}::disjoint_pool ALIAS disjoint_pool)
2122

@@ -39,7 +40,8 @@ if(UMF_BUILD_LIBUMF_POOL_JEMALLOC)
3940
SRCS pool_jemalloc.c ${POOL_EXTRA_SRCS}
4041
LIBS jemalloc ${POOL_EXTRA_LIBS})
4142
target_include_directories(jemalloc_pool PRIVATE ${JEMALLOC_INCLUDE_DIRS})
42-
target_compile_definitions(jemalloc_pool PUBLIC ${POOL_COMPILE_DEFINITIONS})
43+
target_compile_definitions(jemalloc_pool
44+
PRIVATE ${POOL_COMPILE_DEFINITIONS})
4345
add_library(${PROJECT_NAME}::jemalloc_pool ALIAS jemalloc_pool)
4446
install(TARGETS jemalloc_pool EXPORT ${PROJECT_NAME}-targets)
4547
endif()
@@ -58,7 +60,8 @@ if(UMF_BUILD_LIBUMF_POOL_SCALABLE)
5860
SRCS pool_scalable.c ${POOL_EXTRA_SRCS}
5961
LIBS ${LIBS_POOL_SCALABLE})
6062
target_include_directories(scalable_pool PRIVATE ${TBB_INCLUDE_DIRS})
61-
target_compile_definitions(scalable_pool PUBLIC ${POOL_COMPILE_DEFINITIONS})
63+
target_compile_definitions(scalable_pool
64+
PRIVATE ${POOL_COMPILE_DEFINITIONS})
6265
add_library(${PROJECT_NAME}::scalable_pool ALIAS scalable_pool)
6366
install(TARGETS scalable_pool EXPORT ${PROJECT_NAME}-targets)
6467
endif()

0 commit comments

Comments
 (0)