kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bootstrap: move while() and endwhile() into the bootstrap build 

Alex
This commit is contained in:
Alex Neundorf 2012-02-17 16:42:06 +01:00 committed by Brad King
parent c9f2886b3d
commit 61cb4ea72e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmBootstrapCommands.cxx
View File

@ -38,6 +38,7 @@
#include "cmEndFunctionCommand.cxx" #include "cmEndFunctionCommand.cxx"
#include "cmEndIfCommand.cxx" #include "cmEndIfCommand.cxx"
#include "cmEndMacroCommand.cxx" #include "cmEndMacroCommand.cxx"
#include "cmEndWhileCommand.cxx"
#include "cmExecProgramCommand.cxx" #include "cmExecProgramCommand.cxx"
#include "cmExecuteProcessCommand.cxx" #include "cmExecuteProcessCommand.cxx"
#include "cmExternalMakefileProjectGenerator.cxx" #include "cmExternalMakefileProjectGenerator.cxx"
@ -91,6 +92,7 @@
#include "cmTryCompileCommand.cxx" #include "cmTryCompileCommand.cxx"
#include "cmTryRunCommand.cxx" #include "cmTryRunCommand.cxx"
#include "cmUnsetCommand.cxx" #include "cmUnsetCommand.cxx"
#include "cmWhileCommand.cxx"
void GetBootstrapCommands(std::list<cmCommand*>& commands) void GetBootstrapCommands(std::list<cmCommand*>& commands)
{ {
@ -116,6 +118,7 @@ void GetBootstrapCommands(std::list<cmCommand*>& commands)
commands.push_back(new cmEndFunctionCommand); commands.push_back(new cmEndFunctionCommand);
commands.push_back(new cmEndIfCommand); commands.push_back(new cmEndIfCommand);
commands.push_back(new cmEndMacroCommand); commands.push_back(new cmEndMacroCommand);
commands.push_back(new cmEndWhileCommand);
commands.push_back(new cmExecProgramCommand); commands.push_back(new cmExecProgramCommand);
commands.push_back(new cmExecuteProcessCommand); commands.push_back(new cmExecuteProcessCommand);
commands.push_back(new cmFileCommand); commands.push_back(new cmFileCommand);
@ -164,4 +167,5 @@ void GetBootstrapCommands(std::list<cmCommand*>& commands)
commands.push_back(new cmTryCompileCommand); commands.push_back(new cmTryCompileCommand);
commands.push_back(new cmTryRunCommand); commands.push_back(new cmTryRunCommand);
commands.push_back(new cmUnsetCommand); commands.push_back(new cmUnsetCommand);
commands.push_back(new cmWhileCommand);
} }

4
Source/cmCommands.cxx
View File

@ -14,7 +14,6 @@
#include "cmAuxSourceDirectoryCommand.cxx" #include "cmAuxSourceDirectoryCommand.cxx"
#include "cmBuildNameCommand.cxx" #include "cmBuildNameCommand.cxx"
#include "cmElseIfCommand.cxx" #include "cmElseIfCommand.cxx"
#include "cmEndWhileCommand.cxx"
#include "cmExportCommand.cxx" #include "cmExportCommand.cxx"
#include "cmExportLibraryDependencies.cxx" #include "cmExportLibraryDependencies.cxx"
#include "cmFLTKWrapUICommand.cxx" #include "cmFLTKWrapUICommand.cxx"
@ -34,7 +33,6 @@
#include "cmVariableRequiresCommand.cxx" #include "cmVariableRequiresCommand.cxx"
#include "cmVariableWatchCommand.cxx" #include "cmVariableWatchCommand.cxx"
#include "cmWhileCommand.cxx"
#include "cmWriteFileCommand.cxx" #include "cmWriteFileCommand.cxx"
// This one must be last because it includes windows.h and // This one must be last because it includes windows.h and
@ -53,7 +51,6 @@ void GetPredefinedCommands(std::list<cmCommand*>&
commands.push_back(new cmAuxSourceDirectoryCommand); commands.push_back(new cmAuxSourceDirectoryCommand);
commands.push_back(new cmBuildNameCommand); commands.push_back(new cmBuildNameCommand);
commands.push_back(new cmElseIfCommand); commands.push_back(new cmElseIfCommand);
commands.push_back(new cmEndWhileCommand);
commands.push_back(new cmExportCommand); commands.push_back(new cmExportCommand);
commands.push_back(new cmExportLibraryDependenciesCommand); commands.push_back(new cmExportLibraryDependenciesCommand);
commands.push_back(new cmFLTKWrapUICommand); commands.push_back(new cmFLTKWrapUICommand);
@ -73,7 +70,6 @@ void GetPredefinedCommands(std::list<cmCommand*>&
commands.push_back(new cmUtilitySourceCommand); commands.push_back(new cmUtilitySourceCommand);
commands.push_back(new cmVariableRequiresCommand); commands.push_back(new cmVariableRequiresCommand);
commands.push_back(new cmVariableWatchCommand); commands.push_back(new cmVariableWatchCommand);
commands.push_back(new cmWhileCommand);
commands.push_back(new cmWriteFileCommand); commands.push_back(new cmWriteFileCommand);
#endif #endif
} }