From 4f1ef81d4bb46e0452c5ccc84f38172bc987ce37 Mon Sep 17 00:00:00 2001 From: Vicente Eduardo Ferrer Garcia Date: Wed, 21 Feb 2024 23:47:38 +0100 Subject: [PATCH] Improve NodeJS build from source. --- cmake/FindNodeJS.cmake | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake/FindNodeJS.cmake b/cmake/FindNodeJS.cmake index 88ab33df8..d6ca10a92 100644 --- a/cmake/FindNodeJS.cmake +++ b/cmake/FindNodeJS.cmake @@ -542,14 +542,17 @@ if(NOT NodeJS_LIBRARY) message(STATUS "Build NodeJS shared library") + # Create build output directory + execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${NodeJS_OUTPUT_PATH}/out) + include(ProcessorCount) ProcessorCount(N) - if(NOT N EQUAL 0) - execute_process(COMMAND sh -c "make -j${N} -C out BUILDTYPE=${CMAKE_BUILD_TYPE} V=1" WORKING_DIRECTORY "${NodeJS_OUTPUT_PATH}") + if(N GREATER 1) + execute_process(COMMAND sh -c "make -j${N} -C ${NodeJS_OUTPUT_PATH}/out BUILDTYPE=${CMAKE_BUILD_TYPE} V=1" WORKING_DIRECTORY "${NodeJS_OUTPUT_PATH}") else() - execute_process(COMMAND sh -c "make -C out BUILDTYPE=${CMAKE_BUILD_TYPE} V=1" WORKING_DIRECTORY "${NodeJS_OUTPUT_PATH}") + execute_process(COMMAND sh -c "make -C ${NodeJS_OUTPUT_PATH}/out BUILDTYPE=${CMAKE_BUILD_TYPE} V=1" WORKING_DIRECTORY "${NodeJS_OUTPUT_PATH}") endif() endif() endif()