From 1afbe7d2cca61ecf483f7697b0141a233508603d Mon Sep 17 00:00:00 2001 From: Daniel Pfeifer Date: Sun, 27 Nov 2016 20:38:57 +0100 Subject: Make error message of standalone endwhile command consistent with the error messages of endforeach, endmacro, endfunction, etc. --- Source/cmEndWhileCommand.cxx | 17 +++++------------ Tests/RunCMake/while/EndAlone-stderr.txt | 2 +- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/Source/cmEndWhileCommand.cxx b/Source/cmEndWhileCommand.cxx index 5623f33..7201569 100644 --- a/Source/cmEndWhileCommand.cxx +++ b/Source/cmEndWhileCommand.cxx @@ -2,21 +2,14 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmEndWhileCommand.h" -#include "cmListFileCache.h" - class cmExecutionStatus; +struct cmListFileArgument; bool cmEndWhileCommand::InvokeInitialPass( - std::vector const& args, cmExecutionStatus&) + std::vector const&, cmExecutionStatus&) { - if (args.empty()) { - this->SetError("An ENDWHILE command was found outside of a proper " - "WHILE ENDWHILE structure."); - } else { - this->SetError("An ENDWHILE command was found outside of a proper " - "WHILE ENDWHILE structure. Or its arguments did not " - "match the opening WHILE command."); - } - + this->SetError("An ENDWHILE command was found outside of a proper " + "WHILE ENDWHILE structure. Or its arguments did not " + "match the opening WHILE command."); return false; } diff --git a/Tests/RunCMake/while/EndAlone-stderr.txt b/Tests/RunCMake/while/EndAlone-stderr.txt index cd98687..5fe6655 100644 --- a/Tests/RunCMake/while/EndAlone-stderr.txt +++ b/Tests/RunCMake/while/EndAlone-stderr.txt @@ -1,5 +1,5 @@ ^CMake Error at EndAlone.cmake:1 \(endwhile\): endwhile An ENDWHILE command was found outside of a proper WHILE ENDWHILE - structure. + structure. Or its arguments did not match the opening WHILE command. Call Stack \(most recent call first\): CMakeLists.txt:3 \(include\)$ -- cgit v0.12