diff options
| author | Brad King <brad.king@kitware.com> | 2021-07-07 12:21:27 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-07-07 12:25:38 -0400 |
| commit | 5115dd1e2c6651c7f4d5992d05300c248302886b (patch) | |
| tree | 2e03441b6ee5205f83ca0be5fafceec72b5669a2 | |
| parent | 77abc295a10bd3bd8e0bdea7a2254d6c506ee930 (diff) | |
| download | cmake-5115dd1e2c6651c7f4d5992d05300c248302886b.tar.gz | |
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
| -rw-r--r-- | Modules/Compiler/IntelLLVM-C.cmake | 10 | ||||
| -rw-r--r-- | Modules/Compiler/IntelLLVM-CXX.cmake | 6 |
2 files changed, 4 insertions, 12 deletions
diff --git a/Modules/Compiler/IntelLLVM-C.cmake b/Modules/Compiler/IntelLLVM-C.cmake index fce2971cac..9b1c376b13 100644 --- a/Modules/Compiler/IntelLLVM-C.cmake +++ b/Modules/Compiler/IntelLLVM-C.cmake @@ -49,10 +49,6 @@ else() set(CMAKE_C11_EXTENSION_COMPILE_OPTION "") endif() -if(NOT "x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC") - # FIXME: The compiler actually defaults to C17, but - # CMake does not yet model or detect that standard. - __compiler_check_default_language_standard(C 2020 11) -else() - set(CMAKE_C_STANDARD_DEFAULT "") -endif() +# FIXME: The compiler actually defaults to C17, but +# CMake does not yet model or detect that standard. +__compiler_check_default_language_standard(C 2020 11) diff --git a/Modules/Compiler/IntelLLVM-CXX.cmake b/Modules/Compiler/IntelLLVM-CXX.cmake index 4c0c26e2e9..979988846d 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) |