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 1f30b2e8dfdff2379cfc408bdf5d42aa1ad9092b (commit)
via 434e29a09cd7ae7195b30d3311290cca7cb0e007 (commit)
from be3425b53e9033950a71dde897e7a47a2f7ef6d5 (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=1f30b2e8dfdff2379cfc408bdf5d42aa1ad9092b
commit 1f30b2e8dfdff2379cfc408bdf5d42aa1ad9092b
Merge: be3425b 434e29a
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Mon Jun 8 18:17:36 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Jun 8 18:17:36 2015 -0400
Merge topic 'use-generator-target' into next
434e29a0 Compile fix.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=434e29a09cd7ae7195b30d3311290cca7cb0e007
commit 434e29a09cd7ae7195b30d3311290cca7cb0e007
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Tue Jun 9 00:17:11 2015 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Tue Jun 9 00:17:21 2015 +0200
Compile fix.
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx
b/Source/cmGlobalVisualStudioGenerator.cxx
index e130937..b10610a 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -872,7 +872,13 @@ cmGlobalVisualStudioGenerator::OrderedTargetDependSet
cmGlobalVisualStudioGenerator::OrderedTargetDependSet
::OrderedTargetDependSet(TargetSet const& targets)
{
- this->insert(targets.begin(), targets.end());
+ for (TargetSet::const_iterator it = targets.begin();
+ it != targets.end(); ++it)
+ {
+ cmGeneratorTarget* gt =
+ (*it)->GetGlobalGenerator()->GetGeneratorTarget(*it);
+ this->insert(gt);
+ }
}
std::string cmGlobalVisualStudioGenerator::ExpandCFGIntDir(
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalVisualStudioGenerator.cxx | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
