summaryrefslogtreecommitdiffstats
path: root/Source/cmComputeLinkInformation.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-08-13 13:56:54 (GMT)
committerBrad King <brad.king@kitware.com>2015-08-13 14:24:10 (GMT)
commit9b449e9c5d79465a807c052c6707e83a1df9efbc (patch)
tree94f3ded0b7891ab9bb2e3cc928cb876394578cfe /Source/cmComputeLinkInformation.cxx
parent29886ce76482a8c857841015b58d1e91a9ee5c8e (diff)
downloadCMake-9b449e9c5d79465a807c052c6707e83a1df9efbc.zip
CMake-9b449e9c5d79465a807c052c6707e83a1df9efbc.tar.gz
CMake-9b449e9c5d79465a807c052c6707e83a1df9efbc.tar.bz2
cmComputeLinkInformation: Lookup a target only if we have one
The change in commit 27252b24 (cmComputeLinkInformation: Simplify generator object access, 2015-08-02) broke the conditional use of a target introduced in commit 41abdc17 (cmGeneratorTarget: Move GetSOName from cmTarget, 2015-08-04). Restore the conditional lookup. Add a test case that hacks platform information variables to trigger this code everywhere.
Diffstat (limited to 'Source/cmComputeLinkInformation.cxx')
-rw-r--r--Source/cmComputeLinkInformation.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index c16472e..32f5d68 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -760,7 +760,7 @@ void cmComputeLinkInformation::AddSharedDepItem(std::string const& item,
return;
}
- cmGeneratorTarget *gtgt = this->GlobalGenerator->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