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

Merge topic 'detect-relink-incompat' 

72dfca30 ninja: error out on relink requirements
This commit is contained in:
Brad King 2016-09-16 10:21:31 -04:00 committed by CMake Topic Stage
parent 4356bd7fe3 72dfca30b9
commit cf0e005202
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Source/cmGeneratorTarget.cxx
View File

@ -1162,7 +1162,28 @@ bool cmGeneratorTarget::NeedRelinkBeforeInstall(
// If either a build or install tree rpath is set then the rpath // If either a build or install tree rpath is set then the rpath
// will likely change between the build tree and install tree and // will likely change between the build tree and install tree and
// this target must be relinked. // this target must be relinked.
return this->HaveBuildTreeRPATH(config) || this->HaveInstallTreeRPATH(); bool have_rpath =
this->HaveBuildTreeRPATH(config) || this->HaveInstallTreeRPATH();
bool is_ninja =
this->LocalGenerator->GetGlobalGenerator()->GetName() == "Ninja";
if (have_rpath && is_ninja) {
std::ostringstream w;
/* clang-format off */
w <<
"The install of the " << this->GetName() << " target requires "
"changing an RPATH from the build tree, but this is not supported "
"with the Ninja generator unless on an ELF-based platform. The "
"CMAKE_BUILD_WITH_INSTALL_RPATH variable may be set to avoid this "
"relinking step."
;
/* clang-format on */
cmake* cm = this->LocalGenerator->GetCMakeInstance();
cm->IssueMessage(cmake::FATAL_ERROR, w.str(), this->GetBacktrace());
}
return have_rpath;
} }
bool cmGeneratorTarget::IsChrpathUsed(const std::string& config) const bool cmGeneratorTarget::IsChrpathUsed(const std::string& config) const