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 6ec9f59bb05083853f5b25bd8af8733c1c53d650 (commit)
via a987e5f5315554be4705eb4be5c0188b068235c0 (commit)
from 4237e9d3fde9f6fce5cb7fe8c85c21686d8708a5 (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=6ec9f59bb05083853f5b25bd8af8733c1c53d650
commit 6ec9f59bb05083853f5b25bd8af8733c1c53d650
Merge: 4237e9d a987e5f
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Thu Aug 6 22:10:40 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Aug 6 22:10:40 2015 -0400
Merge topic 'global-generator-makefiles' into next
a987e5f5 Revert "cmGlobalVisualStudioGenerator: Simplify access to
cmGeneratorTarget."
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a987e5f5315554be4705eb4be5c0188b068235c0
commit a987e5f5315554be4705eb4be5c0188b068235c0
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Fri Aug 7 04:10:01 2015 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Fri Aug 7 04:10:01 2015 +0200
Revert "cmGlobalVisualStudioGenerator: Simplify access to
cmGeneratorTarget."
This reverts commit 2ee3bd6f3e99be2dc1bf2b3111681838f0b8d268.
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx
b/Source/cmGlobalVisualStudioGenerator.cxx
index 4ac259b..2f9d79a 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -885,7 +885,8 @@ cmGlobalVisualStudioGenerator::OrderedTargetDependSet
for (TargetSet::const_iterator it = targets.begin();
it != targets.end(); ++it)
{
- cmGeneratorTarget* gt = this->GetGeneratorTarget(*it);
+ cmGeneratorTarget* gt =
+ (*it)->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(*it);
this->insert(gt);
}
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalVisualStudioGenerator.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
