diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-08-04 17:19:47 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-08-05 16:20:47 (GMT) |
| commit | d560bfd2739f2594119c49d82485b99bb4fbbe1f (patch) | |
| tree | 88787d2a552094cb6b44a7a1e56ed42462d8c49e /Source/cmInstallTargetGenerator.cxx | |
| parent | 89e2a080e977b9632fa13c627b6a5370250d6ed5 (diff) | |
| download | CMake-d560bfd2739f2594119c49d82485b99bb4fbbe1f.zip CMake-d560bfd2739f2594119c49d82485b99bb4fbbe1f.tar.gz CMake-d560bfd2739f2594119c49d82485b99bb4fbbe1f.tar.bz2 | |
cmGeneratorTarget: Move GetInstallNameDir* from cmTarget.
Diffstat (limited to 'Source/cmInstallTargetGenerator.cxx')
| -rw-r--r-- | Source/cmInstallTargetGenerator.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx index 24c1c49..30cf175 100644 --- a/Source/cmInstallTargetGenerator.cxx +++ b/Source/cmInstallTargetGenerator.cxx @@ -576,11 +576,14 @@ cmInstallTargetGenerator continue; } + cmGeneratorTarget *gtgt = tgt->GetMakefile() + ->GetGlobalGenerator() + ->GetGeneratorTarget(tgt); // If the build tree and install tree use different path // components of the install_name field then we need to create a // mapping to be applied after installation. - std::string for_build = tgt->GetInstallNameDirForBuildTree(config); - std::string for_install = tgt->GetInstallNameDirForInstallTree(); + std::string for_build = gtgt->GetInstallNameDirForBuildTree(config); + std::string for_install = gtgt->GetInstallNameDirForInstallTree(); if(for_build != for_install) { // The directory portions differ. Append the filename to @@ -605,9 +608,9 @@ cmInstallTargetGenerator if(this->Target->GetType() == cmTarget::SHARED_LIBRARY) { std::string for_build = - this->Target->Target->GetInstallNameDirForBuildTree(config); + this->Target->GetInstallNameDirForBuildTree(config); std::string for_install = - this->Target->Target->GetInstallNameDirForInstallTree(); + this->Target->GetInstallNameDirForInstallTree(); if(this->Target->Target->IsFrameworkOnApple() && for_install.empty()) { |