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 c2382855e6a9706c9f71beb1f57bfafc75587f65 (commit)
via 7f13f7a99d4fefc39aafc6efe0582fa5ece4f8c9 (commit)
from 6b05e33c95b2bb392f6c6602da4677747613e35d (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=c2382855e6a9706c9f71beb1f57bfafc75587f65
commit c2382855e6a9706c9f71beb1f57bfafc75587f65
Merge: 6b05e33 7f13f7a
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Sun Oct 9 07:14:44 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sun Oct 9 07:14:44 2016 -0400
Merge topic 'minor-cleanups' into next
7f13f7a9 fixup! cmLocalGenerator: Extract definition retrieval out of loop
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f13f7a99d4fefc39aafc6efe0582fa5ece4f8c9
commit 7f13f7a99d4fefc39aafc6efe0582fa5ece4f8c9
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Sun Oct 9 13:14:25 2016 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Sun Oct 9 13:14:25 2016 +0200
fixup! cmLocalGenerator: Extract definition retrieval out of loop
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 0a99e87..025b82a 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1176,7 +1176,8 @@ void cmLocalGenerator::GetTargetFlags(
!(this->Makefile->IsOn("CYGWIN") || this->Makefile->IsOn("MINGW"))) {
std::vector<cmSourceFile*> sources;
target->GetSourceFiles(sources, buildType);
- std::string defFlag =
this->Makefile->GetSafeDefinition("CMAKE_LINK_DEF_FILE_FLAG");
+ std::string defFlag =
+ this->Makefile->GetSafeDefinition("CMAKE_LINK_DEF_FILE_FLAG");
for (std::vector<cmSourceFile*>::const_iterator i = sources.begin();
i != sources.end(); ++i) {
cmSourceFile* sf = *i;
-----------------------------------------------------------------------
Summary of changes:
Source/cmLocalGenerator.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
