diff options
| author | Brad King <brad.king@kitware.com> | 2007-05-13 11:16:25 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2007-05-13 11:16:25 (GMT) |
| commit | 33d976e583decc598b96e3d6640f74051913e673 (patch) | |
| tree | 53dd9076feae444de2b51d920d9ebfe4b96cb20c | |
| parent | ef20a5f920fbb6552aafb00c066d281323907669 (diff) | |
| download | CMake-33d976e583decc598b96e3d6640f74051913e673.zip CMake-33d976e583decc598b96e3d6640f74051913e673.tar.gz CMake-33d976e583decc598b96e3d6640f74051913e673.tar.bz2 | |
COMP: Need CMake 2.4 or a bootstrap cmake that has ADD_SUBDIRECTORY to build.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Source/cmBootstrapCommands.cxx | 2 | ||||
| -rw-r--r-- | Source/cmCommands.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 02ca1f5..a6f7b1e 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/Source/cmBootstrapCommands.cxx b/Source/cmBootstrapCommands.cxx index 57654aa..c4bfeae 100644 --- a/Source/cmBootstrapCommands.cxx +++ b/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); diff --git a/Source/cmCommands.cxx b/Source/cmCommands.cxx index 81a9d25..63a5cce 100644 --- a/Source/cmCommands.cxx +++ b/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); |