Commit 5bbcf758 authored by Stephen Kelly's avatar Stephen Kelly

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

parent 262ce91e
......@@ -185,12 +185,12 @@ bool cmIfCommand::InvokeInitialPass(
conditionEvaluator.IsTrue(expandedArguments, errorString, status);
if (!errorString.empty()) {
std::string err = cmIfCommandError(expandedArguments);
std::string err = "if " + cmIfCommandError(expandedArguments);
err += errorString;
if (status == cmake::FATAL_ERROR) {
this->SetError(err);
this->Makefile->IssueMessage(cmake::FATAL_ERROR, err);
cmSystemTools::SetFatalErrorOccured();
return false;
return true;
} else {
this->Makefile->IssueMessage(status, err);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment