diff options
| author | Peter Kuemmel <syntheticpp@gmx.net> | 2012-04-08 09:15:17 (GMT) |
|---|---|---|
| committer | Peter Kuemmel <syntheticpp@gmx.net> | 2012-04-08 09:15:17 (GMT) |
| commit | 2a081a2b3a3064530fe173a2930828e2232e844b (patch) | |
| tree | 7ec26b207debde47eff89233db73f10304a50c43 /Source/CMakeLists.txt | |
| parent | b8c3e8c1f1083ef9f8ece6b1cdb0cbe6dc50c79a (diff) | |
| download | CMake-2a081a2b3a3064530fe173a2930828e2232e844b.zip CMake-2a081a2b3a3064530fe173a2930828e2232e844b.tar.gz CMake-2a081a2b3a3064530fe173a2930828e2232e844b.tar.bz2 | |
Ninja: no additional variable needed to enable ninja
Diffstat (limited to 'Source/CMakeLists.txt')
| -rw-r--r-- | Source/CMakeLists.txt | 12 |
1 files changed, 5 insertions, 7 deletions
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 |