diff options
| author | Brad King <brad.king@kitware.com> | 2020-08-20 11:49:22 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-08-20 11:49:27 (GMT) |
| commit | eeaa8901478ea595654c2d7c967116e525448aab (patch) | |
| tree | ca35861c488cbb2cfad74474a8865fb4bdcf66db | |
| parent | 281a87f8346306f0ee207fe8427517cf465852af (diff) | |
| parent | f4373feda85fd63b80dd357d896e23bd001578df (diff) | |
| download | CMake-eeaa8901478ea595654c2d7c967116e525448aab.zip CMake-eeaa8901478ea595654c2d7c967116e525448aab.tar.gz CMake-eeaa8901478ea595654c2d7c967116e525448aab.tar.bz2 | |
Merge topic 'msvc_c11' into release-3.18
f4373feda8 Tests: Fix RunCMake.try_compile test for C standards with MSVC 19.27
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5145
| -rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 5d00554..470f302 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -363,6 +363,15 @@ function(add_RunCMake_test_try_compile) unset(CMAKE_CXX_STANDARD_DEFAULT) endif() endif() + if(CMAKE_VERSION VERSION_LESS 3.18.20200813 AND "x${CMAKE_C_COMPILER_ID}" STREQUAL "xMSVC") + # Older CMake versions do not know about MSVC language standards. + # Approximate our logic from MSVC-C.cmake. + if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 19.27) + set(CMAKE_C_STANDARD_DEFAULT 99) + else() + set(CMAKE_C_STANDARD_DEFAULT "") + endif() + endif() foreach(var CMAKE_SYSTEM_NAME CMAKE_C_COMPILER_ID |