From e92ba4123b610e11f39e5d9d08637cfc496dd8c0 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 9 Aug 2016 11:08:56 -0400 Subject: kwsys_common: Enable launchers and make program for Ninja generator --- kwsys_common.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kwsys_common.cmake b/kwsys_common.cmake index 02b4008dbc..8050f2c928 100644 --- a/kwsys_common.cmake +++ b/kwsys_common.cmake @@ -113,8 +113,8 @@ if(NOT DEFINED CTEST_BUILD_CONFIGURATION) endif() # Choose CTest reporting mode. -if(NOT "${CTEST_CMAKE_GENERATOR}" MATCHES "Make") - # Launchers work only with Makefile generators. +if(NOT "${CTEST_CMAKE_GENERATOR}" MATCHES "Make|Ninja") + # Launchers work only with Makefile and Ninja generators. set(CTEST_USE_LAUNCHERS 0) elseif(NOT DEFINED CTEST_USE_LAUNCHERS) set(CTEST_USE_LAUNCHERS 1) @@ -304,7 +304,7 @@ set(ENV{LC_ALL} C) macro(write_cache) set(cache_build_type "") set(cache_make_program "") - if(CTEST_CMAKE_GENERATOR MATCHES "Make") + if(CTEST_CMAKE_GENERATOR MATCHES "Make|Ninja") set(cache_build_type CMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION}) if(CMAKE_MAKE_PROGRAM) set(cache_make_program CMAKE_MAKE_PROGRAM:FILEPATH=${CMAKE_MAKE_PROGRAM}) -- cgit v1.2.1