kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'ninja-enable-on-windows'

Browse Source 
2077e98 Ninja: Enable the ninja generator by default on Windows.
This commit is contained in:
David Cole 2012-06-19 14:42:23 -04:00 committed by CMake Topic Stage
commit fbfddc70a4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/CMakeLists.txt
View File

@ -361,11 +361,11 @@ ENDIF (WIN32)
# on platforms where it does not pass all tests. # on platforms where it does not pass all tests.
# Enforce Ninja support by setting CMAKE_USE_NINJA # Enforce Ninja support by setting CMAKE_USE_NINJA
set(_CMAKE_DEFAULT_NINJA_VALUE TRUE) set(_CMAKE_DEFAULT_NINJA_VALUE TRUE)
if(WIN32 OR APPLE) if(APPLE)
SET(_CMAKE_DEFAULT_NINJA_VALUE FALSE) SET(_CMAKE_DEFAULT_NINJA_VALUE FALSE)
endif() endif()
SET(CMAKE_ENABLE_NINJA ${_CMAKE_DEFAULT_NINJA_VALUE} CACHE BOOL 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) MARK_AS_ADVANCED(CMAKE_ENABLE_NINJA)
IF(CMAKE_ENABLE_NINJA) IF(CMAKE_ENABLE_NINJA)
MESSAGE(STATUS "Ninja generator enabled.") MESSAGE(STATUS "Ninja generator enabled.")
@ -384,7 +384,7 @@ IF(CMAKE_ENABLE_NINJA)
) )
ADD_DEFINITIONS(-DCMAKE_USE_NINJA) ADD_DEFINITIONS(-DCMAKE_USE_NINJA)
ELSE() 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() ENDIF()
# create a library used by the command line and the GUI # create a library used by the command line and the GUI