omnitrace-compile-definitions (CMake) [skip ci] (#43)

source/lib/common/CMakeLists.txt

@@ -19,4 +19,4 @@ get_filename_component(COMMON_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" DIRECTOR
 
 target_include_directories(omnitrace-common-library INTERFACE ${COMMON_INCLUDE_DIR})
 target_compile_definitions(omnitrace-common-library
-                           INTERFACE $<BUILD_INTERFACE:OMNITRACE_INTERNAL_BUILD>)
+                           INTERFACE $<BUILD_INTERFACE:OMNITRACE_INTERNAL_BUILD=1>)

source/lib/omnitrace-dl/CMakeLists.txt

@@ -13,8 +13,10 @@ add_library(omnitrace::omnitrace-dl-library ALIAS omnitrace-dl-library)
 
 target_sources(omnitrace-dl-library PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/dl.cpp
                                             ${CMAKE_CURRENT_SOURCE_DIR}/dl.hpp)
-target_link_libraries(omnitrace-dl-library
-                      PUBLIC ${dl_LIBRARY} $<BUILD_INTERFACE:omnitrace::common-library>)
+target_link_libraries(
+    omnitrace-dl-library
+    PUBLIC ${dl_LIBRARY} $<BUILD_INTERFACE:omnitrace::common-library>
+           $<BUILD_INTERFACE:omnitrace::omnitrace-compile-definitions>)
 target_include_directories(
     omnitrace-dl-library
     PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
@@ -34,10 +36,6 @@ if(OMNITRACE_BUILD_DEVELOPER)
     endif()
 endif()
 
-omnitrace_target_compile_definitions(
-    omnitrace-dl-library
-    PUBLIC $<BUILD_INTERFACE:OMNITRACE_USE_OMPT=$<BOOL:${OMNITRACE_USE_OMPT}>>)
-
 set_target_properties(
     omnitrace-dl-library
     PROPERTIES OUTPUT_NAME omnitrace-dl

source/lib/omnitrace-user/CMakeLists.txt

@@ -19,6 +19,8 @@ target_sources(
 target_include_directories(
     omnitrace-user-library PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
                                   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+target_link_libraries(omnitrace-user-library
+                      PRIVATE $<BUILD_INTERFACE:omnitrace::omnitrace-compile-definitions>)
 
 check_cxx_compiler_flag("-fno-exceptions" omnitrace_user_library_fno_exceptions)
 check_cxx_compiler_flag("-ftls-model=local-dynamic"

source/lib/omnitrace/CMakeLists.txt

@@ -24,6 +24,7 @@ target_link_libraries(
         $<BUILD_INTERFACE:omnitrace::omnitrace-headers>
         $<BUILD_INTERFACE:omnitrace::omnitrace-threading>
         $<BUILD_INTERFACE:omnitrace::omnitrace-compile-options>
+        $<BUILD_INTERFACE:omnitrace::omnitrace-compile-definitions>
         $<BUILD_INTERFACE:omnitrace::omnitrace-hip>
         $<BUILD_INTERFACE:omnitrace::omnitrace-roctracer>
         $<BUILD_INTERFACE:omnitrace::omnitrace-rocm-smi>