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 be3425b53e9033950a71dde897e7a47a2f7ef6d5 (commit)
via c7ca73b16e135ef599feaf8bb4971ba434ab0a31 (commit)
from c2b8218563aa73173833131b1b107511f765dc28 (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=be3425b53e9033950a71dde897e7a47a2f7ef6d5
commit be3425b53e9033950a71dde897e7a47a2f7ef6d5
Merge: c2b8218 c7ca73b
Author: Stephen Kelly <[email protected]>
AuthorDate: Mon Jun 8 18:08:50 2015 -0400
Commit: CMake Topic Stage <[email protected]>
CommitDate: Mon Jun 8 18:08:50 2015 -0400
Merge topic 'use-generator-target' into next
c7ca73b1 Compile fix.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c7ca73b16e135ef599feaf8bb4971ba434ab0a31
commit c7ca73b16e135ef599feaf8bb4971ba434ab0a31
Author: Stephen Kelly <[email protected]>
AuthorDate: Tue Jun 9 00:07:55 2015 +0200
Commit: Stephen Kelly <[email protected]>
CommitDate: Tue Jun 9 00:08:31 2015 +0200
Compile fix.
diff --git a/Source/cmGhsMultiTargetGenerator.h
b/Source/cmGhsMultiTargetGenerator.h
index f268071..c29a31e 100644
--- a/Source/cmGhsMultiTargetGenerator.h
+++ b/Source/cmGhsMultiTargetGenerator.h
@@ -100,7 +100,7 @@ private:
const std::string &language);
cmTarget *Target;
- cmGeneratorTarget GeneratorTarget;
+ cmGeneratorTarget* GeneratorTarget;
cmLocalGhsMultiGenerator *LocalGenerator;
cmMakefile *Makefile;
std::string AbsBuildFilePath;
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx
b/Source/cmGlobalVisualStudioGenerator.cxx
index 475f079..e130937 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -347,7 +347,7 @@ void cmGlobalVisualStudioGenerator::FollowLinkDepends(
{
if(di->IsLink())
{
- this->FollowLinkDepends((*di)->Target->Target, linked);
+ this->FollowLinkDepends((*di)->Target, linked);
}
}
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmGhsMultiTargetGenerator.h | 2 +-
Source/cmGlobalVisualStudioGenerator.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/mailman/listinfo/cmake-commits
