[Cmake-commits] CMake branch, next, updated. v2.8.8-3154-g26fe133

[David Cole]

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  26fe13382a9a5eef4cf762184bdf752f1f3fe717 (commit)
       via  2077e98753a505490d16cba42af0e0cae04f2c36 (commit)
      from  396d01ea21959d1d7c1d7e2d97c45a683b03f354 (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=26fe13382a9a5eef4cf762184bdf752f1f3fe717
commit 26fe13382a9a5eef4cf762184bdf752f1f3fe717
Merge: 396d01e 2077e98
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Jun 13 17:27:51 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 13 17:27:51 2012 -0400

    Merge topic 'ninja-enable-on-windows' into next
    
    2077e98 Ninja: Enable the ninja generator by default on Windows.

diff --cc Source/CMakeLists.txt
index ebeda56,e9ac0ed..a871836
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@@ -383,12 -383,8 +383,12 @@@ IF(CMAKE_ENABLE_NINJA
      cmNinjaUtilityTargetGenerator.h
      )
    ADD_DEFINITIONS(-DCMAKE_USE_NINJA)
 +  IF(MSVC) # TODO WIN32
 +    ADD_EXECUTABLE(cmcldeps cmcldeps.cxx)
 +    INSTALL_TARGETS(/bin cmcldeps)
 +  ENDIF()
  ELSE()
-   MESSAGE(STATUS "Ninja generator disabled, enforce with -DCMAKE_ENABLE_NINJA=ON")
+   MESSAGE(STATUS "Ninja generator disabled, enable it with -DCMAKE_ENABLE_NINJA=ON")
  ENDIF()
  
  # create a library used by the command line and the GUI

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2077e98753a505490d16cba42af0e0cae04f2c36
commit 2077e98753a505490d16cba42af0e0cae04f2c36
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Jun 13 17:25:24 2012 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Wed Jun 13 17:25:24 2012 -0400

    Ninja: Enable the ninja generator by default on Windows.
    
    All tests are passing as of this morning on the CMake dashboard in
    the Nightly Expected section.
    
    Nice job to all the Ninja+CMake contributors. Congrats!

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 46bdec6..e9ac0ed 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -361,11 +361,11 @@ ENDIF (WIN32)
 # on platforms where it does not pass all tests.
 # Enforce Ninja support by setting CMAKE_USE_NINJA
 set(_CMAKE_DEFAULT_NINJA_VALUE TRUE)
-if(WIN32 OR APPLE)
+if(APPLE)
   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")
+    "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.")
@@ -384,7 +384,7 @@ IF(CMAKE_ENABLE_NINJA)
     )
   ADD_DEFINITIONS(-DCMAKE_USE_NINJA)
 ELSE()
-  MESSAGE(STATUS "Ninja generator disabled, enforce with -DCMAKE_ENABLE_NINJA=ON")
+  MESSAGE(STATUS "Ninja generator disabled, enable it with -DCMAKE_ENABLE_NINJA=ON")
 ENDIF()
 
 # create a library used by the command line and the GUI

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

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


hooks/post-receive
-- 
CMake