[Cmake-commits] CMake branch, next, updated. v3.1.1-2421-g5257503

[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  5257503e78c4d779e41f93643677ae89b1d16022 (commit)
       via  d52b5f8835a1768dc3b16e8b8cc465b5f80098ad (commit)
      from  7f8ae89fd03bf2d31a52a1e9665791e5934b0657 (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=5257503e78c4d779e41f93643677ae89b1d16022
commit 5257503e78c4d779e41f93643677ae89b1d16022
Merge: 7f8ae89 d52b5f8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 28 10:41:09 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 28 10:41:09 2015 -0500

    Merge topic 'ctest-update-gmake-error-match' into next
    
    d52b5f88 ctest_build: Update GNU make error message matching (#15379)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d52b5f8835a1768dc3b16e8b8cc465b5f80098ad
commit d52b5f8835a1768dc3b16e8b8cc465b5f80098ad
Author:     Marco Nolden <m.nolden at dkfz-heidelberg.de>
AuthorDate: Wed Jan 28 16:25:53 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 28 10:32:06 2015 -0500

    ctest_build: Update GNU make error message matching (#15379)
    
    The "No rule to make target" error message of gmake is not correctly
    recognized since GNU make changed the quoting style in commit 23c2b99e9d
    (Convert all "`'" quotes to "''" per new GNU Coding Standard guidelines,
    2012-03-04).  Fix our regex to match both old and new quoting styles.

diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx
index 2ec1365..13404a8 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:
 Source/CTest/cmCTestBuildHandler.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake