kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'fix-genex-RPATH-handling'

Browse Source 
dcb5907 Fix RPATH information when only a genex is used as a link library.
This commit is contained in:
Brad King 2013-03-04 15:40:20 -05:00 committed by CMake Topic Stage
commit e6b4641bfa
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmComputeLinkInformation.cxx
View File

@ -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 &&

13
Source/cmTarget.cxx
View File

@ -4253,10 +4253,15 @@ void cmTarget::SetPropertyDefault(const char* property,
}
//----------------------------------------------------------------------------
bool cmTarget::HaveBuildTreeRPATH()
bool cmTarget::HaveBuildTreeRPATH(const char *config)
{
return (!this->GetPropertyAsBool("SKIP_BUILD_RPATH") &&
!this->LinkLibraries.empty());
if (this->GetPropertyAsBool("SKIP_BUILD_RPATH"))
{
return false;
}
std::vector<std::string> libs;
this->GetDirectLinkLibraries(config, libs, this);
return !libs.empty();
}
//----------------------------------------------------------------------------
@ -4327,7 +4332,7 @@ bool cmTarget::NeedRelinkBeforeInstall(const char* config)
// If either a build or install tree rpath is set then the rpath
// will likely change between the build tree and install tree and
// this target must be relinked.
return this->HaveBuildTreeRPATH() || this->HaveInstallTreeRPATH();
return this->HaveBuildTreeRPATH(config) || this->HaveInstallTreeRPATH();
}
//----------------------------------------------------------------------------

2
Source/cmTarget.h
View File

@ -401,7 +401,7 @@ public:
*/
bool NeedRelinkBeforeInstall(const char* config);
bool HaveBuildTreeRPATH();
bool HaveBuildTreeRPATH(const char *config);
bool HaveInstallTreeRPATH();
/** Return true if builtin chrpath will work for this target */