summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2011-12-16 15:15:35 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2011-12-16 15:15:35 (GMT)
commit1706a7ed5b43f39dd6a8ff2f7ed7552b88463268 (patch)
tree665854c2ef144eddfd6c8ed0f866cd0527393fa5
parent52d5f67ec7ac1f8c97a0aa51750b7496a25dcfa8 (diff)
parent56f29f48c2f93251838519cade02ce57dd77510f (diff)
downloadCMake-1706a7ed5b43f39dd6a8ff2f7ed7552b88463268.zip
CMake-1706a7ed5b43f39dd6a8ff2f7ed7552b88463268.tar.gz
CMake-1706a7ed5b43f39dd6a8ff2f7ed7552b88463268.tar.bz2
Merge topic 'intel-error-regex-issue-12627'
56f29f4 CTest: Recognize Intel errors without space before colon (#12627)
-rw-r--r--Source/CTest/cmCTestBuildHandler.cxx2
1 files changed, 1 insertions, 1 deletions
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",