diff options
| author | Brad King <brad.king@kitware.com> | 2022-04-28 13:36:25 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-04-28 13:36:31 (GMT) |
| commit | d35f1c9beee14f1be1e39838b5d4be0906a48974 (patch) | |
| tree | b8c0f6a296f1cee0b259bb826c922d9c3b85ada8 /Tests | |
| parent | 2fb1398b7eba0e980b2e1295916a9d5fd0337bff (diff) | |
| parent | c267ed205a2ef2a2396b4d00b593d617b2befdcc (diff) | |
| download | CMake-d35f1c9beee14f1be1e39838b5d4be0906a48974.zip CMake-d35f1c9beee14f1be1e39838b5d4be0906a48974.tar.gz CMake-d35f1c9beee14f1be1e39838b5d4be0906a48974.tar.bz2 | |
Merge topic 'cuda-arch-verify'
c267ed205a CUDA: Defer architecture testing to the compiler testing step
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Acked-by: Raul Tambre <raul@tambre.ee>
Merge-request: !7202
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/CUDA_architectures/architectures-empty-stderr.txt | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CUDA_architectures/architectures-invalid-stderr.txt | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/Tests/RunCMake/CUDA_architectures/architectures-empty-stderr.txt b/Tests/RunCMake/CUDA_architectures/architectures-empty-stderr.txt index 39640fa..6c42612 100644 --- a/Tests/RunCMake/CUDA_architectures/architectures-empty-stderr.txt +++ b/Tests/RunCMake/CUDA_architectures/architectures-empty-stderr.txt @@ -1,5 +1,5 @@ ^CMake Error at .*/Modules/CMakeDetermineCUDACompiler\.cmake:[0-9]+ \(message\): - CMAKE_CUDA_ARCHITECTURES must be valid if set\. + CMAKE_CUDA_ARCHITECTURES must be non-empty if set\. Call Stack \(most recent call first\): architectures-empty\.cmake:2 \(enable_language\) CMakeLists\.txt:3 \(include\) diff --git a/Tests/RunCMake/CUDA_architectures/architectures-invalid-stderr.txt b/Tests/RunCMake/CUDA_architectures/architectures-invalid-stderr.txt index 7608730..48f379c 100644 --- a/Tests/RunCMake/CUDA_architectures/architectures-invalid-stderr.txt +++ b/Tests/RunCMake/CUDA_architectures/architectures-invalid-stderr.txt @@ -1,5 +1,14 @@ ^CMake Error at .*/Modules/CMakeDetermineCUDACompiler\.cmake:[0-9]+ \(message\): - CMAKE_CUDA_ARCHITECTURES must be valid if set\. + CMAKE_CUDA_ARCHITECTURES: + + invalid + + is not one of the following: + + \* a semicolon-separated list of integers + + \* a special value: all, all-major, native + Call Stack \(most recent call first\): architectures-invalid\.cmake:2 \(enable_language\) CMakeLists\.txt:3 \(include\)$ |