[Cmake-commits] CMake branch, next, updated. v3.5.2-1330-g6de0012
Brad King
brad.king at kitware.com
Wed May 11 10:08:04 EDT 2016
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 6de0012188c436d5a6fb84a7fd483f818de5ec1b (commit)
via eafe541ff6be9e73901f768c8ccff213a57036bd (commit)
via eb4f5104123a531bd49cb5834f3c66bb9e6aeeb6 (commit)
from 230dfa6e6a29db28405c73085194540a1b66b2b3 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6de0012188c436d5a6fb84a7fd483f818de5ec1b
commit 6de0012188c436d5a6fb84a7fd483f818de5ec1b
Merge: 230dfa6 eafe541
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed May 11 10:08:02 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 11 10:08:02 2016 -0400
Merge topic 'ctest-suppress-Note' into next
eafe541f CTest: Do not treat "Note: ..." lines as errors (#14394)
eb4f5104 CMake Nightly Date Stamp
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eafe541ff6be9e73901f768c8ccff213a57036bd
commit eafe541ff6be9e73901f768c8ccff213a57036bd
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed May 11 09:55:58 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed May 11 09:56:51 2016 -0400
CTest: Do not treat "Note: ..." lines as errors (#14394)
Otherwise CTest interprets the Qt5 moc tool output
Note: No relevant classes found. No output generated.
as a compiler error.
diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx
index 9647968..ed0cad7 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -102,6 +102,7 @@ static const char* cmCTestErrorExceptions[] = {
": warning",
": \\(Warning\\)",
": note",
+ "Note:",
"makefile:",
"Makefile:",
":[ \\t]+Where:",
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Source/CTest/cmCTestBuildHandler.cxx | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list