[Cmake-commits] CMake branch, next, updated. v2.8.8-3534-g2991770
Peter Kuemmel
syntheticpp at gmx.net
Fri Jul 20 05:28:23 EDT 2012
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 29917701584cb80e708d1a7d8ad4458a46becf04 (commit)
via 9f7dc8391746f41b12b90625ad7aa364d2091ebf (commit)
via 5d365b26ec6ce089f1a5e0bfed523cb5f916f1da (commit)
from 65a15f64903df0b29173f6ce0865fad4ded9755f (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=29917701584cb80e708d1a7d8ad4458a46becf04
commit 29917701584cb80e708d1a7d8ad4458a46becf04
Merge: 65a15f6 9f7dc83
Author: Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Fri Jul 20 05:27:51 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jul 20 05:27:51 2012 -0400
Merge topic 'ninja-fix-macosx' into next
9f7dc83 Ninja: also bootstrap ninja files
5d365b2 Ninja: enable ninja support everywhere
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9f7dc8391746f41b12b90625ad7aa364d2091ebf
commit 9f7dc8391746f41b12b90625ad7aa364d2091ebf
Author: Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Fri Jul 20 11:08:36 2012 +0200
Commit: Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Fri Jul 20 11:08:36 2012 +0200
Ninja: also bootstrap ninja files
diff --git a/bootstrap b/bootstrap
index 13a95c8..801882d 100755
--- a/bootstrap
+++ b/bootstrap
@@ -239,6 +239,11 @@ CMAKE_CXX_SOURCES="\
cmExprLexer \
cmExprParser \
cmExprParserHelper \
+ cmGlobalNinjaGenerator \
+ cmLocalNinjaGenerator \
+ cmNinjaTargetGenerator \
+ cmNinjaNormalTargetGenerator \
+ cmNinjaUtilityTargetGenerator \
"
if ${cmake_system_mingw}; then
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d365b26ec6ce089f1a5e0bfed523cb5f916f1da
commit 5d365b26ec6ce089f1a5e0bfed523cb5f916f1da
Author: Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Fri Jul 20 10:53:34 2012 +0200
Commit: Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Fri Jul 20 10:53:34 2012 +0200
Ninja: enable ninja support everywhere
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index b3b38ea..e9c5a58 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -359,40 +359,25 @@ IF (WIN32)
ENDIF(NOT UNIX)
ENDIF (WIN32)
-# Turn on Ninja by default, but disable it
-# on platforms where it does not pass all tests.
-# Enforce Ninja support by setting CMAKE_USE_NINJA
-set(_CMAKE_DEFAULT_NINJA_VALUE TRUE)
-if(APPLE)
- SET(_CMAKE_DEFAULT_NINJA_VALUE TRUE)
-endif()
-SET(CMAKE_ENABLE_NINJA ${_CMAKE_DEFAULT_NINJA_VALUE} CACHE BOOL
- "Enable the ninja generator for CMake. When enabled, some CMake tests still fail on OSX")
-MARK_AS_ADVANCED(CMAKE_ENABLE_NINJA)
-IF(CMAKE_ENABLE_NINJA)
- MESSAGE(STATUS "Ninja generator enabled.")
- SET(SRCS ${SRCS}
- cmGlobalNinjaGenerator.cxx
- cmGlobalNinjaGenerator.h
- cmNinjaTypes.h
- cmLocalNinjaGenerator.cxx
- cmLocalNinjaGenerator.h
- cmNinjaTargetGenerator.cxx
- cmNinjaTargetGenerator.h
- cmNinjaNormalTargetGenerator.cxx
- cmNinjaNormalTargetGenerator.h
- cmNinjaUtilityTargetGenerator.cxx
- cmNinjaUtilityTargetGenerator.h
- )
- ADD_DEFINITIONS(-DCMAKE_USE_NINJA)
- IF(WIN32 AND NOT CYGWIN AND NOT BORLAND)
- SET_SOURCE_FILES_PROPERTIES(cmcldeps.cxx PROPERTIES COMPILE_DEFINITIONS _WIN32_WINNT=0x0501)
- ADD_EXECUTABLE(cmcldeps cmcldeps.cxx)
- TARGET_LINK_LIBRARIES(cmcldeps CMakeLib)
- INSTALL_TARGETS(/bin cmcldeps)
- ENDIF()
-ELSE()
- MESSAGE(STATUS "Ninja generator disabled, enable it with -DCMAKE_ENABLE_NINJA=ON")
+# Ninja support
+SET(SRCS ${SRCS}
+ cmGlobalNinjaGenerator.cxx
+ cmGlobalNinjaGenerator.h
+ cmNinjaTypes.h
+ cmLocalNinjaGenerator.cxx
+ cmLocalNinjaGenerator.h
+ cmNinjaTargetGenerator.cxx
+ cmNinjaTargetGenerator.h
+ cmNinjaNormalTargetGenerator.cxx
+ cmNinjaNormalTargetGenerator.h
+ cmNinjaUtilityTargetGenerator.cxx
+ cmNinjaUtilityTargetGenerator.h
+ )
+IF(WIN32 AND NOT CYGWIN AND NOT BORLAND)
+ SET_SOURCE_FILES_PROPERTIES(cmcldeps.cxx PROPERTIES COMPILE_DEFINITIONS _WIN32_WINNT=0x0501)
+ ADD_EXECUTABLE(cmcldeps cmcldeps.cxx)
+ TARGET_LINK_LIBRARIES(cmcldeps CMakeLib)
+ INSTALL_TARGETS(/bin cmcldeps)
ENDIF()
# create a library used by the command line and the GUI
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 5df8627..ad4ab76 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -60,9 +60,7 @@ cmExtraCodeBlocksGenerator::cmExtraCodeBlocksGenerator()
// disable until somebody actually tests it:
// this->SupportedGlobalGenerators.push_back("MSYS Makefiles");
#endif
-#ifdef CMAKE_USE_NINJA
this->SupportedGlobalGenerators.push_back("Ninja");
-#endif
this->SupportedGlobalGenerators.push_back("Unix Makefiles");
}
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index ab11307..78a8704 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -34,9 +34,7 @@ cmExtraEclipseCDT4Generator
this->SupportedGlobalGenerators.push_back("MinGW Makefiles");
// this->SupportedGlobalGenerators.push_back("MSYS Makefiles");
#endif
-#ifdef CMAKE_USE_NINJA
this->SupportedGlobalGenerators.push_back("Ninja");
-#endif
this->SupportedGlobalGenerators.push_back("Unix Makefiles");
this->SupportsVirtualFolders = true;
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 451aec8..fdc42fa 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -84,10 +84,8 @@
#else
#endif
#include "cmGlobalUnixMakefileGenerator3.h"
+#include "cmGlobalNinjaGenerator.h"
-#ifdef CMAKE_USE_NINJA
-# include "cmGlobalNinjaGenerator.h"
-#endif
#if defined(CMAKE_HAVE_VS_GENERATORS)
#include "cmCallVisualStudioMacro.h"
@@ -2600,10 +2598,8 @@ void cmake::AddDefaultGenerators()
#endif
this->Generators[cmGlobalUnixMakefileGenerator3::GetActualName()] =
&cmGlobalUnixMakefileGenerator3::New;
-#ifdef CMAKE_USE_NINJA
this->Generators[cmGlobalNinjaGenerator::GetActualName()] =
&cmGlobalNinjaGenerator::New;
-#endif
#ifdef CMAKE_USE_XCODE
this->Generators[cmGlobalXCodeGenerator::GetActualName()] =
&cmGlobalXCodeGenerator::New;
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeLists.txt | 53 +++++++++++--------------------
Source/cmExtraCodeBlocksGenerator.cxx | 2 -
Source/cmExtraEclipseCDT4Generator.cxx | 2 -
Source/cmake.cxx | 6 +---
bootstrap | 5 +++
5 files changed, 25 insertions(+), 43 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list