From 3b847415154b13e401bf9f71042578ad21c9c1c9 Mon Sep 17 00:00:00 2001 From: Peter Kuemmel Date: Sun, 19 Feb 2012 19:15:57 +0100 Subject: Ninja: disable unfinished Windows ninja support This way the branch is ready-to-merge, even when the generator is broken on Windows. --- Source/CMakeLists.txt | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index a53a0c1..3ae9464 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -353,23 +353,21 @@ IF (WIN32) ENDIF(NOT UNIX) ENDIF (WIN32) -SET(SRCS ${SRCS} - cmGlobalNinjaGenerator.cxx - cmGlobalNinjaGenerator.h - cmNinjaTypes.h - cmLocalNinjaGenerator.cxx - cmLocalNinjaGenerator.h - cmNinjaTargetGenerator.cxx - cmNinjaTargetGenerator.h - cmNinjaNormalTargetGenerator.cxx - cmNinjaNormalTargetGenerator.h - cmNinjaUtilityTargetGenerator.cxx - cmNinjaUtilityTargetGenerator.h - ) -ADD_DEFINITIONS(-DCMAKE_USE_NINJA) -IF(WIN32) - # TODO remove - ADD_DEFINITIONS(-DENABLE_WIN32_NINJA_HACKS) +if(NOT WIN32) + SET(SRCS ${SRCS} + cmGlobalNinjaGenerator.cxx + cmGlobalNinjaGenerator.h + cmNinjaTypes.h + cmLocalNinjaGenerator.cxx + cmLocalNinjaGenerator.h + cmNinjaTargetGenerator.cxx + cmNinjaTargetGenerator.h + cmNinjaNormalTargetGenerator.cxx + cmNinjaNormalTargetGenerator.h + cmNinjaUtilityTargetGenerator.cxx + cmNinjaUtilityTargetGenerator.h + ) + ADD_DEFINITIONS(-DCMAKE_USE_NINJA) endif() # create a library used by the command line and the GUI -- cgit v0.12