diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-08-05 17:07:03 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-10 09:03:48 (GMT) |
| commit | e73916992c6893572f24ee4fa631b33445d6cdf6 (patch) | |
| tree | c569a4a8b11ad4dd716f14862e2e3990b9241613 /Source/cmComputeLinkInformation.cxx | |
| parent | c5718217ad242ca0fc6e6b15f4ee670e4a332c93 (diff) | |
| download | CMake-e73916992c6893572f24ee4fa631b33445d6cdf6.zip CMake-e73916992c6893572f24ee4fa631b33445d6cdf6.tar.gz CMake-e73916992c6893572f24ee4fa631b33445d6cdf6.tar.bz2 | |
cmGeneratorTarget: Move HasMacOSXRpathInstallNameDir from cmTarget.
Diffstat (limited to 'Source/cmComputeLinkInformation.cxx')
| -rw-r--r-- | Source/cmComputeLinkInformation.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index d907dd0..b8e2284 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -1783,12 +1783,13 @@ void cmComputeLinkInformation::AddLibraryRuntimeInfo(std::string const& fullPath, cmTarget const* target) { + cmGeneratorTarget *gtgt = this->GlobalGenerator->GetGeneratorTarget(target); // Ignore targets on Apple where install_name is not @rpath. // The dependenty library can be found with other means such as // @loader_path or full paths. if(this->Makefile->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME")) { - if(!target->HasMacOSXRpathInstallNameDir(this->Config)) + if(!gtgt->HasMacOSXRpathInstallNameDir(this->Config)) { return; } @@ -1810,7 +1811,6 @@ cmComputeLinkInformation::AddLibraryRuntimeInfo(std::string const& fullPath, // Try to get the soname of the library. Only files with this name // could possibly conflict. - cmGeneratorTarget *gtgt = this->GlobalGenerator->GetGeneratorTarget(target); std::string soName = gtgt->GetSOName(this->Config); const char* soname = soName.empty()? 0 : soName.c_str(); |