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

cmIfCommand: Don't rely on NestedError logic to issue messages

This commit is contained in:
Stephen Kelly 2016-01-28 22:10:29 +01:00
parent 262ce91e8a
commit 5bbcf758a1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmIfCommand.cxx
View File

@ -185,12 +185,12 @@ bool cmIfCommand::InvokeInitialPass(
conditionEvaluator.IsTrue(expandedArguments, errorString, status); conditionEvaluator.IsTrue(expandedArguments, errorString, status);
if (!errorString.empty()) { if (!errorString.empty()) {
std::string err = cmIfCommandError(expandedArguments); std::string err = "if " + cmIfCommandError(expandedArguments);
err += errorString; err += errorString;
if (status == cmake::FATAL_ERROR) { if (status == cmake::FATAL_ERROR) {
this->SetError(err); this->Makefile->IssueMessage(cmake::FATAL_ERROR, err);
cmSystemTools::SetFatalErrorOccured(); cmSystemTools::SetFatalErrorOccured();
return false; return true;
} else { } else {
this->Makefile->IssueMessage(status, err); this->Makefile->IssueMessage(status, err);
} }