Merge topic 'ninja-enable-on-windows'

2077e987 Ninja: Enable the ninja generator by default on Windows.

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