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/cmTarget.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/cmTarget.cxx')
| -rw-r--r-- | Source/cmTarget.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 817375e..2ec97c8 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -3592,7 +3592,8 @@ bool cmTarget::HaveBuildTreeRPATH() bool cmTarget::HaveInstallTreeRPATH() { const char* install_rpath = this->GetProperty("INSTALL_RPATH"); - return install_rpath && *install_rpath; + return (install_rpath && *install_rpath) && + !this->Makefile->IsOn("CMAKE_SKIP_INSTALL_RPATH"); } //---------------------------------------------------------------------------- @@ -3699,7 +3700,8 @@ std::string cmTarget::GetInstallNameDirForInstallTree(const char* config, { std::string dir; - if(!this->Makefile->IsOn("CMAKE_SKIP_RPATH")) + if(!this->Makefile->IsOn("CMAKE_SKIP_RPATH") && + !this->Makefile->IsOn("CMAKE_SKIP_INSTALL_RPATH")) { const char* install_name_dir = this->GetProperty("INSTALL_NAME_DIR"); if(install_name_dir && *install_name_dir) |