diff options
| author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2016-11-27 19:38:57 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-11-29 18:53:29 (GMT) |
| commit | 1afbe7d2cca61ecf483f7697b0141a233508603d (patch) | |
| tree | d81fa8e86cf77515c0acf629deb92b2c8004da46 | |
| parent | 44c978a2dab96b44ed2dd7470f532c4aa4c7da7c (diff) | |
| download | CMake-1afbe7d2cca61ecf483f7697b0141a233508603d.zip CMake-1afbe7d2cca61ecf483f7697b0141a233508603d.tar.gz CMake-1afbe7d2cca61ecf483f7697b0141a233508603d.tar.bz2 | |
Make error message of standalone endwhile command consistent
with the error messages of endforeach, endmacro, endfunction, etc.
| -rw-r--r-- | Source/cmEndWhileCommand.cxx | 17 | ||||
| -rw-r--r-- | 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<cmListFileArgument> const& args, cmExecutionStatus&) + std::vector<cmListFileArgument> 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\)$ |