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 6dc37e91431b70c6f4ee55744b26eb103ee067f1 (commit) via d2d492f492a8a6082345e439a9c15418f0d483db (commit) from c5d6d48e1085d8ebe354a2260006181e4d301036 (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=6dc37e91431b70c6f4ee55744b26eb103ee067f1 commit 6dc37e91431b70c6f4ee55744b26eb103ee067f1 Merge: c5d6d48 d2d492f Author: Bill Hoffman <bill.hoff...@kitware.com> AuthorDate: Fri Mar 9 14:36:43 2012 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Mar 9 14:36:43 2012 -0500 Merge topic 'ninja-generator' into next d2d492f Add a cache option CMAKE_ENABLE_NINJA to enable the ninja generator. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d2d492f492a8a6082345e439a9c15418f0d483db commit d2d492f492a8a6082345e439a9c15418f0d483db Author: Bill Hoffman <bill.hoff...@kitware.com> AuthorDate: Fri Mar 9 14:28:21 2012 -0500 Commit: Bill Hoffman <bill.hoff...@kitware.com> CommitDate: Fri Mar 9 14:28:21 2012 -0500 Add a cache option CMAKE_ENABLE_NINJA to enable the ninja generator. Make the option default to on, for platforms where CMake passes all tests with the ninja generator. This is currently only Linux. diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index eb4327c..18f9b8b 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -353,7 +353,18 @@ IF (WIN32) ENDIF(NOT UNIX) ENDIF (WIN32) -if(NOT WIN32) +# turn on Ninja by default +set(_CMAKE_DEFAULT_NINJA_VALUE TRUE) +# turn it off for platforms where it does not pass all the +# tests +if(WIN32 OR APPLE) + SET(_CMAKE_DEFAULT_NINJA_VALUE FALSE) +endif() +SET(CMAKE_ENABLE_NINJA ${_CMAKE_DEFAULT_NINJA_VALUE} CACHE BOOL + "Enable the ninja generator for CMake. currently not fully working for Windows or OSX") +MARK_AS_ADVANCED(CMAKE_ENABLE_NINJA) +IF(CMAKE_ENABLE_NINJA) + MESSAGE(STATUS "Enable ninja generator.") SET(SRCS ${SRCS} cmGlobalNinjaGenerator.cxx cmGlobalNinjaGenerator.h @@ -368,7 +379,9 @@ if(NOT WIN32) cmNinjaUtilityTargetGenerator.h ) ADD_DEFINITIONS(-DCMAKE_USE_NINJA) -endif() +ELSE() + MESSAGE(STATUS "Disable ninja generator.") +ENDIF() # create a library used by the command line and the GUI ADD_LIBRARY(CMakeLib ${SRCS}) ----------------------------------------------------------------------- Summary of changes: Source/CMakeLists.txt | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits