diff options
| author | Brad King <brad.king@kitware.com> | 2013-06-03 09:56:44 -0400 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-06-03 09:56:44 -0400 |
| commit | 3caf565d079af73f0ea8aaa7b6f4f212e0fcb15d (patch) | |
| tree | d27ff59dbffe4dd8b672b9439266b2360b44e298 /Source/cmGlobalXCodeGenerator.cxx | |
| parent | d444fea16339e3d39bc38244d2f0ee36b31b6be1 (diff) | |
| parent | dc1d025197d48829f2c0389824c8273b9e257413 (diff) | |
| download | cmake-3caf565d079af73f0ea8aaa7b6f4f212e0fcb15d.tar.gz | |
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/cmGlobalXCodeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 955f0576d9..d782a06727 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -2242,6 +2242,29 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target, buildSettings->AddAttribute("INSTALL_PATH", this->CreateString(install_name_dir.c_str())); + // Create the LD_RUNPATH_SEARCH_PATHS + cmComputeLinkInformation* pcli = target.GetLinkInformation(configName); + if(pcli) + { + std::string search_paths; + std::vector<std::string> runtimeDirs; + pcli->GetRPath(runtimeDirs, false); + for(std::vector<std::string>::const_iterator i = runtimeDirs.begin(); + i != runtimeDirs.end(); ++i) + { + if(!search_paths.empty()) + { + search_paths += " "; + } + search_paths += this->XCodeEscapePath((*i).c_str()); + } + if(!search_paths.empty()) + { + buildSettings->AddAttribute("LD_RUNPATH_SEARCH_PATHS", + this->CreateString(search_paths.c_str())); + } + } + buildSettings->AddAttribute("OTHER_LDFLAGS", this->CreateString(extraLinkOptions.c_str())); buildSettings->AddAttribute("OTHER_REZFLAGS", |