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

Split CMake RDC utilities from Celeritas macros #1104

Merged
merged 18 commits into from
Feb 14, 2024
Merged

Split CMake RDC utilities from Celeritas macros #1104

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
af67f65
cmake: Use cuda_rdc_* for CUDA relocatable device code support
pcanal Feb 12, 2024
31df85e
cmake: add celeritas_target_compile_options wrapper
pcanal Feb 12, 2024
f10e130
Apply POSITION_INDEPENDENT_CODE only to the object library
pcanal Feb 12, 2024
007ac62
Do not use cuda_rdc if USE_VECGEOM is false
pcanal Feb 12, 2024
3964080
Install CudaRdcUtils.cmake
pcanal Feb 12, 2024
c26c857
Add more celeritas rdc wrappers and fix existing ones.
pcanal Feb 13, 2024
8e119db
Merge remote-tracking branch 'origin/develop' into to_cuda_rdc_cmake
pcanal Feb 13, 2024
0782f57
Re-add CeleritasLibrary.cmake for backwark compatibility.
pcanal Feb 13, 2024
bd7d20b
Add celeritas_sources_contains_cuda
pcanal Feb 13, 2024
bec8c92
Fix typo in doc/comment
pcanal Feb 13, 2024
ab1834e
Update exampes, library usage
sethrj Feb 14, 2024
3b043a3
Merge remote-tracking branch 'upstream/develop' into to_cuda_rdc_cmake
sethrj Feb 14, 2024
22e26b6
Fix variable being set in parent scope by using macros to forward
sethrj Feb 14, 2024
0069c2e
Also don't use if not CUDA
sethrj Feb 14, 2024
1f69984
Fix typo in documentation.
pcanal Feb 14, 2024
6db61db
Correct implementation of cuda_rdc_add_library for ALIAS
pcanal Feb 14, 2024
348edbd
Add support for ALIAS in cuda_rdc_get_sources_and_options
pcanal Feb 14, 2024
88fb0c1
Avoid FindCUDA's version by renaming cuda_[rdc_]get_sources_and_options
pcanal Feb 14, 2024
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 CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if(CMAKE_VERSION VERSION_LESS 3.18)
endif()

include(GNUInstallDirs)
include(CeleritasLibrary)
include(CudaRdcUtils)
include(CeleritasUtils)
include(CMakeDependentOption)
include(CMakePackageConfigHelpers)
Expand Down Expand Up @@ -229,8 +229,8 @@ endif()
celeritas_set_default(CMAKE_INSTALL_MESSAGE LAZY)

#----------------------------------------------------------------------------#
# Output locations for Celeritas products (used by CeleritasLibrary.cmake,
# CeleritasUtils.cmake, install code below) will mirror the installation layout
# Output locations for Celeritas products (used by CeleritasUtils.cmake and
# install code below) will mirror the installation layout
set(CELERITAS_CMAKE_CONFIG_DIRECTORY
"${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake")
set(CELERITAS_HEADER_CONFIG_DIRECTORY
Expand Down Expand Up @@ -525,6 +525,7 @@ set(CELERITAS_INSTALL_CMAKECONFIGDIR

# Build list of CMake files to install
set(_cmake_files
"${PROJECT_SOURCE_DIR}/cmake/CudaRdcUtils.cmake"
"${PROJECT_SOURCE_DIR}/cmake/CeleritasLibrary.cmake"
)
foreach(_dep Geant4 HepMC3 ROOT VecGeom)
Expand Down
Loading
Loading