mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-13 02:29:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Merge-request: !6319
This commit is contained in:
Brad King
2021-07-07 12:53:56 -04:00
parent 77abc295a1 5115dd1e2c
commit dc4b486933
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Modules/Compiler/IntelLLVM-C.cmake
View File

@@ -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)

6
Modules/Compiler/IntelLLVM-CXX.cmake
View File

@@ -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)