diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-08-05 17:02:45 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-08 23:04:38 (GMT) |
| commit | c5718217ad242ca0fc6e6b15f4ee670e4a332c93 (patch) | |
| tree | d93cdea4deb3bbf9a64358978d9f95e6b7cbfd96 /Source/cmGeneratorTarget.cxx | |
| parent | bf5eb4a3f394051d9245a7f0c3a18b4a1d2c948a (diff) | |
| download | CMake-c5718217ad242ca0fc6e6b15f4ee670e4a332c93.zip CMake-c5718217ad242ca0fc6e6b15f4ee670e4a332c93.tar.gz CMake-c5718217ad242ca0fc6e6b15f4ee670e4a332c93.tar.bz2 | |
cmGeneratorTarget: Move HaveInstallTreeRPATH from cmTarget.
Diffstat (limited to 'Source/cmGeneratorTarget.cxx')
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 3a67d2c..6ad6c69 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -1212,7 +1212,7 @@ cmGeneratorTarget::NeedRelinkBeforeInstall(const std::string& config) const // will likely change between the build tree and install tree and // this target must be relinked. return this->HaveBuildTreeRPATH(config) - || this->Target->HaveInstallTreeRPATH(); + || this->HaveInstallTreeRPATH(); } //---------------------------------------------------------------------------- @@ -4695,6 +4695,14 @@ bool cmGeneratorTarget::ComputePDBOutputDir(const std::string& kind, } //---------------------------------------------------------------------------- +bool cmGeneratorTarget::HaveInstallTreeRPATH() const +{ + const char* install_rpath = this->GetProperty("INSTALL_RPATH"); + return (install_rpath && *install_rpath) && + !this->Makefile->IsOn("CMAKE_SKIP_INSTALL_RPATH"); +} + +//---------------------------------------------------------------------------- void cmGeneratorTarget::ComputeLinkInterfaceLibraries( const std::string& config, |