[Cmake-commits] [cmake-commits] king committed CheckCCompilerFlag.cmake 1.5 1.6 CheckCXXCompilerFlag.cmake 1.4 1.5

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv8240/Modules

Modified Files:
	CheckCCompilerFlag.cmake CheckCXXCompilerFlag.cmake 
Log Message:
Fix CHECK_(C|CXX)_COMPILER_FLAG for XL and SunPro

These compilers warn and return 0 for unrecognized flags.  We fix the
compiler flag check macros by looking for a warning in the output.  We
also update the regex for GNU on older Macs.  See issue #9516.


Index: CheckCCompilerFlag.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CheckCCompilerFlag.cmake,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** CheckCCompilerFlag.cmake	17 Sep 2009 21:16:43 -0000	1.5
--- CheckCCompilerFlag.cmake	18 Sep 2009 13:49:43 -0000	1.6
***************
*** 20,26 ****
     CHECK_C_SOURCE_COMPILES("int main() { return 0;}" ${_RESULT}
       # Some compilers do not fail with a bad flag
!      FAIL_REGEX "unrecognized option"                       # GNU
       FAIL_REGEX "ignoring unknown option"                   # MSVC
       FAIL_REGEX "[Uu]nknown option"                         # HP
       )
     SET (CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}")
--- 20,28 ----
     CHECK_C_SOURCE_COMPILES("int main() { return 0;}" ${_RESULT}
       # Some compilers do not fail with a bad flag
!      FAIL_REGEX "unrecognized .*option"                     # GNU
       FAIL_REGEX "ignoring unknown option"                   # MSVC
       FAIL_REGEX "[Uu]nknown option"                         # HP
+      FAIL_REGEX "[Ww]arning: [Oo]ption"                     # SunPro
+      FAIL_REGEX "command option .* is not recognized"       # XL
       )
     SET (CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}")

Index: CheckCXXCompilerFlag.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CheckCXXCompilerFlag.cmake,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** CheckCXXCompilerFlag.cmake	17 Sep 2009 21:16:43 -0000	1.4
--- CheckCXXCompilerFlag.cmake	18 Sep 2009 13:49:44 -0000	1.5
***************
*** 20,26 ****
     CHECK_CXX_SOURCE_COMPILES("int main() { return 0;}" ${_RESULT}
       # Some compilers do not fail with a bad flag
!      FAIL_REGEX "unrecognized option"                       # GNU
       FAIL_REGEX "ignoring unknown option"                   # MSVC
       FAIL_REGEX "[Uu]nknown option"                         # HP
       )
     SET (CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}")
--- 20,28 ----
     CHECK_CXX_SOURCE_COMPILES("int main() { return 0;}" ${_RESULT}
       # Some compilers do not fail with a bad flag
!      FAIL_REGEX "unrecognized .*option"                     # GNU
       FAIL_REGEX "ignoring unknown option"                   # MSVC
       FAIL_REGEX "[Uu]nknown option"                         # HP
+      FAIL_REGEX "[Ww]arning: [Oo]ption"                     # SunPro
+      FAIL_REGEX "command option .* is not recognized"       # XL
       )
     SET (CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}")