Browse Source

Merge topic 'CheckCompilerFlag-gcc-10'

d66858c8e4 CheckCompilerFlag: Update the regex used to detect invalid options for GCC 10

Acked-by: Kitware Robot <[email protected]>
Merge-request: !5331
Brad King 5 years ago
parent
commit
026beeb620

+ 5 - 5
Modules/CheckCompilerFlag.cmake

@@ -45,20 +45,20 @@ function(CHECK_COMPILER_FLAG _lang _flag _var)
 
   if(_lang STREQUAL C)
     set(_lang_src "int main(void) { return 0; }")
-    set(_lang_fail_regex FAIL_REGEX "command line option .* is valid for .* but not for C")
+    set(_lang_fail_regex FAIL_REGEX "command[ -]line option .* is valid for .* but not for C")
   elseif(_lang STREQUAL CXX)
     set(_lang_src "int main() { return 0; }")
-    set(_lang_fail_regex FAIL_REGEX "command line option .* is valid for .* but not for C\\+\\+")
+    set(_lang_fail_regex FAIL_REGEX "command[ -]line option .* is valid for .* but not for C\\+\\+")
   elseif(_lang STREQUAL Fortran)
     set(_lang_src "       program test\n       stop\n       end program")
-    set(_lang_fail_regex FAIL_REGEX "command line option .* is valid for .* but not for Fortran")
+    set(_lang_fail_regex FAIL_REGEX "command[ -]line option .* is valid for .* but not for Fortran")
   elseif(_lang STREQUAL OBJC)
     set(_lang_src [=[
 #ifndef __OBJC__
 #  error "Not an Objective-C compiler"
 #endif
 int main(void) { return 0; }]=])
-    set(_lang_fail_regex FAIL_REGEX "command line option .* is valid for .* but not for Objective-C" # GNU
+    set(_lang_fail_regex FAIL_REGEX "command[ -]line option .* is valid for .* but not for Objective-C" # GNU
                          FAIL_REGEX "argument unused during compilation: .*") # Clang
   elseif(_lang STREQUAL OBJCXX)
     set(_lang_src [=[
@@ -66,7 +66,7 @@ int main(void) { return 0; }]=])
 #  error "Not an Objective-C++ compiler"
 #endif
 int main(void) { return 0; }]=])
-    set(_lang_fail_regex FAIL_REGEX "command line option .* is valid for .* but not for Objective-C\\+\\+" # GNU
+    set(_lang_fail_regex FAIL_REGEX "command[ -]line option .* is valid for .* but not for Objective-C\\+\\+" # GNU
                          FAIL_REGEX "argument unused during compilation: .*") # Clang
   else()
     message (SEND_ERROR "check_compiler_flag: ${_lang}: unknown language.")

+ 7 - 0
Tests/RunCMake/CheckCompilerFlag/CheckCCompilerFlag.cmake

@@ -13,3 +13,10 @@ if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang" AND NOT "x${CMAKE_C_SIMULATE_ID}" STR
     message(SEND_ERROR "${CMAKE_C_COMPILER_ID} compiler flag '-x c' check failed")
   endif()
 endif()
+
+if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
+  check_compiler_flag(C "-frtti" SHOULD_FAIL_RTTI)
+  if(SHOULD_FAIL_RTTI)
+    message(SEND_ERROR "${CMAKE_C_COMPILER_ID} compiler flag '-frtti' check passed but should have failed")
+  endif()
+endif()