[Cmake-commits] CMake branch, next, updated. v3.0.1-4958-gf339928

[Brad King]

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  f339928e5d211a57584b21c5a1679e22acd5bb88 (commit)
       via  914db028da1fc488df202a0c8705d1d5a8c258d1 (commit)
      from  033a5cf50898dd2fffcdbe32f9b06bb332ab516d (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=f339928e5d211a57584b21c5a1679e22acd5bb88
commit f339928e5d211a57584b21c5a1679e22acd5bb88
Merge: 033a5cf 914db02
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 19 08:51:23 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 19 08:51:23 2014 -0400

    Merge topic 'check-flag-for-intel' into next
    
    914db028 Check*CompilerFlag: Add another pattern for Intel (#15096)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=914db028da1fc488df202a0c8705d1d5a8c258d1
commit 914db028da1fc488df202a0c8705d1d5a8c258d1
Author:     Roland Schulz <roland at utk.edu>
AuthorDate: Mon Aug 18 17:14:00 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 19 08:50:41 2014 -0400

    Check*CompilerFlag: Add another pattern for Intel (#15096)
    
    Match "argument is of wrong type" warnings.

diff --git a/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake b/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
index aa7d96a..19b2bbc 100644
--- a/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
+++ b/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
@@ -28,6 +28,7 @@ macro (CHECK_COMPILER_FLAG_COMMON_PATTERNS _VAR)
      FAIL_REGEX "option.*not supported"                     # Intel
      FAIL_REGEX "invalid argument .*option"                 # Intel
      FAIL_REGEX "ignoring option .*argument required"       # Intel
+     FAIL_REGEX "ignoring option .*argument is of wrong type" # 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/CMakeCheckCompilerFlagCommonPatterns.cmake |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake