diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-02-28 17:25:25 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-02-28 17:25:33 (GMT) |
| commit | dcb5907ed67df2e64d5e3f29fefd40e3a8c8eca3 (patch) | |
| tree | 97de9eb186e7957a28f4657c65c584ca318b0a0d /Source/cmComputeLinkInformation.cxx | |
| parent | 42c56c824c719a640471a622f710b0b86ee02abc (diff) | |
| download | CMake-dcb5907ed67df2e64d5e3f29fefd40e3a8c8eca3.zip CMake-dcb5907ed67df2e64d5e3f29fefd40e3a8c8eca3.tar.gz CMake-dcb5907ed67df2e64d5e3f29fefd40e3a8c8eca3.tar.bz2 | |
Fix RPATH information when only a genex is used as a link library.
As of commit 1da75022 (Don't include generator expressions in
old-style link handling., 2012-12-23), such entries are not
included in the LinkLibraries member. Generator expressions in
LinkLibraries are not processed anyway, so port to the new way
of getting link information.
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 84714f3..896b50a 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -1816,7 +1816,7 @@ void cmComputeLinkInformation::GetRPath(std::vector<std::string>& runtimeDirs, (outputRuntime && this->Target->HaveInstallTreeRPATH() && linking_for_install); bool use_build_rpath = - (outputRuntime && this->Target->HaveBuildTreeRPATH() && + (outputRuntime && this->Target->HaveBuildTreeRPATH(this->Config) && !linking_for_install); bool use_link_rpath = outputRuntime && linking_for_install && |