[Cmake-commits] CMake branch, next, updated. v3.0.0-4653-gea27d5a

[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  ea27d5ac34e10842b04cb8533d6688f93e736b9d (commit)
       via  cac91206b3193823d0b8ca3fdb620f7ac32f8a32 (commit)
      from  51cedfa05f875d31ba4abd362ea1c00e68e09e54 (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=ea27d5ac34e10842b04cb8533d6688f93e736b9d
commit ea27d5ac34e10842b04cb8533d6688f93e736b9d
Merge: 51cedfa cac9120
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 30 15:23:08 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 30 15:23:08 2014 -0400

    Merge topic 'check-flag-avoid-semicolon' into next
    
    cac91206 Check*CompilerFlag: Avoid ';' in common pattern (#15048)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cac91206b3193823d0b8ca3fdb620f7ac32f8a32
commit cac91206b3193823d0b8ca3fdb620f7ac32f8a32
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 30 15:19:48 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 30 15:21:44 2014 -0400

    Check*CompilerFlag: Avoid ';' in common pattern (#15048)
    
    In commit v3.0.0-rc1~551^2~1 (Check*CompilerFlag: make C and CXX modules
    share most error patterns, 2013-08-08) a pattern containing a ';' was
    moved out of a ""-quoted argument and into a variable.  CMake flattens
    the containing list and breaks the pattern.  Use a '.' to match ';'.

diff --git a/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake b/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
index 9d8ba9e..abbcda4 100644
--- a/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
+++ b/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
@@ -32,7 +32,7 @@ macro (CHECK_COMPILER_FLAG_COMMON_PATTERNS _VAR)
      FAIL_REGEX "[Ww]arning: [Oo]ption"                     # SunPro
      FAIL_REGEX "command option .* is not recognized"       # XL
      FAIL_REGEX "command option .* contains an incorrect subargument" # XL
-     FAIL_REGEX "not supported in this configuration; ignored"       # AIX
+     FAIL_REGEX "not supported in this configuration. ignored"       # AIX
      FAIL_REGEX "File with unknown suffix passed to linker" # PGI
      FAIL_REGEX "WARNING: unknown flag:"                    # Open64
      FAIL_REGEX "Incorrect command line option:"            # Borland

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

Summary of changes:
 Modules/CMakeCheckCompilerFlagCommonPatterns.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake