diff options
| author | Brad King <brad.king@kitware.com> | 2020-07-16 14:17:39 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-07-16 14:17:52 (GMT) |
| commit | 4662c041eac50888d445a77ed091f395cafe61fe (patch) | |
| tree | cfceaeab6d6407a1b86f9ddb5c7168cb6a68db15 /Tests | |
| parent | ffb888b7487b4e9df3465d264428bb5458854326 (diff) | |
| parent | 56cf509a72588d3aa2b169a1eb59ae1cdee9157c (diff) | |
| download | CMake-4662c041eac50888d445a77ed091f395cafe61fe.zip CMake-4662c041eac50888d445a77ed091f395cafe61fe.tar.gz CMake-4662c041eac50888d445a77ed091f395cafe61fe.tar.bz2 | |
Merge topic 'move_more_queries_to_cmStandardLevelResolver'
56cf509a72 Move AddCompilerRequirementFlag to cmStandardLevelResolver
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4989
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/try_compile/CudaStandard-stderr.txt | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/try_compile/CudaStandard.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Tests/RunCMake/try_compile/CudaStandard-stderr.txt b/Tests/RunCMake/try_compile/CudaStandard-stderr.txt index 3c6bdf6..bcf95d5 100644 --- a/Tests/RunCMake/try_compile/CudaStandard-stderr.txt +++ b/Tests/RunCMake/try_compile/CudaStandard-stderr.txt @@ -1,5 +1,5 @@ ^CMake Error at .*/Tests/RunCMake/try_compile/CudaStandard-build/CMakeFiles/CMakeTmp/CMakeLists.txt:[0-9]+ \(add_executable\): - CUDA_STANDARD is set to invalid value '3' + CUDA_STANDARD is set to invalid value '4' + CMake Error at CudaStandard.cmake:[0-9]+ \(try_compile\): Failed to generate test project build system. diff --git a/Tests/RunCMake/try_compile/CudaStandard.cmake b/Tests/RunCMake/try_compile/CudaStandard.cmake index 96da422..a230424 100644 --- a/Tests/RunCMake/try_compile/CudaStandard.cmake +++ b/Tests/RunCMake/try_compile/CudaStandard.cmake @@ -1,7 +1,7 @@ enable_language(CUDA) try_compile(result ${CMAKE_CURRENT_BINARY_DIR} SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src.cu - CUDA_STANDARD 3 + CUDA_STANDARD 4 OUTPUT_VARIABLE out ) message("try_compile output:\n${out}") |