diff options
| author | Brad King <brad.king@kitware.com> | 2022-05-03 15:26:34 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-05-03 15:26:40 (GMT) |
| commit | 252fdfe6e400f9316911c9fffca7e420258a892c (patch) | |
| tree | 2d3b19ff87890b4b12a834813cab83c90ef7e021 /Modules | |
| parent | e4901919e7717f15449d97ce8788ddafdc4c59a6 (diff) | |
| parent | 7bf520069938dcb106f9c0c7cc71ac079055ceed (diff) | |
| download | CMake-252fdfe6e400f9316911c9fffca7e420258a892c.zip CMake-252fdfe6e400f9316911c9fffca7e420258a892c.tar.gz CMake-252fdfe6e400f9316911c9fffca7e420258a892c.tar.bz2 | |
Merge topic 'cuda-arch-verify'
7bf5200699 CUDA: Restore CMAKE_CUDA_ARCHITECTURES support for -real and -virtual suffixes
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewd-by: Raul Tambre <raul@tambre.ee>
Merge-request: !7218
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineCUDACompiler.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Modules/CMakeDetermineCUDACompiler.cmake b/Modules/CMakeDetermineCUDACompiler.cmake index 23da8ee..0ac06ac 100644 --- a/Modules/CMakeDetermineCUDACompiler.cmake +++ b/Modules/CMakeDetermineCUDACompiler.cmake @@ -275,13 +275,14 @@ if(NOT CMAKE_CUDA_COMPILER_ID_RUN) if(DEFINED CMAKE_CUDA_ARCHITECTURES) if(CMAKE_CUDA_ARCHITECTURES STREQUAL "") message(FATAL_ERROR "CMAKE_CUDA_ARCHITECTURES must be non-empty if set.") - elseif(CMAKE_CUDA_ARCHITECTURES AND NOT CMAKE_CUDA_ARCHITECTURES MATCHES "^([0-9]+[;0-9]*|all|all-major|native)$") + elseif(CMAKE_CUDA_ARCHITECTURES AND NOT CMAKE_CUDA_ARCHITECTURES MATCHES "^([0-9]+(-real|-virtual)?(;[0-9]+(-real|-virtual)?|;)*|all|all-major|native)$") message(FATAL_ERROR "CMAKE_CUDA_ARCHITECTURES:\n" " ${CMAKE_CUDA_ARCHITECTURES}\n" "is not one of the following:\n" - "* a semicolon-separated list of integers\n" - "* a special value: all, all-major, native\n" + " * a semicolon-separated list of integers, each optionally\n" + " followed by '-real' or '-virtual'\n" + " * a special value: all, all-major, native\n" ) endif() endif() |