diff options
| author | Brad King <brad.king@kitware.com> | 2014-01-02 14:23:09 -0500 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-01-02 14:23:09 -0500 |
| commit | 0d63bdd2d9690cfdb43671af7465704675a68733 (patch) | |
| tree | 17370b9ce679a48de0ed5f3baf7cddd27ed08e01 /Source/cmComputeLinkInformation.cxx | |
| parent | c0ea0604a0dcd1d580e9b6a976aae0069cab2986 (diff) | |
| parent | d25ad482e978cbf5e4fcfa8b1dcc342ba93dcda0 (diff) | |
| download | cmake-0d63bdd2d9690cfdb43671af7465704675a68733.tar.gz | |
Merge topic 'rpath-default'
d25ad48 OS X: Add CMP0042 to enable MACOSX_RPATH by default
Diffstat (limited to 'Source/cmComputeLinkInformation.cxx')
| -rw-r--r-- | Source/cmComputeLinkInformation.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index f3bddddad0..69869654cd 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -1752,7 +1752,7 @@ cmComputeLinkInformation::AddLibraryRuntimeInfo(std::string const& fullPath, // @loader_path or full paths. if(this->Makefile->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME")) { - if(!target->HasMacOSXRpath(this->Config)) + if(!target->HasMacOSXRpathInstallNameDir(this->Config)) { return; } |