[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-376-g0829afd
Brad King
brad.king at kitware.com
Mon Feb 20 16:52:15 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 0829afd56fc3c04fe714cbb28d2f6bcefbe573c9 (commit)
via 574f4ddb9f5b18ae67665cc08b6dbb7e4609b86b (commit)
via 534c9e9fc0adcbe0cda11bfa869a448511af05c6 (commit)
from 8e7033c85264288c840edff511a03643f167e09c (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=0829afd56fc3c04fe714cbb28d2f6bcefbe573c9
commit 0829afd56fc3c04fe714cbb28d2f6bcefbe573c9
Merge: 8e7033c 574f4dd
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 20 16:52:14 2017 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 20 16:52:14 2017 -0500
Merge topic 'autogen_json' into next
574f4ddb fixup! Autogen: Overhaul moc include list generation
534c9e9f fixup! Autogen: Loop based macro detection instead of code duplication
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=574f4ddb9f5b18ae67665cc08b6dbb7e4609b86b
commit 574f4ddb9f5b18ae67665cc08b6dbb7e4609b86b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 20 16:50:42 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 20 16:50:42 2017 -0500
fixup! Autogen: Overhaul moc include list generation
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 1d120d7..4149e55 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -7,6 +7,7 @@
#include <cmConfigure.h>
#include <cmsys/FStream.hxx>
#include <cmsys/Terminal.h>
+#include <list>
#include <sstream>
#include <stdlib.h>
#include <string.h>
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=534c9e9fc0adcbe0cda11bfa869a448511af05c6
commit 534c9e9fc0adcbe0cda11bfa869a448511af05c6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 20 16:49:02 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 20 16:49:02 2017 -0500
fixup! Autogen: Loop based macro detection instead of code duplication
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index 236d4c5..c20b83c 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -10,6 +10,7 @@
#include <map>
#include <set>
#include <string>
+#include <utility>
#include <vector>
class cmMakefile;
-----------------------------------------------------------------------
Summary of changes:
Source/cmQtAutoGenerators.cxx | 1 +
Source/cmQtAutoGenerators.h | 1 +
2 files changed, 2 insertions(+)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list