[Cmake-commits] CMake branch, next, updated. v2.8.7-3422-g6fbb0a9

[Peter Kuemmel]

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  6fbb0a93d1c3b38a3a0cae8f147e9487082f1655 (commit)
       via  f93e81858b5e1243714ed7f26aadfc791a7b0ff0 (commit)
      from  6e10651876eb3627d6db64d87b28f5f81504d614 (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=6fbb0a93d1c3b38a3a0cae8f147e9487082f1655
commit 6fbb0a93d1c3b38a3a0cae8f147e9487082f1655
Merge: 6e10651 f93e818
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Fri Apr 6 17:38:45 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 6 17:38:45 2012 -0400

    Merge topic 'ninja-fix-plugin-test' into next
    
    f93e818 Ninja: add option to enable ninja where it is not enabled by default


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f93e81858b5e1243714ed7f26aadfc791a7b0ff0
commit f93e81858b5e1243714ed7f26aadfc791a7b0ff0
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Fri Apr 6 23:25:09 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Fri Apr 6 23:35:50 2012 +0200

    Ninja: add option to enable ninja where it is not enabled by default

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index f9d1c03..a27ec75 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -355,15 +355,17 @@ IF (WIN32)
   ENDIF(NOT UNIX)
 ENDIF (WIN32)
 
-# turn on Ninja by default
+# Turn on Ninja by default, but disable it
+# on platforms where it does not pass all tests.
+# Enforce Ninja support with ENABLE_NINJA
 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)
+  if(NOT ENABLE_NINJA)
+    SET(_CMAKE_DEFAULT_NINJA_VALUE FALSE)
+  endif()
 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")
+    "Enable the ninja generator for CMake. On Windows and OSX broken" FORCE)
 MARK_AS_ADVANCED(CMAKE_ENABLE_NINJA)
 IF(CMAKE_ENABLE_NINJA)
   MESSAGE(STATUS "Enable ninja generator.")
@@ -382,7 +384,7 @@ IF(CMAKE_ENABLE_NINJA)
     )
   ADD_DEFINITIONS(-DCMAKE_USE_NINJA)
 ELSE()
-  MESSAGE(STATUS "Disable ninja generator.")
+  MESSAGE(STATUS "Ninja generator disabled, enforce with -DENABLE_NINJA=ON")
 ENDIF()
 
 # create a library used by the command line and the GUI

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

Summary of changes:
 Source/CMakeLists.txt |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake