summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-08-11 12:47:12 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-08-11 12:47:12 (GMT)
commit422d3f68de6bfa5c3fad68d2b030f2a618a821a2 (patch)
treeb22224654ef4ba3f32c8244460e21583caaf578e /Source
parent9e5114764637236849f62f4a82b525d5931b256e (diff)
parent4e3c7725d0d724d7a8a0e8305d15713e01b20503 (diff)
downloadCMake-422d3f68de6bfa5c3fad68d2b030f2a618a821a2.zip
CMake-422d3f68de6bfa5c3fad68d2b030f2a618a821a2.tar.gz
CMake-422d3f68de6bfa5c3fad68d2b030f2a618a821a2.tar.bz2
Merge topic 'bootstrap-no-ninja'
4e3c7725 bootstrap: Do not build Ninja generator
Diffstat (limited to 'Source')
-rw-r--r--Source/cmake.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index d1e6265..2855329 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());