kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'bootstrap-no-ninja'

Browse Source 
4e3c7725 bootstrap: Do not build Ninja generator
This commit is contained in:
Brad King 2015-08-11 08:47:12 -04:00 committed by CMake Topic Stage
commit 422d3f68de
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmake.cxx
View File

@ -75,7 +75,9 @@
# include "cmGlobalWatcomWMakeGenerator.h" # include "cmGlobalWatcomWMakeGenerator.h"
#endif #endif
#include "cmGlobalUnixMakefileGenerator3.h" #include "cmGlobalUnixMakefileGenerator3.h"
#include "cmGlobalNinjaGenerator.h" #if defined(CMAKE_BUILD_WITH_CMAKE)
# include "cmGlobalNinjaGenerator.h"
#endif
#include "cmExtraCodeLiteGenerator.h" #include "cmExtraCodeLiteGenerator.h"
#if !defined(CMAKE_BOOT_MINGW) #if !defined(CMAKE_BOOT_MINGW)
@ -1857,8 +1859,10 @@ void cmake::AddDefaultGenerators()
#endif #endif
this->Generators.push_back( this->Generators.push_back(
cmGlobalUnixMakefileGenerator3::NewFactory()); cmGlobalUnixMakefileGenerator3::NewFactory());
#if defined(CMAKE_BUILD_WITH_CMAKE)
this->Generators.push_back( this->Generators.push_back(
cmGlobalNinjaGenerator::NewFactory()); cmGlobalNinjaGenerator::NewFactory());
#endif
#if defined(CMAKE_USE_WMAKE) #if defined(CMAKE_USE_WMAKE)
this->Generators.push_back( this->Generators.push_back(
cmGlobalWatcomWMakeGenerator::NewFactory()); cmGlobalWatcomWMakeGenerator::NewFactory());

5
bootstrap
View File

@ -322,11 +322,6 @@ CMAKE_CXX_SOURCES="\
cmExprLexer \ cmExprLexer \
cmExprParser \ cmExprParser \
cmExprParserHelper \ cmExprParserHelper \
cmGlobalNinjaGenerator \
cmLocalNinjaGenerator \
cmNinjaTargetGenerator \
cmNinjaNormalTargetGenerator \
cmNinjaUtilityTargetGenerator \
" "
if ${cmake_system_mingw}; then if ${cmake_system_mingw}; then