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 6e49b3c19d945d5a0822e3a8457451593b8b9369 (commit)
via f3a5e6f689b17b02ff433d7c313f508874b93c0f (commit)
from 93d9a39bcf9942e5763a2c67c2f100053c057eb8 (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=6e49b3c19d945d5a0822e3a8457451593b8b9369
commit 6e49b3c19d945d5a0822e3a8457451593b8b9369
Merge: 93d9a39 f3a5e6f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Oct 6 09:45:44 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Oct 6 09:45:44 2015 -0400
Merge topic 'refactor-qt-autogen' into next
f3a5e6f6 fixup! QtAutogen: Port API to cmGeneratorTarget.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f3a5e6f689b17b02ff433d7c313f508874b93c0f
commit f3a5e6f689b17b02ff433d7c313f508874b93c0f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Oct 6 09:44:18 2015 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Oct 6 09:44:18 2015 -0400
fixup! QtAutogen: Port API to cmGeneratorTarget.
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx
b/Source/cmQtAutoGeneratorInitializer.cxx
index c03b5c8..2703f4c 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -105,10 +105,11 @@ static void SetupSourceFiles(cmGeneratorTarget const*
target,
}
}
-static void GetCompileDefinitionsAndDirectories(cmGeneratorTarget const*
target,
- const std::string& config,
- std::string &incs,
- std::string &defs)
+static void GetCompileDefinitionsAndDirectories(
+ cmGeneratorTarget const* target,
+ const std::string& config,
+ std::string &incs,
+ std::string &defs)
{
std::vector<std::string> includeDirs;
cmLocalGenerator *localGen = target->GetLocalGenerator();
-----------------------------------------------------------------------
Summary of changes:
Source/cmQtAutoGeneratorInitializer.cxx | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
