Skip to content

Commit

Permalink
Update to new celeritas and RDC utilities (#4)
Browse files Browse the repository at this point in the history
  • Loading branch information
sethrj authored Feb 16, 2024
1 parent b2fa6ca commit 5164c81
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
7 changes: 4 additions & 3 deletions external/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@ include(FetchContent)
FetchContent_Declare(
Celeritas
EXCLUDE_FROM_ALL
URL https://github.com/celeritas-project/celeritas/archive/052ac4cd74abc0a6805f2a4168b4683bb589bb59.zip
URL https://github.com/celeritas-project/celeritas/archive/0f74ea935d72bed23b82fad98402bc68dd606d94.zip
)

# $ git "describe" "--tags" "--match" "v*" 052ac4cd7; format as below
set(Celeritas_GIT_DESCRIBE "0.5.0" "-dev.20" "052ac4cd7")
# $ git "describe" "--tags" "--match" "v*" <hash> ->
# v0.5.0-dev-27-g0f74ea935
set(Celeritas_GIT_DESCRIBE "0.5.0" "-dev.27" "0f74ea935")

# Minimally build Celeritas
g4vg_set_default(CELERITAS_BUILD_DEMOS OFF)
Expand Down
6 changes: 3 additions & 3 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

#-----------------------------------------------------------------------------#
# Add the library
celeritas_rdc_add_library(g4vg SHARED
cuda_rdc_add_library(g4vg SHARED
G4VG.cc
)
celeritas_target_link_libraries(g4vg
cuda_rdc_target_link_libraries(g4vg
PRIVATE Celeritas::geocel
)
celeritas_target_include_directories(g4vg
cuda_rdc_target_include_directories(g4vg
PUBLIC
"$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>"
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
Expand Down

0 comments on commit 5164c81

Please sign in to comment.