Răsfoiți Sursa

Merge branch 'try_compile-CMP0128' into release-3.23

Merge-request: !7821
Brad King 3 ani în urmă
părinte
comite
4f2bb02d9a
1 a modificat fișierele cu 5 adăugiri și 4 ștergeri
  1. 5 4
      Tests/RunCMake/try_compile/RunCMakeTest.cmake

+ 5 - 4
Tests/RunCMake/try_compile/RunCMakeTest.cmake

@@ -121,10 +121,11 @@ run_cmake(Inspect)
 include("${RunCMake_BINARY_DIR}/Inspect-build/info.cmake")
 
 # FIXME: Support more compilers and default standard levels.
-if (CMAKE_CXX_COMPILER_ID MATCHES "^(GNU|AppleClang)$"
-    AND DEFINED CMAKE_CXX_STANDARD_DEFAULT
-    AND DEFINED CMAKE_CXX_EXTENSIONS_DEFAULT
-    )
+if (DEFINED CMAKE_CXX_STANDARD_DEFAULT AND
+    DEFINED CMAKE_CXX_EXTENSIONS_DEFAULT AND (
+    (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 4.7) OR
+    (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+    ))
   run_cmake(CMP0128-WARN)
   if(NOT CMAKE_CXX_STANDARD_DEFAULT EQUAL 11)
     run_cmake(CMP0128-NEW)