[Cmake-commits] CMake branch, next, updated. v3.3.0-2123-gc708917

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  c708917308f23dda4f9ed94eab33e758c1cf0c94 (commit)
       via  4e3c7725d0d724d7a8a0e8305d15713e01b20503 (commit)
      from  225e2d5bacae40956e489d8232f150607cc7b75a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c708917308f23dda4f9ed94eab33e758c1cf0c94
commit c708917308f23dda4f9ed94eab33e758c1cf0c94
Merge: 225e2d5 4e3c772
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 10 13:28:50 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 10 13:28:50 2015 -0400

    Merge topic 'bootstrap-no-ninja' into next
    
    4e3c7725 bootstrap: Do not build Ninja generator


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e3c7725d0d724d7a8a0e8305d15713e01b20503
commit 4e3c7725d0d724d7a8a0e8305d15713e01b20503
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 10 13:26:52 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Aug 10 13:26:52 2015 -0400

    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.

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());
diff --git a/bootstrap b/bootstrap
index d778bbe..7b9a582 100755
--- a/bootstrap
+++ b/bootstrap
@@ -322,11 +322,6 @@ CMAKE_CXX_SOURCES="\
   cmExprLexer \
   cmExprParser \
   cmExprParserHelper \
-  cmGlobalNinjaGenerator \
-  cmLocalNinjaGenerator \
-  cmNinjaTargetGenerator \
-  cmNinjaNormalTargetGenerator \
-  cmNinjaUtilityTargetGenerator \
 "
 
 if ${cmake_system_mingw}; then

-----------------------------------------------------------------------

Summary of changes:
 Source/cmake.cxx |    6 +++++-
 bootstrap        |    5 -----
 2 files changed, 5 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake