summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-01-29 14:13:56 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-01-29 14:13:56 (GMT)
commit983a98e5b8118ff5063400d8ffac7a511ca8002a (patch)
tree60e27968b56a2bbe0255abdddc29b5a4abb0a48f
parentabec4213d61cb74aba5da6f83220b38ef7882209 (diff)
parentd52b5f8835a1768dc3b16e8b8cc465b5f80098ad (diff)
downloadCMake-983a98e5b8118ff5063400d8ffac7a511ca8002a.zip
CMake-983a98e5b8118ff5063400d8ffac7a511ca8002a.tar.gz
CMake-983a98e5b8118ff5063400d8ffac7a511ca8002a.tar.bz2
Merge topic 'ctest-update-gmake-error-match'
d52b5f88 ctest_build: Update GNU make error message matching (#15379)
-rw-r--r--Source/CTest/cmCTestBuildHandler.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx
index 8f087ab..f941408 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -67,13 +67,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 ::",