Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to new celeritas and RDC utilities #4

Merged
merged 1 commit into from
Feb 16, 2024
Merged

Update to new celeritas and RDC utilities #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions external/CMakeLists.txt
View file
Open in desktop
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
View file
Open in desktop
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
Loading