mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-12 01:09:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

CUDA: Improve error message when CMAKE_CUDA_ARCHITECTURES contains quotes

Browse Source 
Closes: #27150
This commit is contained in:
Brad King
2025-08-20 10:39:47 -04:00
parent 9e89400d13
commit 36673385bb
5 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/Internal/CMakeCUDAArchitecturesValidate.cmake
View File

@@ -5,6 +5,11 @@ function(cmake_cuda_architectures_validate lang)
if(DEFINED CMAKE_${lang}_ARCHITECTURES)
if(CMAKE_${lang}_ARCHITECTURES STREQUAL "")
message(FATAL_ERROR "CMAKE_${lang}_ARCHITECTURES must be non-empty if set.")
elseif(CMAKE_${lang}_ARCHITECTURES MATCHES [["]])
message(FATAL_ERROR
"CMAKE_${lang}_ARCHITECTURES contains literal quotes:\n"
" ${CMAKE_${lang}_ARCHITECTURES}\n"
)
elseif(CMAKE_${lang}_ARCHITECTURES AND NOT CMAKE_${lang}_ARCHITECTURES MATCHES "^([0-9]+(a|f)?(-real|-virtual)?(;[0-9]+(a|f)?(-real|-virtual)?|;)*|all|all-major|native)$")
message(FATAL_ERROR
"CMAKE_${lang}_ARCHITECTURES:\n"

1
Tests/RunCMake/CUDA_architectures/RunCMakeTest.cmake
View File

@@ -5,6 +5,7 @@ run_cmake(architectures-all-major)
run_cmake(architectures-native)
run_cmake(architectures-empty)
run_cmake(architectures-invalid)
run_cmake(architectures-quotes)
run_cmake(architectures-not-set)
include("${RunCMake_BINARY_DIR}/architectures-not-set-build/info.cmake" OPTIONAL)

1
Tests/RunCMake/CUDA_architectures/architectures-quotes-result.txt Normal file
View File

@@ -0,0 +1 @@
1

10
Tests/RunCMake/CUDA_architectures/architectures-quotes-stderr.txt Normal file
View File

@@ -0,0 +1,10 @@
^CMake Error at .*/Internal/CMakeCUDAArchitecturesValidate\.cmake:[0-9]+ \(message\):
CMAKE_CUDA_ARCHITECTURES contains literal quotes:
"all-major"
Call Stack \(most recent call first\):
[^
]*/Modules/CMakeDetermineCUDACompiler.cmake:[0-9]+ \(cmake_cuda_architectures_validate\)
architectures-quotes\.cmake:2 \(enable_language\)
CMakeLists\.txt:3 \(include\)$

2
Tests/RunCMake/CUDA_architectures/architectures-quotes.cmake Normal file
View File

@@ -0,0 +1,2 @@
set(CMAKE_CUDA_ARCHITECTURES "\"all-major\"")
enable_language(CUDA)