Merge pull request #395 from igchor/private_compile_defs

Make compile definitions for libumf and pool private

Author: bratpiorka

src/CMakeLists.txt

@@ -70,7 +70,7 @@ set(UMF_SOURCES_WINDOWS libumf_windows.c)
 # Compile definitions for UMF library.
 #
 # TODO: Cleanup the compile definitions across all the CMake files
-set(UMF_PUBLIC_COMPILE_DEFINITIONS "")
+set(UMF_PRIVATE_COMPILE_DEFINITIONS "")
 
 set(UMF_SOURCES_LINUX
     ${UMF_SOURCES_LINUX}
@@ -106,8 +106,8 @@ if(UMF_BUILD_SHARED_LIBRARY)
         LIBS ${UMF_LIBS}
         LINUX_MAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/libumf.map
         WINDOWS_DEF_FILE ${CMAKE_CURRENT_SOURCE_DIR}/libumf.def)
-    set(UMF_PUBLIC_COMPILE_DEFINITIONS ${UMF_PUBLIC_COMPILE_DEFINITIONS}
-                                       "UMF_SHARED_LIBRARY")
+    set(UMF_PRIVATE_COMPILE_DEFINITIONS ${UMF_PRIVATE_COMPILE_DEFINITIONS}
+                                        "UMF_SHARED_LIBRARY")
     set_target_properties(umf PROPERTIES RUNTIME_OUTPUT_DIRECTORY
                                          ${CMAKE_UMF_OUTPUT_DIRECTORY})
 else()
@@ -119,13 +119,13 @@ else()
 endif()
 
 if(UMF_ENABLE_POOL_TRACKING)
-    set(UMF_PUBLIC_COMPILE_DEFINITIONS ${UMF_PUBLIC_COMPILE_DEFINITIONS}
-                                       "UMF_ENABLE_POOL_TRACKING")
+    set(UMF_PRIVATE_COMPILE_DEFINITIONS ${UMF_PRIVATE_COMPILE_DEFINITIONS}
+                                        "UMF_ENABLE_POOL_TRACKING")
 endif()
 
 target_link_directories(umf PRIVATE ${UMF_PRIVATE_LIBRARY_DIRS})
 
-target_compile_definitions(umf PUBLIC ${UMF_PUBLIC_COMPILE_DEFINITIONS})
+target_compile_definitions(umf PRIVATE ${UMF_PRIVATE_COMPILE_DEFINITIONS})
 
 if(UMF_BUILD_LEVEL_ZERO_PROVIDER)
     target_sources(umf PRIVATE provider/provider_level_zero.c)

src/pool/CMakeLists.txt

@@ -15,7 +15,8 @@ if(UMF_BUILD_LIBUMF_POOL_DISJOINT)
         TYPE STATIC
         SRCS pool_disjoint.cpp ${POOL_EXTRA_SRCS}
         LIBS ${POOL_EXTRA_LIBS})
-    target_compile_definitions(disjoint_pool PUBLIC ${POOL_COMPILE_DEFINITIONS})
+    target_compile_definitions(disjoint_pool
+                               PRIVATE ${POOL_COMPILE_DEFINITIONS})
 
     add_library(${PROJECT_NAME}::disjoint_pool ALIAS disjoint_pool)
 
@@ -39,7 +40,8 @@ if(UMF_BUILD_LIBUMF_POOL_JEMALLOC)
         SRCS pool_jemalloc.c ${POOL_EXTRA_SRCS}
         LIBS jemalloc ${POOL_EXTRA_LIBS})
     target_include_directories(jemalloc_pool PRIVATE ${JEMALLOC_INCLUDE_DIRS})
-    target_compile_definitions(jemalloc_pool PUBLIC ${POOL_COMPILE_DEFINITIONS})
+    target_compile_definitions(jemalloc_pool
+                               PRIVATE ${POOL_COMPILE_DEFINITIONS})
     add_library(${PROJECT_NAME}::jemalloc_pool ALIAS jemalloc_pool)
     install(TARGETS jemalloc_pool EXPORT ${PROJECT_NAME}-targets)
 endif()
@@ -58,7 +60,8 @@ if(UMF_BUILD_LIBUMF_POOL_SCALABLE)
         SRCS pool_scalable.c ${POOL_EXTRA_SRCS}
         LIBS ${LIBS_POOL_SCALABLE})
     target_include_directories(scalable_pool PRIVATE ${TBB_INCLUDE_DIRS})
-    target_compile_definitions(scalable_pool PUBLIC ${POOL_COMPILE_DEFINITIONS})
+    target_compile_definitions(scalable_pool
+                               PRIVATE ${POOL_COMPILE_DEFINITIONS})
     add_library(${PROJECT_NAME}::scalable_pool ALIAS scalable_pool)
     install(TARGETS scalable_pool EXPORT ${PROJECT_NAME}-targets)
 endif()