[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2802-g8706235
Brad King
brad.king at kitware.com
Fri Jun 28 08:37:19 EDT 2013
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 870623528a411bbb671c5060d8cb1846ac9e0e5e (commit)
via 05bcdff08e3c51ca21d81fc00437e5181f00b5c2 (commit)
from 66d1b3e706216ada1d4f5cae0f5d2677fd2dd1d8 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=870623528a411bbb671c5060d8cb1846ac9e0e5e
commit 870623528a411bbb671c5060d8cb1846ac9e0e5e
Merge: 66d1b3e 05bcdff
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 28 08:37:16 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 28 08:37:16 2013 -0400
Merge topic 'ninja_phony_targets' into next
05bcdff cmGlobalNinjaGenerator: Expand set insertion for VS 6
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05bcdff08e3c51ca21d81fc00437e5181f00b5c2
commit 05bcdff08e3c51ca21d81fc00437e5181f00b5c2
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 28 08:36:30 2013 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Jun 28 08:36:30 2013 -0400
cmGlobalNinjaGenerator: Expand set insertion for VS 6
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 9ed0200..9596ebc 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -964,8 +964,11 @@ void cmGlobalNinjaGenerator::WriteUnknownExplicitDependencies(std::ostream& os)
}
//insert outputs from all WirteBuild commands
- knownDependencies.insert(this->CombinedBuildOutputs.begin(),
- this->CombinedBuildOutputs.end());
+ for(std::set<std::string>::iterator i = this->CombinedBuildOutputs.begin();
+ i != this->CombinedBuildOutputs.end(); ++i)
+ {
+ knownDependencies.insert(*i);
+ }
//after we have combined the data into knownDependencies we have no need
//to keep this data around
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalNinjaGenerator.cxx | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list