diff options
| author | Brad King <brad.king@kitware.com> | 2020-06-15 13:24:31 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-06-15 13:24:37 (GMT) |
| commit | a3881d6313776aaf4c1d92b68c5064c9ac5cdcd3 (patch) | |
| tree | adb21432320e821b6afc262d818ed4bc0b19c7fa /Modules | |
| parent | 9fb67f690be915a13cd70b5af71f640660f0b2ab (diff) | |
| parent | 877a92e968bfa24d86f4b9685b5c27d4c9e6c1be (diff) | |
| download | CMake-a3881d6313776aaf4c1d92b68c5064c9ac5cdcd3.zip CMake-a3881d6313776aaf4c1d92b68c5064c9ac5cdcd3.tar.gz CMake-a3881d6313776aaf4c1d92b68c5064c9ac5cdcd3.tar.bz2 | |
Merge topic 'cuda_architectures_disable' into release-3.18
877a92e968 CUDA: Add support for disabling CUDA_ARCHITECTURES
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4886
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineCUDACompiler.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineCUDACompiler.cmake b/Modules/CMakeDetermineCUDACompiler.cmake index 5ae3908..1273831 100644 --- a/Modules/CMakeDetermineCUDACompiler.cmake +++ b/Modules/CMakeDetermineCUDACompiler.cmake @@ -352,7 +352,7 @@ endif() # If the user didn't set the architectures, then set them to a default. # If the user did, then make sure those architectures worked. -if(DEFINED detected_architecture) +if(DEFINED detected_architecture AND "${CMAKE_CUDA_ARCHITECTURES}" STREQUAL "") set(CMAKE_CUDA_ARCHITECTURES "${detected_architecture}" CACHE STRING "CUDA architectures") if(NOT CMAKE_CUDA_ARCHITECTURES) |