diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2019-11-01 21:37:59 (GMT) |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2019-11-04 17:01:05 (GMT) |
| commit | 3c85f11fedf55c5072cd00deb129a0782130d78c (patch) | |
| tree | 7e3f97d3052b8edff775467c01d36124706d009c /Source/cmInstallTargetGenerator.cxx | |
| parent | 2ec1156b80485fedba5b6d9b0802c21e1cbc2d8f (diff) | |
| download | CMake-3c85f11fedf55c5072cd00deb129a0782130d78c.zip CMake-3c85f11fedf55c5072cd00deb129a0782130d78c.tar.gz CMake-3c85f11fedf55c5072cd00deb129a0782130d78c.tar.bz2 | |
INSTALL_NAME_DIR: Add support for generator expressions
Diffstat (limited to 'Source/cmInstallTargetGenerator.cxx')
| -rw-r--r-- | Source/cmInstallTargetGenerator.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx index 0cd04cc..90cccab 100644 --- a/Source/cmInstallTargetGenerator.cxx +++ b/Source/cmInstallTargetGenerator.cxx @@ -554,7 +554,8 @@ void cmInstallTargetGenerator::AddInstallNamePatchRule( // 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_install = tgt->GetInstallNameDirForInstallTree( + config, "${CMAKE_INSTALL_PREFIX}"); if (for_build != for_install) { // The directory portions differ. Append the filename to // create the mapping. @@ -577,7 +578,8 @@ void cmInstallTargetGenerator::AddInstallNamePatchRule( if (this->Target->GetType() == cmStateEnums::SHARED_LIBRARY) { std::string for_build = this->Target->GetInstallNameDirForBuildTree(config); - std::string for_install = this->Target->GetInstallNameDirForInstallTree(); + std::string for_install = this->Target->GetInstallNameDirForInstallTree( + config, "${CMAKE_INSTALL_PREFIX}"); if (this->Target->IsFrameworkOnApple() && for_install.empty()) { // Frameworks seem to have an id corresponding to their own full |