diff options
author | Brad King <brad.king@kitware.com> | 2015-08-10 17:26:52 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2015-08-10 17:26:52 (GMT) |
commit | 4e3c7725d0d724d7a8a0e8305d15713e01b20503 (patch) | |
tree | 89d3cfc887a35d314daa0ac41c8367087a3a9727 | |
parent | 2f16e608436193f465d4bac181db36464fa88e22 (diff) | |
download | CMake-4e3c7725d0d724d7a8a0e8305d15713e01b20503.zip CMake-4e3c7725d0d724d7a8a0e8305d15713e01b20503.tar.gz CMake-4e3c7725d0d724d7a8a0e8305d15713e01b20503.tar.bz2 |
bootstrap: Do not build Ninja generator
The CMake bootstrap process uses Makefile generators so there is no
need to build the Ninja generators during bootstrap.
-rw-r--r-- | Source/cmake.cxx | 6 | ||||
-rwxr-xr-x | bootstrap | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 8c455b2..0321f2c 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -75,7 +75,9 @@ # include "cmGlobalWatcomWMakeGenerator.h" #endif #include "cmGlobalUnixMakefileGenerator3.h" -#include "cmGlobalNinjaGenerator.h" +#if defined(CMAKE_BUILD_WITH_CMAKE) +# include "cmGlobalNinjaGenerator.h" +#endif #include "cmExtraCodeLiteGenerator.h" #if !defined(CMAKE_BOOT_MINGW) @@ -1857,8 +1859,10 @@ void cmake::AddDefaultGenerators() #endif this->Generators.push_back( cmGlobalUnixMakefileGenerator3::NewFactory()); +#if defined(CMAKE_BUILD_WITH_CMAKE) this->Generators.push_back( cmGlobalNinjaGenerator::NewFactory()); +#endif #if defined(CMAKE_USE_WMAKE) this->Generators.push_back( cmGlobalWatcomWMakeGenerator::NewFactory()); @@ -322,11 +322,6 @@ CMAKE_CXX_SOURCES="\ cmExprLexer \ cmExprParser \ cmExprParserHelper \ - cmGlobalNinjaGenerator \ - cmLocalNinjaGenerator \ - cmNinjaTargetGenerator \ - cmNinjaNormalTargetGenerator \ - cmNinjaUtilityTargetGenerator \ " if ${cmake_system_mingw}; then |