[Cmake-commits] CMake branch, next, updated. v2.8.8-2733-g1464e43

[Rolf Eike Beer]

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  1464e43554b942ecacaff46b48712854d95c5d7a (commit)
       via  f621ead8b78862a00e841dc336f601bbe267364c (commit)
      from  f9ff5661989ad6364672dbe232175d99be149f22 (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=1464e43554b942ecacaff46b48712854d95c5d7a
commit 1464e43554b942ecacaff46b48712854d95c5d7a
Merge: f9ff566 f621ead
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Apr 26 18:53:49 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 26 18:53:49 2012 -0400

    Merge topic 'more-Intel-warnings' into next
    
    f621ead Check{C,CXX}CompilerFlag: catch more Intel warning types (#12576)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f621ead8b78862a00e841dc336f601bbe267364c
commit f621ead8b78862a00e841dc336f601bbe267364c
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Apr 16 22:37:01 2012 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri Apr 27 00:52:55 2012 +0200

    Check{C,CXX}CompilerFlag: catch more Intel warning types (#12576)
    
    Patch provided by Szilárd Páll.

diff --git a/Modules/CheckCCompilerFlag.cmake b/Modules/CheckCCompilerFlag.cmake
index 1c08c59..90d04ac 100644
--- a/Modules/CheckCCompilerFlag.cmake
+++ b/Modules/CheckCCompilerFlag.cmake
@@ -33,7 +33,9 @@ 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
      FAIL_REGEX "[Ww]arning: [Oo]ption"                     # SunPro
      FAIL_REGEX "command option .* is not recognized"       # XL
diff --git a/Modules/CheckCXXCompilerFlag.cmake b/Modules/CheckCXXCompilerFlag.cmake
index 6fa69b1..19963ea 100644
--- a/Modules/CheckCXXCompilerFlag.cmake
+++ b/Modules/CheckCXXCompilerFlag.cmake
@@ -33,7 +33,9 @@ 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
      FAIL_REGEX "[Ww]arning: [Oo]ption"                     # SunPro
      FAIL_REGEX "command option .* is not recognized"       # XL

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake