diff options
| author | Robert Maynard <robert.maynard@kitware.com> | 2020-07-03 17:17:59 (GMT) |
|---|---|---|
| committer | Robert Maynard <robert.maynard@kitware.com> | 2020-07-15 13:40:33 (GMT) |
| commit | 56cf509a72588d3aa2b169a1eb59ae1cdee9157c (patch) | |
| tree | 094c75e98214a1598ce43be051fda52744c71d08 /Tests | |
| parent | 36e00f9c843d2e03661119182fd98f0668320e09 (diff) | |
| download | CMake-56cf509a72588d3aa2b169a1eb59ae1cdee9157c.zip CMake-56cf509a72588d3aa2b169a1eb59ae1cdee9157c.tar.gz CMake-56cf509a72588d3aa2b169a1eb59ae1cdee9157c.tar.bz2 | |
Move AddCompilerRequirementFlag to cmStandardLevelResolver
The cmLocalGenerator::AddCompilerRequirementFlag was another
source of truth on what standard levels existed per language,
so fold that into cmStandardLevelResolver to make updating
CMake easier
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}") |