diff options
| author | Brad King <brad.king@kitware.com> | 2016-08-09 11:08:56 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-08-09 11:08:56 -0400 |
| commit | e92ba4123b610e11f39e5d9d08637cfc496dd8c0 (patch) | |
| tree | 98b1dd2353376a57c9cc24725c2dbba62d5c1a40 | |
| parent | cb56d71de1bd40e06db17cb0266d1fbeabea75a3 (diff) | |
| download | cmake-e92ba4123b610e11f39e5d9d08637cfc496dd8c0.tar.gz | |
kwsys_common: Enable launchers and make program for Ninja generator
| -rw-r--r-- | kwsys_common.cmake | 6 |
1 files 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}) |