Adapt to CudaRdcUtils

CMakeLists.txt

@@ -247,20 +247,22 @@ target_include_directories(CopCore
     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/>
 )
 
-add_library(AdePT_G4_integration SHARED
+cuda_rdc_add_library(AdePT_G4_integration SHARED
   ${ADEPT_G4_INTEGRATION_SRCS}
 )
-target_include_directories(AdePT_G4_integration
+cuda_rdc_target_include_directories(AdePT_G4_integration
   PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/>
 )
+# This needs to be after the cuda_rdc_target_include_directories when
+# using v10 of CudaRdcUtils.cmake
+cuda_rdc_add_library(AdePT::AdePT_G4_integration ALIAS AdePT_G4_integration)
 
-target_link_libraries(AdePT_G4_integration
+cuda_rdc_target_link_libraries(AdePT_G4_integration
   PUBLIC
     CopCore
     VecGeom::vecgeom
-    VecGeom::vecgeomcuda_static
     VecGeom::vgdml
     ${Geant4_LIBRARIES}
     G4HepEm::g4HepEm
@@ -272,18 +274,18 @@ target_link_libraries(AdePT_G4_integration
 )
 if(ADEPT_USE_EXT_BFIELD)
   # link covfie if external magnetic field usage is enabled
-  target_link_libraries(AdePT_G4_integration
+  cuda_rdc_target_link_libraries(AdePT_G4_integration
     PUBLIC
       covfie::core
       covfie::cuda
   )
 endif()
 
-set_target_properties(AdePT_G4_integration
-  PROPERTIES
-    CUDA_SEPARABLE_COMPILATION ON
-    CUDA_RESOLVE_DEVICE_SYMBOLS ON
-)
+#set_target_properties(AdePT_G4_integration
+#  PROPERTIES
+#    CUDA_SEPARABLE_COMPILATION ON
+#    CUDA_RESOLVE_DEVICE_SYMBOLS ON
+#)
 
 option(ASYNC_MODE OFF "Enable the async transport backend")
 if(ASYNC_MODE)
@@ -318,7 +320,7 @@ configure_package_config_file(cmake/${PROJECT_NAME}Config.cmake.in
 )
 
 #Install the libraries
-install(TARGETS CopCore AdePT_G4_integration
+cuda_rdc_install(TARGETS CopCore AdePT_G4_integration
   EXPORT ${PROJECT_NAME}Targets
   ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
   LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"

examples/AsyncExample/CMakeLists.txt

@@ -58,7 +58,7 @@ add_library(ExamplesCommon OBJECT
 )
 
 target_include_directories(ExamplesCommon PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../common/include)
-target_link_libraries(ExamplesCommon PUBLIC AdePT_G4_integration)
+cuda_rdc_target_link_libraries(ExamplesCommon PUBLIC AdePT_G4_integration)
 target_compile_options(ExamplesCommon PRIVATE -Wall -Wextra)
 
 if(HepMC3_FOUND)

examples/Example1/CMakeLists.txt

@@ -57,7 +57,7 @@ target_include_directories(example1
     ${PROJECT_SOURCE_DIR}/examples/common/include
     ${HEPMC3_INCLUDE_DIR}
 )
-target_link_libraries(example1
+cuda_rdc_target_link_libraries(example1
   PRIVATE
     ${HEPMC3_LIBRARIES}
     ${HEPMC3_FIO_LIBRARIES}

examples/IntegrationBenchmark/CMakeLists.txt

@@ -58,7 +58,7 @@ target_include_directories(integrationBenchmark
     ${PROJECT_SOURCE_DIR}/examples/common/include
     ${HEPMC3_INCLUDE_DIR}
 )
-target_link_libraries(integrationBenchmark
+cuda_rdc_target_link_libraries(integrationBenchmark
   PRIVATE
     AdePT_G4_integration
     ${HEPMC3_LIBRARIES}
@@ -81,4 +81,4 @@ add_test(NAME testEm3_validation
     COMMAND bash ${PROJECT_SOURCE_DIR}/examples/IntegrationBenchmark/ci_tests/validation_testem3.sh
     "$<TARGET_FILE:integrationBenchmark>" "${PROJECT_BINARY_DIR}" "${PROJECT_SOURCE_DIR}"
     WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-)
+)

test/CMakeLists.txt

@@ -8,8 +8,8 @@ macro(build_tests TESTS)
   foreach(TEST ${TESTS})
     get_filename_component(TARGET_NAME ${TEST} NAME_WE)
     add_executable(${TARGET_NAME} ${TEST})
-    set_target_properties(${TARGET_NAME} PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
-    target_link_libraries(${TARGET_NAME} AdePT_G4_integration)
+    #set_target_properties(${TARGET_NAME} PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
+    cuda_rdc_target_link_libraries(${TARGET_NAME} AdePT_G4_integration)
    endforeach()
 endmacro()
 

test/testField/CMakeLists.txt

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2021 CERN
 # SPDX-License-Identifier: Apache-2.0
 
-SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--disable-new-dtags")
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--disable-new-dtags")
 
 if(NOT TARGET G4HepEm::g4HepEm)
   message(STATUS "Disabling testField (needs G4HepEm)")
@@ -31,30 +31,28 @@ target_include_directories(testField
     $<BUILD_INTERFACE:${Geant4_INCLUDE_DIRS}>
     $<BUILD_INTERFACE:${G4HepEm_INCLUDE_DIR}>
 )
-target_link_libraries(testField
+cuda_rdc_target_link_libraries(testField
   PRIVATE
     CopCore
     VecGeom::vecgeom
-    VecGeom::vecgeomcuda_static
     VecGeom::vgdml
     ${Geant4_LIBRARIES}
     ${G4HepEm_LIBRARIES}
-    CUDA::cudart
 )
 if(ADEPT_USE_EXT_BFIELD)
   # link covfie if external magnetic field usage is enabled
-  target_link_libraries(testField 
+  cuda_rdc_target_link_libraries(testField
     PRIVATE
       covfie::core
       covfie::cuda
   )
 endif()
 
-set_target_properties(testField 
-  PROPERTIES 
-    CUDA_SEPARABLE_COMPILATION ON 
-    CUDA_RESOLVE_DEVICE_SYMBOLS ON
-)
+#set_target_properties(testField 
+#  PROPERTIES 
+#    CUDA_SEPARABLE_COMPILATION ON 
+#    CUDA_RESOLVE_DEVICE_SYMBOLS ON
+#)
 
 # Tests
 add_test(NAME testField