diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2013-05-20 22:57:58 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-06-03 13:42:05 (GMT) |
| commit | 8576b3f978e65a9c94630226e1da3f03047691a7 (patch) | |
| tree | 256b6205b49a5518434f87484bf37811cfb3d27f /Source/cmExportFileGenerator.cxx | |
| parent | 00d71bdd193b645aec10b41866bddb164c0eb093 (diff) | |
| download | CMake-8576b3f978e65a9c94630226e1da3f03047691a7.zip CMake-8576b3f978e65a9c94630226e1da3f03047691a7.tar.gz CMake-8576b3f978e65a9c94630226e1da3f03047691a7.tar.bz2 | |
OS X: Add support for @rpath in export files.
Also expand the IMPORTED_SONAME property for targets
to match the install_name.
Diffstat (limited to 'Source/cmExportFileGenerator.cxx')
| -rw-r--r-- | Source/cmExportFileGenerator.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx index 27ec56b..c465a68 100644 --- a/Source/cmExportFileGenerator.cxx +++ b/Source/cmExportFileGenerator.cxx @@ -624,8 +624,12 @@ cmExportFileGenerator std::string value; if(target->HasSOName(config)) { + if(mf->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME")) + { + value = this->InstallNameDir(target, config); + } prop = "IMPORTED_SONAME"; - value = target->GetSOName(config); + value += target->GetSOName(config); } else { |