From 5bbcf758a1a0c52836d313156788a10a232f1f9f Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Thu, 28 Jan 2016 22:10:29 +0100
Subject: [PATCH] cmIfCommand: Don't rely on NestedError logic to issue
 messages

---
 Source/cmIfCommand.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx
index 45395d1ea..cb5ba76b1 100644
--- a/Source/cmIfCommand.cxx
+++ b/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);
     }