[Cmake-commits] CMake branch, next, updated. v2.8.7-2841-g547382e

[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  547382e8c9980f0a50eb6cb94bab9bc61a577fed (commit)
       via  f6ecb900fb1bed7fc74e3c7d7091c6e796c099d3 (commit)
      from  18d8ef268ab8f20b9e78277db61b5db952864411 (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=547382e8c9980f0a50eb6cb94bab9bc61a577fed
commit 547382e8c9980f0a50eb6cb94bab9bc61a577fed
Merge: 18d8ef2 f6ecb90
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Feb 23 17:13:32 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 23 17:13:32 2012 -0500

    Merge topic 'icc-compiler-flags' into next
    
    f6ecb90 Check{C,CXX}CompilerFlag: detect ICC error messages


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f6ecb900fb1bed7fc74e3c7d7091c6e796c099d3
commit f6ecb900fb1bed7fc74e3c7d7091c6e796c099d3
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Feb 23 23:08:04 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu Feb 23 23:08:04 2012 +0100

    Check{C,CXX}CompilerFlag: detect ICC error messages
    
    Patch provided by Christopher Sean Morrison.

diff --git a/Modules/CheckCCompilerFlag.cmake b/Modules/CheckCCompilerFlag.cmake
index 3618bdf..1c08c59 100644
--- a/Modules/CheckCCompilerFlag.cmake
+++ b/Modules/CheckCCompilerFlag.cmake
@@ -33,6 +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 "[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 134f875..6fa69b1 100644
--- a/Modules/CheckCXXCompilerFlag.cmake
+++ b/Modules/CheckCXXCompilerFlag.cmake
@@ -33,6 +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 "[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   |    1 +
 Modules/CheckCXXCompilerFlag.cmake |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake