[cmake-commits] king committed cmBootstrapCommands.cxx 1.9 1.10 cmCommands.cxx 1.110 1.111

cmake-commits at cmake.org cmake-commits at cmake.org
Sun May 13 07:16:27 EDT 2007


Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv12941/Source

Modified Files:
	cmBootstrapCommands.cxx cmCommands.cxx 
Log Message:
COMP: Need CMake 2.4 or a bootstrap cmake that has ADD_SUBDIRECTORY to build.


Index: cmCommands.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCommands.cxx,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- cmCommands.cxx	11 Apr 2007 19:13:05 -0000	1.110
+++ cmCommands.cxx	13 May 2007 11:16:25 -0000	1.111
@@ -16,7 +16,6 @@
 =========================================================================*/
 #include "cmCommands.h"
 #if defined(CMAKE_BUILD_WITH_CMAKE)
-#include "cmAddSubDirectoryCommand.cxx"
 #include "cmAuxSourceDirectoryCommand.cxx"
 #include "cmBuildNameCommand.cxx"
 #include "cmDefinePropertyCommand.cxx"
@@ -70,7 +69,6 @@
   )
 {
 #if defined(CMAKE_BUILD_WITH_CMAKE)
-  commands.push_back(new cmAddSubDirectoryCommand);
   commands.push_back(new cmAuxSourceDirectoryCommand);
   commands.push_back(new cmBuildNameCommand);
   commands.push_back(new cmDefinePropertyCommand);

Index: cmBootstrapCommands.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmBootstrapCommands.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- cmBootstrapCommands.cxx	3 Mar 2007 17:16:35 -0000	1.9
+++ cmBootstrapCommands.cxx	13 May 2007 11:16:24 -0000	1.10
@@ -25,6 +25,7 @@
 #include "cmAddDependenciesCommand.cxx"
 #include "cmAddExecutableCommand.cxx"
 #include "cmAddLibraryCommand.cxx"
+#include "cmAddSubDirectoryCommand.cxx"
 #include "cmAddTestCommand.cxx"
 #include "cmBuildCommand.cxx"
 #include "cmCMakeMinimumRequired.cxx"
@@ -76,6 +77,7 @@
   commands.push_back(new cmAddDependenciesCommand);
   commands.push_back(new cmAddExecutableCommand);
   commands.push_back(new cmAddLibraryCommand);
+  commands.push_back(new cmAddSubDirectoryCommand);
   commands.push_back(new cmAddTestCommand);
   commands.push_back(new cmBuildCommand);
   commands.push_back(new cmCMakeMinimumRequired);



More information about the Cmake-commits mailing list