Selaa lähdekoodia

COMP: Need CMake 2.4 or a bootstrap cmake that has ADD_SUBDIRECTORY to build.

Brad King 18 vuotta sitten
vanhempi
sitoutus
33d976e583
3 muutettua tiedostoa jossa 3 lisäystä ja 3 poistoa
  1. 1 1
      CMakeLists.txt
  2. 2 0
      Source/cmBootstrapCommands.cxx
  3. 0 2
      Source/cmCommands.cxx

+ 1 - 1
CMakeLists.txt

@@ -1,5 +1,5 @@
 PROJECT(CMake)
-CMAKE_MINIMUM_REQUIRED(VERSION 2.0)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.4) # Need 2.4 for ADD_SUBDIRECTORY
 MARK_AS_ADVANCED(CMAKE_BACKWARDS_COMPATIBILITY)
 
 

+ 2 - 0
Source/cmBootstrapCommands.cxx

@@ -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 @@ void GetBootstrapCommands(std::list<cmCommand*>& commands)
   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);

+ 0 - 2
Source/cmCommands.cxx

@@ -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 @@ void GetPredefinedCommands(std::list<cmCommand*>&
   )
 {
 #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);