Skip to content

[cmake] Require explicit CUDA feature selection #23903

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

Merged
guitargeek merged 2 commits into from
Nov 2, 2026
Merged

[cmake] Require explicit CUDA feature selection #23903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c67c72
[cmake] Skip unrequested CUDA compiler detection
jmcarcell Oct 30, 2026
33f50fc
[cmake] Require explicit CUDA feature selection
jmcarcell Nov 2, 2026
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
14 changes: 8 additions & 6 deletions cmake/modules/CheckCompiler.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,14 @@ else()
set(CMAKE_Fortran_COMPILER CMAKE_Fortran_COMPILER-NOTFOUND)
endif()

#---Enable CUDA if found on the system---
check_language(CUDA)
if (CMAKE_CUDA_COMPILER)
enable_language(CUDA)
if(NOT DEFINED CMAKE_CUDA_STANDARD)
set(CMAKE_CUDA_STANDARD ${CMAKE_CXX_STANDARD})
#---Check CUDA only for requested features ----------------
if(cuda OR tmva-gpu)
check_language(CUDA)
if(CMAKE_CUDA_COMPILER)
enable_language(CUDA)
if(NOT DEFINED CMAKE_CUDA_STANDARD)
set(CMAKE_CUDA_STANDARD ${CMAKE_CXX_STANDARD})
endif()
endif()
endif()

Expand Down
4 changes: 0 additions & 4 deletions cmake/modules/RootBuildOptions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,10 +243,6 @@ if(all)
set(x11_defvalue ON)
set(xml_defvalue ON)
set(xrootd_defvalue ON)
if(CMAKE_CUDA_COMPILER)
set(cuda_defvalue ON)
set(tmva-gpu_defvalue ON)
endif()
endif()

#--- The 'builtin_all' option switches ON all the built in options but GPL-------------------------------
Expand Down
Loading