[Cmake-commits] CMake branch, next, updated. v2.8.7-3430-g89e5aa3

[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  89e5aa32408b87fc0a90d10d16a2f036e1d30585 (commit)
       via  2a081a2b3a3064530fe173a2930828e2232e844b (commit)
      from  9ecaf50b2993c5584095642bb45447af2123e5f0 (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=89e5aa32408b87fc0a90d10d16a2f036e1d30585
commit 89e5aa32408b87fc0a90d10d16a2f036e1d30585
Merge: 9ecaf50 2a081a2
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sun Apr 8 05:17:14 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Apr 8 05:17:14 2012 -0400

    Merge topic 'ninja-patches' into next
    
    2a081a2 Ninja: no additional variable needed to enable ninja


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a081a2b3a3064530fe173a2930828e2232e844b
commit 2a081a2b3a3064530fe173a2930828e2232e844b
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sun Apr 8 11:15:17 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Sun Apr 8 11:15:17 2012 +0200

    Ninja: no additional variable needed to enable ninja

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index a27ec75..b7c15c9 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -357,18 +357,16 @@ ENDIF (WIN32)
 
 # Turn on Ninja by default, but disable it
 # on platforms where it does not pass all tests.
-# Enforce Ninja support with ENABLE_NINJA
+# Enforce Ninja support by setting CMAKE_USE_NINJA
 set(_CMAKE_DEFAULT_NINJA_VALUE TRUE)
 if(WIN32 OR APPLE)
-  if(NOT ENABLE_NINJA)
-    SET(_CMAKE_DEFAULT_NINJA_VALUE FALSE)
-  endif()
+  SET(_CMAKE_DEFAULT_NINJA_VALUE FALSE)
 endif()
 SET(CMAKE_ENABLE_NINJA ${_CMAKE_DEFAULT_NINJA_VALUE} CACHE BOOL
-    "Enable the ninja generator for CMake. On Windows and OSX broken" FORCE)
+    "Enable the ninja generator for CMake. On Windows and OSX broken")
 MARK_AS_ADVANCED(CMAKE_ENABLE_NINJA)
 IF(CMAKE_ENABLE_NINJA)
-  MESSAGE(STATUS "Enable ninja generator.")
+  MESSAGE(STATUS "Ninja generator enabled.")
   SET(SRCS ${SRCS}
     cmGlobalNinjaGenerator.cxx
     cmGlobalNinjaGenerator.h
@@ -384,7 +382,7 @@ IF(CMAKE_ENABLE_NINJA)
     )
   ADD_DEFINITIONS(-DCMAKE_USE_NINJA)
 ELSE()
-  MESSAGE(STATUS "Ninja generator disabled, enforce with -DENABLE_NINJA=ON")
+  MESSAGE(STATUS "Ninja generator disabled, enforce with -DCMAKE_USE_NINJA=ON")
 ENDIF()
 
 # create a library used by the command line and the GUI

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

Summary of changes:
 Source/CMakeLists.txt |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake