[Cmake-commits] CMake branch, next, updated. v3.2.2-3215-g11716a5

[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  11716a5999b1fc2204102e9116e5d13b9c47e8fd (commit)
       via  44a4e54547a817546d3a12ed6ce8f16c62a76be8 (commit)
      from  549946624eb85c6f5e2920f1ac364295f0e4b3a7 (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=11716a5999b1fc2204102e9116e5d13b9c47e8fd
commit 11716a5999b1fc2204102e9116e5d13b9c47e8fd
Merge: 5499466 44a4e54
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 27 11:51:20 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 27 11:51:20 2015 -0400

    Merge topic 'ctest-update-gmake-error-match' into next
    
    44a4e545 ctest_build: Fix regression in GNU make error message matching


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=44a4e54547a817546d3a12ed6ce8f16c62a76be8
commit 44a4e54547a817546d3a12ed6ce8f16c62a76be8
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed May 27 11:23:15 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed May 27 11:48:38 2015 -0400

    ctest_build: Fix regression in GNU make error message matching
    
    The regex update in commit v3.1.2~4^2 (ctest_build: Update GNU make
    error message matching, 2015-01-28) broke matching of the messages it
    updated.  Remove the escape character before the square brackets added
    by that commit.

diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx
index 13404a8..c741527 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -70,13 +70,13 @@ static const char* cmCTestErrorMatches[] = {
   "^CMake Error.*:",
   ":[ \\t]cannot find",
   ":[ \\t]can't find",
-  ": \\*\\*\\* No rule to make target \\[`'].*\\'.  Stop",
+  ": \\*\\*\\* No rule to make target [`'].*\\'.  Stop",
   ": \\*\\*\\* No targets specified and no makefile found",
   ": Invalid loader fixup for symbol",
   ": Invalid fixups exist",
   ": Can't find library for",
   ": internal link edit command failed",
-  ": Unrecognized option \\[`'].*\\'",
+  ": Unrecognized option [`'].*\\'",
   "\", line [0-9]+\\.[0-9]+: [0-9]+-[0-9]+ \\([^WI]\\)",
   "ld: 0706-006 Cannot find or open library file: -l ",
   "ild: \\(argument error\\) can't find library argument ::",

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

Summary of changes:


hooks/post-receive
-- 
CMake