Skip to content
Snippets Groups Projects
Commit cc654242 authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'intel-oneapi-std-windows' into release-3.21


13961f3b Merge branch 'backport-3.20-intel-oneapi-std-windows'
5115dd1e IntelLLVM: Fix C/C++ standard level flags on Windows
84036d30 IntelLLVM: Fix C/C++ standard level flags on Windows

Acked-by: default avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !6319
parents 41c5e0ab 13961f3b
Branches
No related tags found
No related merge requests found
......@@ -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)
......@@ -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)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment