diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-27 12:54:18 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-02-27 12:54:25 (GMT) |
| commit | 2645839a83b96b43bb692f542b214ebee6a2245d (patch) | |
| tree | 082cfbed3e2cb1ceb814804ca3aba53cca6fc0d5 /Tests/RunCMake | |
| parent | b3191a0f5740d5efa5d6286d3f7c2b9356fa87c0 (diff) | |
| parent | a0d4430d662be62af58c6ff8a9b75511b2cbbe5f (diff) | |
| download | CMake-2645839a83b96b43bb692f542b214ebee6a2245d.zip CMake-2645839a83b96b43bb692f542b214ebee6a2245d.tar.gz CMake-2645839a83b96b43bb692f542b214ebee6a2245d.tar.bz2 | |
Merge topic 'restore-min-cmake-3.1'
a0d4430d66 Tests: Restore support for CMake 3.1 through 3.6 with MSVC
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3021
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 1f3e5c3..f2b7ff1 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -284,11 +284,11 @@ function(add_RunCMake_test_try_compile) if(CMAKE_VERSION VERSION_LESS 3.9.20170907 AND "x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC") # Older CMake versions do not know about MSVC language standards. # Approximate our logic from MSVC-CXX.cmake. - if ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.0.24215.1 AND + if ((NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.0.24215.1 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10) OR - CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.10.25017) + NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10.25017) set(CMAKE_CXX_STANDARD_DEFAULT 14) - elseif (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 16.0) + elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16.0) set(CMAKE_CXX_STANDARD_DEFAULT "") else() unset(CMAKE_CXX_STANDARD_DEFAULT) |