瀏覽代碼

Make error message of standalone endwhile command consistent

with the error messages of endforeach, endmacro, endfunction, etc.
Daniel Pfeifer 9 年之前
父節點
當前提交
1afbe7d2cc
共有 2 個文件被更改,包括 6 次插入13 次删除
  1. 5 12
      Source/cmEndWhileCommand.cxx
  2. 1 1
      Tests/RunCMake/while/EndAlone-stderr.txt

+ 5 - 12
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;
 }

+ 1 - 1
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\)$