Jelajahi Sumber

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

Merge-request: !6319
Brad King 4 tahun lalu
induk
melakukan
dc4b486933
2 mengubah file dengan 4 tambahan dan 12 penghapusan
  1. 3 7
      Modules/Compiler/IntelLLVM-C.cmake
  2. 1 5
      Modules/Compiler/IntelLLVM-CXX.cmake

+ 3 - 7
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)

+ 1 - 5
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)