diff options
| author | Stephen Kelly <steveire@gmail.com> | 2016-01-28 21:10:29 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2016-06-13 18:20:44 (GMT) |
| commit | 5bbcf758a1a0c52836d313156788a10a232f1f9f (patch) | |
| tree | 5868d60a55c86e7861a7b4a300f2641a93674b5f | |
| parent | 262ce91e8ac3c6fc9b09605e652028db7229b9b8 (diff) | |
| download | CMake-5bbcf758a1a0c52836d313156788a10a232f1f9f.zip CMake-5bbcf758a1a0c52836d313156788a10a232f1f9f.tar.gz CMake-5bbcf758a1a0c52836d313156788a10a232f1f9f.tar.bz2 | |
cmIfCommand: Don't rely on NestedError logic to issue messages
| -rw-r--r-- | Source/cmIfCommand.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx index 45395d1..cb5ba76 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); } |