diff options
| author | Brad King <brad.king@kitware.com> | 2021-07-09 14:56:52 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-07-09 15:04:52 (GMT) |
| commit | 6eea123e3a97a6dce3b059777b688a49429bb951 (patch) | |
| tree | 482f12f89933339e42644bf88c6aaa537e5cfe84 /Tests | |
| parent | 554ebf643dfad2eb6877c3d5530b005cee453513 (diff) | |
| download | CMake-6eea123e3a97a6dce3b059777b688a49429bb951.zip CMake-6eea123e3a97a6dce3b059777b688a49429bb951.tar.gz CMake-6eea123e3a97a6dce3b059777b688a49429bb951.tar.bz2 | |
Tests: Fix RunCMake.try_compile C/CXX standards with IntelLLVM MSVC mode
Since commit 84036d30d4 (IntelLLVM: Fix C/C++ standard level flags on
Windows, 2021-07-07, v3.21.0-rc3~8^2~1) we activate C/C++ standard level
logic for IntelLLVM when targeting the MSVC ABI. Update the
`RunCMake.try_compile` test to be aware of this even when CMake is
itself configured by an older CMake that does not know this.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index dafb174..86cb849 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -443,6 +443,17 @@ function(add_RunCMake_test_try_compile) set(CMAKE_C_STANDARD_DEFAULT 11) endif() endif() + if(CMAKE_VERSION VERSION_LESS 3.20.6 AND "x${CMAKE_C_COMPILER_ID}" STREQUAL "xIntelLLVM" AND "x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC") + # Older CMake versions accidentally set the default standards to empty when + # IntelLLVM targets the MSVC ABI, thus not activating standard selection. + # Approximate the logic from IntelLLVM-{C,CXX}.cmake. + if(DEFINED CMAKE_C_STANDARD_DEFAULT AND "${CMAKE_C_STANDARD_DEFAULT}" STREQUAL "") + set(CMAKE_C_STANDARD_DEFAULT 17) + endif() + if(DEFINED CMAKE_CXX_STANDARD_DEFAULT AND "${CMAKE_CXX_STANDARD_DEFAULT}" STREQUAL "") + set(CMAKE_CXX_STANDARD_DEFAULT 14) + endif() + endif() foreach(var CMAKE_SYSTEM_NAME CMAKE_C_COMPILER_ID |