[Cmake-commits] CMake branch, dashboard, updated. e92ba4123b610e11f39e5d9d08637cfc496dd8c0
Brad King
brad.king at kitware.com
Wed Aug 10 15:40:31 EDT 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, dashboard has been updated
via e92ba4123b610e11f39e5d9d08637cfc496dd8c0 (commit)
from cb56d71de1bd40e06db17cb0266d1fbeabea75a3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e92ba4123b610e11f39e5d9d08637cfc496dd8c0
commit e92ba4123b610e11f39e5d9d08637cfc496dd8c0
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 9 11:08:56 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 9 11:08:56 2016 -0400
kwsys_common: Enable launchers and make program for Ninja generator
diff --git a/kwsys_common.cmake b/kwsys_common.cmake
index 02b4008..8050f2c 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})
-----------------------------------------------------------------------
Summary of changes:
kwsys_common.cmake | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list