diff options
| author | Stephen Kelly <steveire@gmail.com> | 2012-02-19 23:34:11 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2012-03-05 21:24:57 (GMT) |
| commit | 635bf50c27aef184bfa1698953dd44361e1fb2f9 (patch) | |
| tree | 9f3a89ffa2aa2251c0b85457c107cd48db543a53 /Source/cmTarget.cxx | |
| parent | e316cbbbc32bd7711c4bbd96ab34adfa79722d79 (diff) | |
| download | CMake-635bf50c27aef184bfa1698953dd44361e1fb2f9.zip CMake-635bf50c27aef184bfa1698953dd44361e1fb2f9.tar.gz CMake-635bf50c27aef184bfa1698953dd44361e1fb2f9.tar.bz2 | |
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 ae5596b..b87c086 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -3602,7 +3602,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"); } //---------------------------------------------------------------------------- @@ -3709,7 +3710,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) |