Attachment 250976 Details for Bug 279316 – Patch for cmake.mk

[patch] Patch for cmake.mk

uses-cmake-parallel-level.patch (text/plain), 1.03 KB, created by Daniel Engberg on 2024-05-26 08:47:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2024-05-26 08:47:37 UTC

Size: 1.03 KB

patch

obsolete

>diff --git a/Mk/Uses/cmake.mk b/Mk/Uses/cmake.mk
>index 39a9a902ef4a..2d582aba2458 100644
>--- a/Mk/Uses/cmake.mk
>+++ b/Mk/Uses/cmake.mk
>@@ -179,8 +179,10 @@ do-configure:
> 
> .    if !target(do-test) && ${cmake_ARGS:Mtesting}
> CMAKE_TESTING_ON?=		BUILD_TESTING
>+CMAKE_TESTING_PARALLEL_LEVEL?=	${MAKE_JOBS_NUMBER}
> CMAKE_TESTING_TARGET?=		test
> 
>+
> # Handle the option-like CMAKE_TESTING_ON and CMAKE_TESTING_OFF lists.
> .      for _bool_kind in ON OFF
> .        if defined(CMAKE_TESTING_${_bool_kind})
>@@ -192,7 +194,7 @@ do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_TESTING_ARGS} ${CMAKE_SOURCE_PATH} && \
> 		${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENVI} ${WRK_ENV} ${TEST_ENV} CTEST_PARALLEL_LEVEL=${_MAKE_JOBS_NUMBER} ${MAKE_CMD} ${MAKE_ARGS} ${CMAKE_TESTING_TARGET}
>+		${SETENVI} ${WRK_ENV} ${TEST_ENV} CTEST_PARALLEL_LEVEL=${CMAKE_TESTING_PARALLEL_LEVEL} ${MAKE_CMD} ${MAKE_ARGS} ${CMAKE_TESTING_TARGET}
> .    endif
> .  endif
>

Actions: View | Diff

Attachments on bug 279316: 250976 | 250977