summaryrefslogtreecommitdiffstats
path: root/Source/cmEndMacroCommand.h
diff options
context:
space:
mode:
authorDaniel Pfeifer <daniel@pfeifer-mail.de>2016-11-27 19:38:57 (GMT)
committerBrad King <brad.king@kitware.com>2016-11-29 18:53:29 (GMT)
commitd23a0196844f066047aa6942b69c6e591462df38 (patch)
tree2ba120b7447a65aa8dd7d5fe649491ea6a94bd4d /Source/cmEndMacroCommand.h
parent1afbe7d2cca61ecf483f7697b0141a233508603d (diff)
downloadCMake-d23a0196844f066047aa6942b69c6e591462df38.zip
CMake-d23a0196844f066047aa6942b69c6e591462df38.tar.gz
CMake-d23a0196844f066047aa6942b69c6e591462df38.tar.bz2
Set the error after argument expansion in end commands
The current code is optimized for rare error cases. Simplify the code and remove these optimizations.
Diffstat (limited to 'Source/cmEndMacroCommand.h')
-rw-r--r--Source/cmEndMacroCommand.h13
1 files changed, 1 insertions, 12 deletions
diff --git a/Source/cmEndMacroCommand.h b/Source/cmEndMacroCommand.h
index 3c462d4..bd7cdbd 100644
--- a/Source/cmEndMacroCommand.h
+++ b/Source/cmEndMacroCommand.h
@@ -10,7 +10,6 @@
#include "cmCommand.h"
class cmExecutionStatus;
-struct cmListFileArgument;
/** \class cmEndMacroCommand
* \brief ends an if block
@@ -26,21 +25,11 @@ public:
cmCommand* Clone() CM_OVERRIDE { return new cmEndMacroCommand; }
/**
- * Override cmCommand::InvokeInitialPass to get arguments before
- * expansion.
- */
- bool InvokeInitialPass(std::vector<cmListFileArgument> const&,
- cmExecutionStatus&) CM_OVERRIDE;
-
- /**
* This is called when the command is first encountered in
* the CMakeLists.txt file.
*/
bool InitialPass(std::vector<std::string> const&,
- cmExecutionStatus&) CM_OVERRIDE
- {
- return false;
- }
+ cmExecutionStatus&) CM_OVERRIDE;
/**
* This determines if the command is invoked when in script mode.