diff options
| author | Brad King <brad.king@kitware.com> | 2023-09-22 13:18:43 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-09-22 13:18:53 (GMT) |
| commit | d2655c59dc914ec24f2bca142a748612caeb9e3d (patch) | |
| tree | 389ee99aeb3b58b7bc92b78398fbd9ba2f238392 /Tests/RunCMake | |
| parent | 2dafd1f09227915197eb268cac6affdb37a24647 (diff) | |
| parent | b32ea7cff050574c00b5207035762e3b24f8a405 (diff) | |
| download | CMake-d2655c59dc914ec24f2bca142a748612caeb9e3d.zip CMake-d2655c59dc914ec24f2bca142a748612caeb9e3d.tar.gz CMake-d2655c59dc914ec24f2bca142a748612caeb9e3d.tar.bz2 | |
Merge topic 'cuda-factor-out-lang'
b32ea7cff0 CUDA: Factor out helper to generate CUDA architecture flags
b3a1f17567 CUDA: Factor out helper to validate CMAKE_CUDA_ARCHITECTURES
8617c28221 CUDA: Factor out helper for detecting native CUDA architectures
0db0fe7958 CUDA: Factor out helper to compute all CUDA architectures
c16f1e2b93 CUDA: Factor out helper to find CUDA Toolkit for compiler
a6841a967b CUDA: Factor out helper to filter implicit link libraries
deff0e638d CUDA: Factor out helper to parse NVCC implicit compiler and linker flags
e1b2a5062f CUDA: Factor out some NVCC compiler information
...
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !8816
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/CUDA_architectures/architectures-empty-stderr.txt | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/CUDA_architectures/architectures-invalid-stderr.txt | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Tests/RunCMake/CUDA_architectures/architectures-empty-stderr.txt b/Tests/RunCMake/CUDA_architectures/architectures-empty-stderr.txt index 6c42612..dbadd048 100644 --- a/Tests/RunCMake/CUDA_architectures/architectures-empty-stderr.txt +++ b/Tests/RunCMake/CUDA_architectures/architectures-empty-stderr.txt @@ -1,5 +1,7 @@ -^CMake Error at .*/Modules/CMakeDetermineCUDACompiler\.cmake:[0-9]+ \(message\): +^CMake Error at .*/Internal/CMakeCUDAArchitecturesValidate\.cmake:[0-9]+ \(message\): CMAKE_CUDA_ARCHITECTURES must be non-empty if set\. Call Stack \(most recent call first\): + [^ +]*/Modules/CMakeDetermineCUDACompiler.cmake:[0-9]+ \(cmake_cuda_architectures_validate\) 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 14c76d2..891aa40 100644 --- a/Tests/RunCMake/CUDA_architectures/architectures-invalid-stderr.txt +++ b/Tests/RunCMake/CUDA_architectures/architectures-invalid-stderr.txt @@ -1,4 +1,4 @@ -^CMake Error at .*/Modules/CMakeDetermineCUDACompiler\.cmake:[0-9]+ \(message\): +^CMake Error at .*/Internal/CMakeCUDAArchitecturesValidate\.cmake:[0-9]+ \(message\): CMAKE_CUDA_ARCHITECTURES: invalid @@ -10,5 +10,7 @@ \* a special value: all, all-major, native Call Stack \(most recent call first\): + [^ +]*/Modules/CMakeDetermineCUDACompiler.cmake:[0-9]+ \(cmake_cuda_architectures_validate\) architectures-invalid\.cmake:2 \(enable_language\) CMakeLists\.txt:3 \(include\)$ |