[Cmake-commits] CMake branch, next, updated. v2.8.6-2227-g5bcab87

[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  5bcab87427884780041f128f88e37f5faacf0f0c (commit)
       via  56f29f48c2f93251838519cade02ce57dd77510f (commit)
      from  9480e7ebb160853e21f794f5b7aeee79deb7dfbc (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=5bcab87427884780041f128f88e37f5faacf0f0c
commit 5bcab87427884780041f128f88e37f5faacf0f0c
Merge: 9480e7e 56f29f4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 15 09:38:41 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 15 09:38:41 2011 -0500

    Merge topic 'intel-error-regex-issue-12627' into next
    
    56f29f4 CTest: Recognize Intel errors without space before colon (#12627)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=56f29f48c2f93251838519cade02ce57dd77510f
commit 56f29f48c2f93251838519cade02ce57dd77510f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 15 09:30:33 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 15 09:31:12 2011 -0500

    CTest: Recognize Intel errors without space before colon (#12627)
    
    Fix the regex meant to match errors of the form:
    
     C:\some\dir\source.cpp(17): catastrophic error: could not open source file "some_header.h"
    
    to make the space between ')' and ':' optional.

diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx
index 86bd85d..34a3e60 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -57,7 +57,7 @@ static const char* cmCTestErrorMatches[] = {
   "^ild:([ \\t])*\\(undefined symbol\\)",
   "([^ :]+) : (error|fatal error|catastrophic error)",
   "([^:]+): (Error:|error|undefined reference|multiply defined)",
-  "([^:]+)\\(([^\\)]+)\\) : (error|fatal error|catastrophic error)",
+  "([^:]+)\\(([^\\)]+)\\) ?: (error|fatal error|catastrophic error)",
   "^fatal error C[0-9]+:",
   ": syntax error ",
   "^collect2: ld returned 1 exit status",

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

Summary of changes:
 Source/CTest/cmCTestBuildHandler.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake