diff options
| author | David Cole <david.cole@kitware.com> | 2012-06-19 18:42:23 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-06-19 18:42:23 (GMT) |
| commit | fbfddc70a452e3e2c9b6224cc27a3994bd9712f9 (patch) | |
| tree | 8fd30bd9a3fd44c08db9fd0134c80374f6a2317e /Source | |
| parent | aa2c6d0493328873ce41d58708fbc3b6c9c1d5fe (diff) | |
| parent | 2077e98753a505490d16cba42af0e0cae04f2c36 (diff) | |
| download | CMake-fbfddc70a452e3e2c9b6224cc27a3994bd9712f9.zip CMake-fbfddc70a452e3e2c9b6224cc27a3994bd9712f9.tar.gz CMake-fbfddc70a452e3e2c9b6224cc27a3994bd9712f9.tar.bz2 | |
Merge topic 'ninja-enable-on-windows'
2077e98 Ninja: Enable the ninja generator by default on Windows.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
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 |