[Cmake-commits] CMake branch, next, updated. v3.3.0-rc1-305-g8453383
Stephen Kelly
steveire at gmail.com
Mon Jun 8 18:31:44 EDT 2015
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 84533831fddbb42fb04ee9b193ea6ac3c67ec064 (commit)
via 7b9ea5012013c6f8c26e19084a1ea66136b84939 (commit)
from 1f30b2e8dfdff2379cfc408bdf5d42aa1ad9092b (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=84533831fddbb42fb04ee9b193ea6ac3c67ec064
commit 84533831fddbb42fb04ee9b193ea6ac3c67ec064
Merge: 1f30b2e 7b9ea50
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jun 8 18:31:43 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 8 18:31:43 2015 -0400
Merge topic 'use-generator-target' into next
7b9ea501 Compile fix.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b9ea5012013c6f8c26e19084a1ea66136b84939
commit 7b9ea5012013c6f8c26e19084a1ea66136b84939
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 9 00:31:29 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jun 9 00:31:29 2015 +0200
Compile fix.
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index b10610a..ee4d21c 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -876,7 +876,7 @@ cmGlobalVisualStudioGenerator::OrderedTargetDependSet
it != targets.end(); ++it)
{
cmGeneratorTarget* gt =
- (*it)->GetGlobalGenerator()->GetGeneratorTarget(*it);
+ (*it)->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(*it);
this->insert(gt);
}
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalVisualStudioGenerator.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list