diff options
| author | David Cole <david.cole@kitware.com> | 2012-03-06 20:27:54 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-03-06 20:27:54 (GMT) |
| commit | 50f9db9b00dedd53789ae446475fef790e2534df (patch) | |
| tree | 71cff1f9c91b099334830614873fc6852b3228d1 /Source/cmComputeLinkInformation.cxx | |
| parent | e872b0d2b8af28297ce4d3dfb9f751003e50e65c (diff) | |
| parent | 635bf50c27aef184bfa1698953dd44361e1fb2f9 (diff) | |
| download | CMake-50f9db9b00dedd53789ae446475fef790e2534df.zip CMake-50f9db9b00dedd53789ae446475fef790e2534df.tar.gz CMake-50f9db9b00dedd53789ae446475fef790e2534df.tar.bz2 | |
Merge topic 'skip-install-rpath'
635bf50 Add an option to skip RPATH during installation.
Diffstat (limited to 'Source/cmComputeLinkInformation.cxx')
| -rw-r--r-- | Source/cmComputeLinkInformation.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index 57fd5b4..df78bf8 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -1772,6 +1772,7 @@ void cmComputeLinkInformation::GetRPath(std::vector<std::string>& runtimeDirs, !linking_for_install); bool use_link_rpath = outputRuntime && linking_for_install && + !this->Makefile->IsOn("CMAKE_SKIP_INSTALL_RPATH") && this->Target->GetPropertyAsBool("INSTALL_RPATH_USE_LINK_PATH"); // Construct the RPATH. |