[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-192-ge080ad3
Brad King
brad.king at kitware.com
Wed Feb 15 15:19:26 EST 2017
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 e080ad36397d6b7d813b3b1c26a78414858c668a (commit)
via 28ee3784055ab6b21563d56024b1324c16949cbc (commit)
from 37537d95cbcb3e7265599523bd31fe13cef25654 (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=e080ad36397d6b7d813b3b1c26a78414858c668a
commit e080ad36397d6b7d813b3b1c26a78414858c668a
Merge: 37537d9 28ee378
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 15 15:19:25 2017 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 15 15:19:25 2017 -0500
Merge topic 'autogen_fix_3.8' into next
28ee3784 Autogen: Fix headers not skipped
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=28ee3784055ab6b21563d56024b1324c16949cbc
commit 28ee3784055ab6b21563d56024b1324c16949cbc
Author: Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed Feb 15 21:00:39 2017 +0100
Commit: Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Wed Feb 15 21:00:39 2017 +0100
Autogen: Fix headers not skipped
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index c84fe4f..1d6972b 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -655,10 +655,10 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
it != this->Headers.end(); ++it) {
const std::string& headerName = *it;
if (!this->MocSkipTest(headerName)) {
- headerFilesMoc.insert(this->Headers.begin(), this->Headers.end());
+ headerFilesMoc.insert(headerName);
}
if (!this->UicSkipTest(headerName)) {
- headerFilesUic.insert(this->Headers.begin(), this->Headers.end());
+ headerFilesUic.insert(headerName);
}
}
this->ParseHeaders(headerFilesMoc, headerFilesUic, includedMocs,
-----------------------------------------------------------------------
Summary of changes:
Source/cmQtAutoGenerators.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list