diff options
author | Brad King <brad.king@kitware.com> | 2013-06-03 13:56:44 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-06-03 13:56:44 (GMT) |
commit | 3caf565d079af73f0ea8aaa7b6f4f212e0fcb15d (patch) | |
tree | d27ff59dbffe4dd8b672b9439266b2360b44e298 /Source/cmExportInstallFileGenerator.cxx | |
parent | d444fea16339e3d39bc38244d2f0ee36b31b6be1 (diff) | |
parent | dc1d025197d48829f2c0389824c8273b9e257413 (diff) | |
download | CMake-3caf565d079af73f0ea8aaa7b6f4f212e0fcb15d.zip CMake-3caf565d079af73f0ea8aaa7b6f4f212e0fcb15d.tar.gz CMake-3caf565d079af73f0ea8aaa7b6f4f212e0fcb15d.tar.bz2 |
Merge topic 'rpath-on-mac'
dc1d025 OS X: Add test for rpaths on Mac.
8576b3f OS X: Add support for @rpath in export files.
00d71bd Xcode: Add rpath support in Xcode generator.
94e7fef OS X: Add RPATH support for Mac.
Diffstat (limited to 'Source/cmExportInstallFileGenerator.cxx')
-rw-r--r-- | Source/cmExportInstallFileGenerator.cxx | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx index badb8aa..dfcf472 100644 --- a/Source/cmExportInstallFileGenerator.cxx +++ b/Source/cmExportInstallFileGenerator.cxx @@ -491,3 +491,19 @@ cmExportInstallFileGenerator } cmSystemTools::Error(e.str().c_str()); } + +std::string +cmExportInstallFileGenerator::InstallNameDir(cmTarget* target, + const std::string&) +{ + std::string install_name_dir; + + cmMakefile* mf = target->GetMakefile(); + if(mf->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME")) + { + install_name_dir = + target->GetInstallNameDirForInstallTree(); + } + + return install_name_dir; +} |