mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-09 10:00:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'msvc_c11' into release-3.18

Browse Source 
f4373feda8 Tests: Fix RunCMake.try_compile test for C standards with MSVC 19.27

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5145
This commit is contained in:
Brad King
2020-08-20 11:49:22 +00:00
committed by Kitware Robot
parent 281a87f834 f4373feda8
commit eeaa890147
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Tests/RunCMake/CMakeLists.txt
View File

@@ -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