|
|
@@ -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)
|