浏览代码

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

Stephen Kelly 10 年之前
父节点
当前提交
5bbcf758a1
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      Source/cmIfCommand.cxx

+ 3 - 3
Source/cmIfCommand.cxx

@@ -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);
     }