Merge pull request #163 from DARMA-tasking/150-cmake-use-per-target-link-and-compilation-properties

#150: [CMake] Use per target link and compilation properties

Author: lifflander

CMakeLists.txt

@@ -48,28 +48,28 @@ if(APPLE AND NOT CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
   add_compile_options(-ffat-lto-objects)
 endif()
 
-add_definitions(-DVT_TV_N_THREADS=${VT_TV_N_THREADS})
-add_compile_definitions(SRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
-add_compile_definitions(BUILD_DIR="${CMAKE_BINARY_DIR}")
-if(VT_TV_OPENMP_ENABLED)
-  add_definitions(-DVT_TV_OPENMP_ENABLED=1)
-else()
-  add_definitions(-DVT_TV_OPENMP_ENABLED=0)
-endif()
-
-add_custom_target(vt_tv_examples)
-if (VT_TV_TESTS_ENABLED)
-  add_custom_target(vt_tv_tests)
-endif()
-add_custom_target(vt_tv_apps)
-
 set(PROJECT_BIN_DIR      ${CMAKE_CURRENT_BINARY_DIR})
 set(PROJECT_BASE_DIR     ${CMAKE_CURRENT_SOURCE_DIR})
 set(PROJECT_LIB_DIR      ${CMAKE_CURRENT_SOURCE_DIR}/lib)
 set(PROJECT_EXAMPLE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/examples)
 set(PROJECT_APP_DIR      ${CMAKE_CURRENT_SOURCE_DIR}/apps)
 set(PROJECT_BINDINGS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/bindings)
 
+function(add_vttv_definitions TARGET)
+  target_compile_definitions(${TARGET}
+    PRIVATE
+      VT_TV_N_THREADS=${VT_TV_N_THREADS}
+      SRC_DIR="${PROJECT_BASE_DIR}"
+      BUILD_DIR="${CMAKE_BINARY_DIR}"
+  )
+
+  if(VT_TV_OPENMP_ENABLED)
+    target_compile_definitions(${TARGET} PRIVATE VT_TV_OPENMP_ENABLED=1)
+  else()
+    target_compile_definitions(${TARGET} PRIVATE VT_TV_OPENMP_ENABLED=0)
+  endif()
+endfunction(add_vttv_definitions TARGET)
+
 add_subdirectory(src)
 link_openmp()
 add_subdirectory(examples)

apps/CMakeLists.txt

@@ -52,6 +52,8 @@ foreach(APP_FULL ${PROJECT_APPS})
     ${VT_TV_LIBRARY_NS}
   )
 
+  add_vttv_definitions(${APP})
+
   vtk_module_autoinit(
     TARGETS ${APP}
     MODULES ${VTK_LIBRARIES}

bindings/python/CMakeLists.txt

@@ -14,6 +14,7 @@ nanobind_add_module(vttv ${PYTHON_BINDING_SRCS} tv.cc)
 
 # .. Link it to necessary libraries
 target_link_libraries(vttv PUBLIC ${VT_TV_LIBRARY_NS} ${JSON_LIBRARY} ${FMT_LIBRARY})
+add_vttv_definitions(vttv)
 
 vtk_module_autoinit(
   TARGETS vttv

cmake/load_openmp.cmake

@@ -1,9 +1,6 @@
 find_package(OpenMP)
 if (OPENMP_FOUND)
   message(STATUS "Found OpenMP")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
 else ()
   message(STATUS "Did not find OpenMP")
   set(VT_TV_OPENMP_ENABLED OFF)

src/CMakeLists.txt

@@ -108,6 +108,8 @@ target_include_directories(
   $<INSTALL_INTERFACE:include>
 )
 
+add_vttv_definitions(${VT_TV_LIBRARY})
+
 install(
   TARGETS                   ${VT_TV_LIBRARY}
   EXPORT                    ${VT_TV_LIBRARY}

tests/unit/CMakeLists.txt

@@ -65,3 +65,4 @@ vtk_module_autoinit(
 
 vt_tv_link_target(AllTests)
 gtest_discover_tests(AllTests)
+add_vttv_definitions(AllTests)