diff options
| author | Robert Maynard <rmaynard@nvidia.com> | 2022-03-09 14:14:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-03-09 17:30:12 (GMT) |
| commit | 2a79b647fac5fc702082385cb30fedf82a972b5e (patch) | |
| tree | fc7ae6a9a1b7034159e766c6b24aa121ba77b198 /Modules | |
| parent | 1aa51fb9e3ba3e9ddeafe4929c8f6f58a5fd34b7 (diff) | |
| download | CMake-2a79b647fac5fc702082385cb30fedf82a972b5e.zip CMake-2a79b647fac5fc702082385cb30fedf82a972b5e.tar.gz CMake-2a79b647fac5fc702082385cb30fedf82a972b5e.tar.bz2 | |
CUDA: Restore support for CMAKE_CUDA_ARCHITECTURES=OFF
Fixes: #23309
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineCUDACompiler.cmake | 4 | ||||
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Modules/CMakeDetermineCUDACompiler.cmake b/Modules/CMakeDetermineCUDACompiler.cmake index 8c01ea4..2649441 100644 --- a/Modules/CMakeDetermineCUDACompiler.cmake +++ b/Modules/CMakeDetermineCUDACompiler.cmake @@ -289,7 +289,7 @@ if(NOT CMAKE_CUDA_COMPILER_ID_RUN) set(architectures_test ${CMAKE_CUDA_ARCHITECTURES_ALL_MAJOR}) endif() endif() - else() + elseif(CMAKE_CUDA_ARCHITECTURES OR "${CMAKE_CUDA_ARCHITECTURES}" STREQUAL "") # Explicit architectures. Test them during detection. set(architectures_explicit TRUE) set(architectures_test ${CMAKE_CUDA_ARCHITECTURES}) @@ -633,7 +633,7 @@ if("${CMAKE_CUDA_ARCHITECTURES}" STREQUAL "") message(FATAL_ERROR "Failed to detect a default CUDA architecture.\n\nCompiler output:\n${CMAKE_CUDA_COMPILER_PRODUCED_OUTPUT}") endif() endif() -elseif(NOT "${architectures_tested}" MATCHES "^(all|all-major)$") +elseif(CMAKE_CUDA_ARCHITECTURES AND NOT "${architectures_tested}" MATCHES "^(all|all-major)$") # Sort since order mustn't matter. list(SORT architectures_detected) list(SORT architectures_tested) diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index e0aa483..5670509 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -495,7 +495,7 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS} if(CMAKE_VS_PLATFORM_NAME STREQUAL x64) set(cuda_target "<TargetMachinePlatform>64</TargetMachinePlatform>") endif() - if(NOT CMAKE_CUDA_ARCHITECTURES MATCHES "^(all|all-major)$") + if(CMAKE_CUDA_ARCHITECTURES AND NOT CMAKE_CUDA_ARCHITECTURES MATCHES "^(all|all-major)$") foreach(arch ${CMAKE_CUDA_ARCHITECTURES}) string(REGEX MATCH "[0-9]+" arch_name "${arch}") string(APPEND cuda_codegen "compute_${arch_name},sm_${arch_name};") |