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

ENH: Improve error message when installation file(CHRPATH) cannot change the RPATH.

Browse Source
This commit is contained in:
Brad King 2008-04-07 10:55:52 -04:00
parent 5824f44a75
commit c408760a8a
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmFileCommand.cxx
View File

@ -1407,8 +1407,10 @@ bool cmFileCommand::HandleChrpathCommand(std::vector<std::string> const& args)
else else
{ {
cmOStringStream e; cmOStringStream e;
e << "CHRPATH could not write new RPATH \"" e << "CHRPATH could not write new RPATH:\n"
<< newRPath << "\" to the file \"" << file << "\": " << " " << newRPath << "\n"
<< "to the file:\n"
<< " " << file << "\n"
<< emsg; << emsg;
this->SetError(e.str().c_str()); this->SetError(e.str().c_str());
return false; return false;

8
Source/cmSystemTools.cxx
View File

@ -2229,7 +2229,13 @@ bool cmSystemTools::ChangeRPath(std::string const& file,
} }
if(emsg) if(emsg)
{ {
*emsg = "The current RPATH does not begin with that specified."; cmOStringStream e;
e << "The current RPATH is:\n"
<< " " << se->Value << "\n"
<< "which does not begin with:\n"
<< " " << oldRPath << "\n"
<< "as was expected.";
*emsg = e.str();
} }
return false; return false;
} }