Pārlūkot izejas kodu

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

Stephen Kelly 10 gadi atpakaļ
vecāks
revīzija
5bbcf758a1
1 mainītis faili ar 3 papildinājumiem un 3 dzēšanām
  1. 3 3
      Source/cmIfCommand.cxx

+ 3 - 3
Source/cmIfCommand.cxx

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