summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-06-15 13:24:31 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-06-15 13:24:37 (GMT)
commite3663176745f1ece9bf78473b1374e5fef342e24 (patch)
tree0b17b6cb58f07aa84315e75f0cca740dfae62e9f /Modules
parent31d0350f123a3b3d525087e6e877b50a55d2d6bc (diff)
parent877a92e968bfa24d86f4b9685b5c27d4c9e6c1be (diff)
downloadCMake-e3663176745f1ece9bf78473b1374e5fef342e24.zip
CMake-e3663176745f1ece9bf78473b1374e5fef342e24.tar.gz
CMake-e3663176745f1ece9bf78473b1374e5fef342e24.tar.bz2
Merge topic 'cuda_architectures_disable'
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.cmake2
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)