[Cmake-commits] CMake branch, next, updated. v2.8.7-3463-gef47017

[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  ef4701725585035de79b6efbd73be7dd7259904f (commit)
       via  bbb895959f54a9dec9f5132313f4a71fafc458e5 (commit)
      from  5faeb09806c0d4bf27a149f549410b8ac4a16be0 (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=ef4701725585035de79b6efbd73be7dd7259904f
commit ef4701725585035de79b6efbd73be7dd7259904f
Merge: 5faeb09 bbb8959
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Apr 16 16:38:01 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 16 16:38:01 2012 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bbb895959f54a9dec9f5132313f4a71fafc458e5
commit bbb895959f54a9dec9f5132313f4a71fafc458e5
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: Mon Apr 16 22:37:01 2012 +0200

    Check{C,CXX}CompilerFlag: add 2 more Intel warning types (#12576)
    
    Patch provided by Hans Johnson.

diff --git a/Modules/CheckCCompilerFlag.cmake b/Modules/CheckCCompilerFlag.cmake
index 1c08c59..1de78f1 100644
--- a/Modules/CheckCCompilerFlag.cmake
+++ b/Modules/CheckCCompilerFlag.cmake
@@ -34,6 +34,8 @@ MACRO (CHECK_C_COMPILER_FLAG _FLAG _RESULT)
      FAIL_REGEX "ignoring unknown option"                   # MSVC
      FAIL_REGEX "warning D9002"                             # MSVC, any lang
      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..c847216 100644
--- a/Modules/CheckCXXCompilerFlag.cmake
+++ b/Modules/CheckCXXCompilerFlag.cmake
@@ -34,6 +34,8 @@ MACRO (CHECK_CXX_COMPILER_FLAG _FLAG _RESULT)
      FAIL_REGEX "ignoring unknown option"                   # MSVC
      FAIL_REGEX "warning D9002"                             # MSVC, any lang
      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:
 Modules/CheckCCompilerFlag.cmake   |    2 ++
 Modules/CheckCXXCompilerFlag.cmake |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake