Revert head and try linking directly to corecel and adding debug

sethrj · Jan 23, 2024 · c05e096 · c05e096
1 parent 6ae1056
commit c05e096
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/cmake/CeleritasLibrary.cmake b/cmake/CeleritasLibrary.cmake
@@ -635,7 +635,7 @@ endfunction()
 # the 3 libraries (static, middle, final) libraries needed
 # for a separatable CUDA library
 function(celeritas_target_link_libraries target)
-  if(NOT CMAKE_CUDA_COMPILER)
+  if(NOT CMAKE_CUDA_COMPILER OR NOT CELERITAS_USE_VecGeom)
     target_link_libraries(${ARGV})
     return()
   endif()

diff --git a/example/accel/CMakeLists.txt b/example/accel/CMakeLists.txt
@@ -8,6 +8,8 @@ cmake_minimum_required(VERSION 3.18)
 project(CeleritasAccelExample VERSION 0.0.1 LANGUAGES CXX)
 cmake_policy(VERSION 3.12...3.22)
 
+set(CMAKE_DEBUG_TARGET_PROPERTIES LINK_DIRECTORIES)
+
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/..")
 find_package(Celeritas 0.5 REQUIRED)
 find_package(Geant4 REQUIRED)

diff --git a/example/minimal/CMakeLists.txt b/example/minimal/CMakeLists.txt
@@ -12,6 +12,10 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/..")
 find_package(Celeritas 0.5 REQUIRED)
 
 add_executable(minimal minimal.cc)
+target_link_libraries(minimal
+  Celeritas::corecel
+)
+
 
 # Use special linking macros to support CUDA RDC across multiple libraries when
 # using VecGeom.

diff --git a/scripts/ci/test-examples.sh b/scripts/ci/test-examples.sh
@@ -31,12 +31,6 @@ build_local() {
   ninja
 }
 
-cd "${CELER_INSTALL_DIR}/lib64/cmake/Celeritas"
-for f in Celeritas* ; do
-  echo "********** $f ***********"
-  cat $f
-done
-
 cd "${CELER_SOURCE_DIR}/example/minimal"
 build_local
 ./minimal