[CMake] Fix compile definitions a little

make UMF_VERSION a common umf definition, to be used everywhere.

Author: ldorau

src/CMakeLists.txt

@@ -4,6 +4,11 @@
 
 include(${UMF_CMAKE_SOURCE_DIR}/cmake/helpers.cmake)
 
+# Compile definitions for UMF library.
+#
+# TODO: Cleanup the compile definitions across all the CMake files
+set(UMF_COMMON_COMPILE_DEFINITIONS UMF_VERSION=${UMF_VERSION})
+
 if(UMF_BUILD_LEVEL_ZERO_PROVIDER)
     include(FetchContent)
 
@@ -78,11 +83,6 @@ set(UMF_SOURCES_MACOSX libumf_linux.c)
 
 set(UMF_SOURCES_WINDOWS libumf_windows.c)
 
-# Compile definitions for UMF library.
-#
-# TODO: Cleanup the compile definitions across all the CMake files
-set(UMF_PRIVATE_COMPILE_DEFINITIONS UMF_VERSION=${UMF_VERSION})
-
 set(UMF_SOURCES_COMMON_LINUX_MACOSX
     provider/provider_os_memory.c
     provider/provider_os_memory_posix.c
@@ -128,8 +128,8 @@ if(UMF_BUILD_SHARED_LIBRARY)
         LIBS ${UMF_LIBS} hwloc
         LINUX_MAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/libumf.map
         WINDOWS_DEF_FILE ${CMAKE_CURRENT_BINARY_DIR}/libumf.def)
-    set(UMF_PRIVATE_COMPILE_DEFINITIONS ${UMF_PRIVATE_COMPILE_DEFINITIONS}
-                                        "UMF_SHARED_LIBRARY")
+    set(UMF_COMMON_COMPILE_DEFINITIONS ${UMF_COMMON_COMPILE_DEFINITIONS}
+                                       "UMF_SHARED_LIBRARY")
     set_target_properties(
         umf
         PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_UMF_OUTPUT_DIRECTORY}
@@ -149,7 +149,7 @@ endif()
 
 target_link_directories(umf PRIVATE ${UMF_PRIVATE_LIBRARY_DIRS})
 
-target_compile_definitions(umf PRIVATE ${UMF_PRIVATE_COMPILE_DEFINITIONS})
+target_compile_definitions(umf PRIVATE ${UMF_COMMON_COMPILE_DEFINITIONS})
 
 if(UMF_BUILD_LEVEL_ZERO_PROVIDER)
     target_sources(umf PRIVATE provider/provider_level_zero.c)

src/pool/CMakeLists.txt

@@ -4,10 +4,11 @@
 
 if(UMF_BUILD_SHARED_LIBRARY)
     set(POOL_EXTRA_SRCS ${BA_SOURCES})
-    set(POOL_COMPILE_DEFINITIONS UMF_SHARED_LIBRARY)
     set(POOL_EXTRA_LIBS $<BUILD_INTERFACE:umf_utils>)
 endif()
 
+set(POOL_COMPILE_DEFINITIONS ${UMF_COMMON_COMPILE_DEFINITIONS})
+
 # libumf_pool_disjoint
 if(UMF_BUILD_LIBUMF_POOL_DISJOINT)
     add_umf_library(

src/proxy_lib/CMakeLists.txt

@@ -39,7 +39,7 @@ add_library(${PROJECT_NAME}::proxy ALIAS umf_proxy)
 
 target_link_directories(umf_proxy PRIVATE ${LIBHWLOC_LIBRARY_DIRS})
 
-target_compile_definitions(umf_proxy PRIVATE UMF_VERSION=${UMF_VERSION})
+target_compile_definitions(umf_proxy PRIVATE ${UMF_COMMON_COMPILE_DEFINITIONS})
 
 if(PROXY_LIB_USES_SCALABLE_POOL)
     target_compile_definitions(umf_proxy PRIVATE PROXY_LIB_USES_SCALABLE_POOL=1)

src/utils/CMakeLists.txt

@@ -54,8 +54,8 @@ target_include_directories(
 if(USE_VALGRIND)
     set(UMF_UTILS_INTERFACE_DEFS "UMF_VG_ENABLED=1")
 endif()
-if(WINDOWS)
-    set(UMF_UTILS_INTERFACE_DEFS ${UMF_UTILS_INTERFACE_DEFS}
-                                 "UMF_VERSION=${UMF_VERSION}")
-endif()
+
+set(UMF_UTILS_INTERFACE_DEFS ${UMF_UTILS_INTERFACE_DEFS}
+                             ${UMF_COMMON_COMPILE_DEFINITIONS})
+
 target_compile_definitions(umf_utils INTERFACE ${UMF_UTILS_INTERFACE_DEFS})