[Cmake-commits] CMake branch, next, updated. v3.3.0-1908-ge63dcb4

[Stephen Kelly]

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  e63dcb41ddd21175acbd57588f5df92397c46d09 (commit)
       via  bc028a4aa580c4f162af5c77d766a34c7026c609 (commit)
      from  aac63e39213c28b139ce4793684e199190aa659a (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=e63dcb41ddd21175acbd57588f5df92397c46d09
commit e63dcb41ddd21175acbd57588f5df92397c46d09
Merge: aac63e3 bc028a4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 5 11:50:01 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 5 11:50:01 2015 -0400

    Merge topic 'use-generator-target' into next
    
    bc028a4a fixup! cmGeneratorTarget: Move GetSOName from cmTarget..


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bc028a4aa580c4f162af5c77d766a34c7026c609
commit bc028a4aa580c4f162af5c77d766a34c7026c609
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 5 17:47:13 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Aug 5 17:49:39 2015 +0200

    fixup! cmGeneratorTarget: Move GetSOName from cmTarget..

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index e0c6e86..c432cfb 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -762,9 +762,7 @@ void cmComputeLinkInformation::AddSharedDepItem(std::string const& item,
     return;
     }
 
-  cmGeneratorTarget *gtgt = tgt->GetMakefile()
-                               ->GetGlobalGenerator()
-                               ->GetGeneratorTarget(tgt);
+  cmGeneratorTarget *gtgt = 0;
 
   // Get a full path to the dependent shared library.
   // Add it to the runtime path computation so that the target being
@@ -772,6 +770,9 @@ void cmComputeLinkInformation::AddSharedDepItem(std::string const& item,
   std::string lib;
   if(tgt)
     {
+    cmGeneratorTarget *gtgt = tgt->GetMakefile()
+        ->GetGlobalGenerator()->GetGeneratorTarget(tgt);
+
     lib = gtgt->GetFullPath(this->Config, this->UseImportLibrary);
     this->AddLibraryRuntimeInfo(lib, tgt);
     }
@@ -797,7 +798,7 @@ void cmComputeLinkInformation::AddSharedDepItem(std::string const& item,
     }
   if(order)
     {
-    if(tgt)
+    if(gtgt)
       {
       std::string soName = gtgt->GetSOName(this->Config);
       const char* soname = soName.empty()? 0 : soName.c_str();

-----------------------------------------------------------------------

Summary of changes:
 Source/cmComputeLinkInformation.cxx |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake