This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via f9ff5661989ad6364672dbe232175d99be149f22 (commit) via efc354558ce3c970b49264af5b7b7bb34af384d3 (commit) from 337de12245c60082b5738a67557d06aa9f83f987 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f9ff5661989ad6364672dbe232175d99be149f22 commit f9ff5661989ad6364672dbe232175d99be149f22 Merge: 337de12 efc3545 Author: Rolf Eike Beer <e...@sf-mail.de> AuthorDate: Thu Apr 26 18:52:38 2012 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Apr 26 18:52:38 2012 -0400 Merge topic 'more-Intel-warnings' into next efc3545 Check{C,CXX}CompilerFlag: catch more Intel warnings (#12576) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=efc354558ce3c970b49264af5b7b7bb34af384d3 commit efc354558ce3c970b49264af5b7b7bb34af384d3 Author: Rolf Eike Beer <e...@sf-mail.de> AuthorDate: Fri Apr 27 00:48:33 2012 +0200 Commit: Rolf Eike Beer <e...@sf-mail.de> CommitDate: Fri Apr 27 00:48:33 2012 +0200 Check{C,CXX}CompilerFlag: catch more Intel warnings (#12576) Szilárd Páll pointed out that Intel compilers may output both "option...not supported" and "options...not supported". Modify this regex to catch both cases. diff --git a/Modules/CheckCCompilerFlag.cmake b/Modules/CheckCCompilerFlag.cmake index 1de78f1..90d04ac 100644 --- a/Modules/CheckCCompilerFlag.cmake +++ b/Modules/CheckCCompilerFlag.cmake @@ -33,7 +33,7 @@ MACRO (CHECK_C_COMPILER_FLAG _FLAG _RESULT) FAIL_REGEX "unknown .*option" # Clang FAIL_REGEX "ignoring unknown option" # MSVC FAIL_REGEX "warning D9002" # MSVC, any lang - FAIL_REGEX "option .*not supported" # Intel + FAIL_REGEX "option.*not supported" # Intel FAIL_REGEX "invalid argument .*option" # Intel FAIL_REGEX "ignoring option .*argument required" # Intel FAIL_REGEX "[Uu]nknown option" # HP diff --git a/Modules/CheckCXXCompilerFlag.cmake b/Modules/CheckCXXCompilerFlag.cmake index c847216..19963ea 100644 --- a/Modules/CheckCXXCompilerFlag.cmake +++ b/Modules/CheckCXXCompilerFlag.cmake @@ -33,7 +33,7 @@ MACRO (CHECK_CXX_COMPILER_FLAG _FLAG _RESULT) FAIL_REGEX "unknown .*option" # Clang FAIL_REGEX "ignoring unknown option" # MSVC FAIL_REGEX "warning D9002" # MSVC, any lang - FAIL_REGEX "option .*not supported" # Intel + FAIL_REGEX "option.*not supported" # Intel FAIL_REGEX "invalid argument .*option" # Intel FAIL_REGEX "ignoring option .*argument required" # Intel FAIL_REGEX "[Uu]nknown option" # HP ----------------------------------------------------------------------- Summary of changes: Modules/CheckCCompilerFlag.cmake | 2 +- Modules/CheckCXXCompilerFlag.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits