[Cmake-commits] CMake branch, next, updated. v3.3.0-1945-gcb91af0
Stephen Kelly
steveire at gmail.com
Wed Aug 5 12:20:31 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 cb91af0e2e44760abbe34853a3b89a5f300e15ad (commit)
via 130c3373df6e87821111adbdeb7efefd17556686 (commit)
from 1d8f34ecc7322e30cdcad137460581f5f32ffa4f (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=cb91af0e2e44760abbe34853a3b89a5f300e15ad
commit cb91af0e2e44760abbe34853a3b89a5f300e15ad
Merge: 1d8f34e 130c337
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 5 12:20:31 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 5 12:20:31 2015 -0400
Merge topic 'use-generator-target' into next
130c3373 fixup! cmGeneratorTarget: Move GetSOName from cmTarget..
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=130c3373df6e87821111adbdeb7efefd17556686
commit 130c3373df6e87821111adbdeb7efefd17556686
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 5 18:20:14 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Aug 5 18:20:14 2015 +0200
fixup! cmGeneratorTarget: Move GetSOName from cmTarget..
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index c432cfb..c3f36af 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -770,8 +770,7 @@ void cmComputeLinkInformation::AddSharedDepItem(std::string const& item,
std::string lib;
if(tgt)
{
- cmGeneratorTarget *gtgt = tgt->GetMakefile()
- ->GetGlobalGenerator()->GetGeneratorTarget(tgt);
+ gtgt = tgt->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(tgt);
lib = gtgt->GetFullPath(this->Config, this->UseImportLibrary);
this->AddLibraryRuntimeInfo(lib, tgt);
-----------------------------------------------------------------------
Summary of changes:
Source/cmComputeLinkInformation.cxx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list