diff options
| author | Brad King <brad.king@kitware.com> | 2021-07-08 11:36:46 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-07-08 07:36:57 -0400 |
| commit | cc654242c7f0e0296a910e3b02fd4322507e99c8 (patch) | |
| tree | bbc6b81a83c2e9783c851bf58aa9ffb880b38b8e | |
| parent | 41c5e0ab2a3e99a3afd9d46671dd9ba694b253b7 (diff) | |
| parent | 13961f3b43ca696e4bd20417043147d14f481d05 (diff) | |
| download | cmake-cc654242c7f0e0296a910e3b02fd4322507e99c8.tar.gz | |
Merge topic 'intel-oneapi-std-windows' into release-3.21
13961f3b43 Merge branch 'backport-3.20-intel-oneapi-std-windows'
5115dd1e2c IntelLLVM: Fix C/C++ standard level flags on Windows
84036d30d4 IntelLLVM: Fix C/C++ standard level flags on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6319
| -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 beb713242f..d69d064778 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 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) |