mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 16:32:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmCommand: Don't prefix error message with command name

Browse Source 
Instead, prefix the error message at the two places where the errors are
handled: cmMakefile and cmCTestHandlerCommand.
This commit is contained in:
Daniel Pfeifer
2017-01-07 13:48:44 +01:00
parent 45b49099d9
commit 615e2a17e4
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/CTest/cmCTestHandlerCommand.cxx
View File

@@ -123,8 +123,8 @@ bool cmCTestHandlerCommand::InitialPass(std::vector<std::string> const& args,
if (capureCMakeError) {
this->Makefile->AddDefinition(this->Values[ct_CAPTURE_CMAKE_ERROR],
"-1");
const char* err = this->GetError();
if (err && !cmSystemTools::FindLastString(err, "unknown error.")) {
std::string const err = this->GetName() + " " + this->GetError();
if (!cmSystemTools::FindLastString(err.c_str(), "unknown error.")) {
cmCTestLog(this->CTest, ERROR_MESSAGE, err << " error from command\n");
}
// return success because failure is recorded in CAPTURE_CMAKE_ERROR

7
Source/cmCommand.cxx
View File

@@ -23,17 +23,14 @@ bool cmCommand::InvokeInitialPass(const std::vector<cmListFileArgument>& args,
const char* cmCommand::GetError()
{
if (this->Error.empty()) {
this->Error = this->GetName();
this->Error += " unknown error.";
return "unknown error.";
}
return this->Error.c_str();
}
void cmCommand::SetError(const std::string& e)
{
this->Error = this->GetName();
this->Error += " ";
this->Error += e;
this->Error = e;
}
bool cmCommand::Disallowed(cmPolicies::PolicyID pol, const char* e)

3
Source/cmMakefile.cxx
View File

@@ -281,7 +281,8 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff,
if (!invokeSucceeded || hadNestedError) {
if (!hadNestedError) {
// The command invocation requested that we report an error.
this->IssueMessage(cmake::FATAL_ERROR, pcmd->GetError());
std::string const error = name + " " + pcmd->GetError();
this->IssueMessage(cmake::FATAL_ERROR, error);
}
result = false;
if (this->GetCMakeInstance()->GetWorkingMode() != cmake::NORMAL_MODE) {