diff options
| author | Brad King <brad.king@kitware.com> | 2021-07-07 16:53:56 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-07-07 16:53:56 (GMT) |
| commit | dc4b48693380b988545db9fab9493d2ded0248cb (patch) | |
| tree | 2e03441b6ee5205f83ca0be5fafceec72b5669a2 | |
| parent | 77abc295a10bd3bd8e0bdea7a2254d6c506ee930 (diff) | |
| parent | 5115dd1e2c6651c7f4d5992d05300c248302886b (diff) | |
| download | CMake-dc4b48693380b988545db9fab9493d2ded0248cb.zip CMake-dc4b48693380b988545db9fab9493d2ded0248cb.tar.gz CMake-dc4b48693380b988545db9fab9493d2ded0248cb.tar.bz2 | |
Merge branch 'backport-3.20-intel-oneapi-std-windows' into release-3.20
Merge-request: !6319
| -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 fce2971..9b1c376 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 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) |