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 cf71691e35937162d92a089277800bdbf18fd70b (commit)
via 8e7c207e760495633fdafb0a567f825aa2f57305 (commit)
from fbc3d63568e9f17eeb09e7f73f5c16ce47e0a2cd (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=cf71691e35937162d92a089277800bdbf18fd70b
commit cf71691e35937162d92a089277800bdbf18fd70b
Merge: fbc3d63 8e7c207
Author: Stephen Kelly <[email protected]>
AuthorDate: Sat Sep 15 04:08:22 2012 -0400
Commit: CMake Topic Stage <[email protected]>
CommitDate: Sat Sep 15 04:08:22 2012 -0400
Merge topic 'generator-expression-refactor' into next
8e7c207 Use a manual loop to insert into set::set.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e7c207e760495633fdafb0a567f825aa2f57305
commit 8e7c207e760495633fdafb0a567f825aa2f57305
Author: Stephen Kelly <[email protected]>
AuthorDate: Sat Sep 15 09:49:17 2012 +0200
Commit: Stephen Kelly <[email protected]>
CommitDate: Sat Sep 15 09:49:17 2012 +0200
Use a manual loop to insert into set::set.
Some of the dashboard machines do not have the algorithm insert.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index a7c9c3a..6219da6 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1652,7 +1652,15 @@ cmTargetTraceDependencies
const cmCompiledGeneratorExpression &cge = ge.Parse(*cli);
cge.Evaluate(this->Makefile, 0, true);
std::set<cmTarget*> geTargets = cge.GetTargets();
- targets.insert(geTargets.begin(), geTargets.end());
+ // A handful of machines on the dashboard don't have the
+ // iterator overload below, so we have to do it manually.
+// targets.insert(geTargets.begin(), geTargets.end());
+ std::set<cmTarget*>::const_iterator it = geTargets.begin();
+ const std::set<cmTarget*>::const_iterator end = geTargets.end();
+ for ( ; it != end; ++it)
+ {
+ targets.insert(*it);
+ }
}
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmTarget.cxx | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
