diff options
| author | Brad King <brad.king@kitware.com> | 2021-07-07 16:21:27 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-07-07 16:24:36 (GMT) |
| commit | 84036d30d4bae01ed94602ebce7a404300fd7e5f (patch) | |
| tree | bbc6b81a83c2e9783c851bf58aa9ffb880b38b8e /Modules | |
| parent | 41c5e0ab2a3e99a3afd9d46671dd9ba694b253b7 (diff) | |
| download | CMake-84036d30d4bae01ed94602ebce7a404300fd7e5f.zip CMake-84036d30d4bae01ed94602ebce7a404300fd7e5f.tar.gz CMake-84036d30d4bae01ed94602ebce7a404300fd7e5f.tar.bz2 | |
IntelLLVM: Fix C/C++ standard level flags on Windows
In commit a90d2a9eed (IntelLLVM: Add support for Intel LLVM-based
compilers, 2020-11-02, v3.20.0-rc1~89^2~20) we accidentally left out
activation of the C/C++ standard level selection logic when IntelLLVM is
targeting the MSVC ABI.
Fixes: #22388
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Compiler/IntelLLVM-C.cmake | 6 | ||||
| -rw-r--r-- | Modules/Compiler/IntelLLVM-CXX.cmake | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/Modules/Compiler/IntelLLVM-C.cmake b/Modules/Compiler/IntelLLVM-C.cmake index beb7132..d69d064 100644 --- a/Modules/Compiler/IntelLLVM-C.cmake +++ b/Modules/Compiler/IntelLLVM-C.cmake @@ -55,8 +55,4 @@ else() set(CMAKE_C17_EXTENSION_COMPILE_OPTION "") endif() -if(NOT "x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC") - __compiler_check_default_language_standard(C 2020 17) -else() - set(CMAKE_C_STANDARD_DEFAULT "") -endif() +__compiler_check_default_language_standard(C 2020 17) diff --git a/Modules/Compiler/IntelLLVM-CXX.cmake b/Modules/Compiler/IntelLLVM-CXX.cmake index 4c0c26e..9799888 100644 --- a/Modules/Compiler/IntelLLVM-CXX.cmake +++ b/Modules/Compiler/IntelLLVM-CXX.cmake @@ -62,8 +62,4 @@ else() set(CMAKE_CXX20_EXTENSION_COMPILE_OPTION "-Qstd=c++20") endif() -if(NOT "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC") - __compiler_check_default_language_standard(CXX 2020 14) -else() - set(CMAKE_CXX_STANDARD_DEFAULT "") -endif() +__compiler_check_default_language_standard(CXX 2020 14) |