diff options
| author | Brad King <brad.king@kitware.com> | 2021-07-12 12:33:25 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-07-12 12:33:31 (GMT) |
| commit | 5df2c45854c9a22011d8c709d7c014ce4bc32e96 (patch) | |
| tree | 671417f36adfeccc4f0ebb2e098a823d1f6bae04 | |
| parent | 79ca88ccd8bc931490e5a0ccc509f6ddd7015ec5 (diff) | |
| parent | a82af0e2ce4d6e55349a9e62d834b56188b611df (diff) | |
| download | CMake-5df2c45854c9a22011d8c709d7c014ce4bc32e96.zip CMake-5df2c45854c9a22011d8c709d7c014ce4bc32e96.tar.gz CMake-5df2c45854c9a22011d8c709d7c014ce4bc32e96.tar.bz2 | |
Merge topic 'intel-oneapi-std-windows' into release-3.21
a82af0e2ce Merge branch 'backport-3.20-intel-oneapi-std-windows'
1c227583a4 Tests: Fix RunCMake.try_compile C/CXX standards with IntelLLVM MSVC mode
1c14691a86 CMakeCCompilerId: Fix C standard detection in Clang and IntelLLVM MSVC mode
6eea123e3a Tests: Fix RunCMake.try_compile C/CXX standards with IntelLLVM MSVC mode
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6328
| -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 |