Skip to content
Snippets Groups Projects
Commit dc4b4869 authored by Brad King's avatar Brad King
Browse files

Merge branch 'backport-3.20-intel-oneapi-std-windows' into release-3.20

Merge-request: !6319
parents 77abc295 5115dd1e
No related branches found
No related tags found
No related merge requests found
......@@ -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)
......@@ -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.
Finish editing this message first!
Please register or to comment