diff --git a/cmake/ports/node/portfile.cmake b/cmake/ports/node/portfile.cmake index c3b6397181..b231d5faf8 100644 --- a/cmake/ports/node/portfile.cmake +++ b/cmake/ports/node/portfile.cmake @@ -33,45 +33,43 @@ else () SHA512 9b983b899acd02e7ed761bc3633fc56855e10335fcdb558a29d1cf068ce1125991c9a781616d82a9dc90be6e8ba1bf4a34a10a92c6b7db9cbe33ef7fa7dda67f HEAD_REF v18.16.0 ) - # v18.16.0-e8bd828d3a.clean is getting added by VCPKG. It will need to be updated when we update libnode version. - set(NODE_SOURCE_DIRECTORY_NAME "v18.16.0-e8bd828d3a.clean") - file(COPY ${SOURCE_PATH} DESTINATION "${CURRENT_BUILDTREES_DIR}") + file(COPY ${SOURCE_PATH}/ DESTINATION "${CURRENT_BUILDTREES_DIR}") vcpkg_execute_build_process( COMMAND ./configure --gdb --shared --v8-enable-object-print --shared-openssl --prefix=${CURRENT_BUILDTREES_DIR}/node-install/ - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${NODE_SOURCE_DIRECTORY_NAME} + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME "configure-node" ) if(VCPKG_MAX_CONCURRENCY GREATER 0) vcpkg_execute_build_process( COMMAND make -j${VCPKG_MAX_CONCURRENCY} - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${NODE_SOURCE_DIRECTORY_NAME} + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME "make-node" ) vcpkg_execute_build_process( COMMAND make -j${VCPKG_MAX_CONCURRENCY} install - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${NODE_SOURCE_DIRECTORY_NAME} + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME "install-node" ) elseif (VCPKG_CONCURRENCY GREATER 0) vcpkg_execute_build_process( COMMAND make -j${VCPKG_CONCURRENCY} - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${NODE_SOURCE_DIRECTORY_NAME} + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME "make-node" ) vcpkg_execute_build_process( COMMAND make -j${VCPKG_CONCURRENCY} install - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${NODE_SOURCE_DIRECTORY_NAME} + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME "install-node" ) else () vcpkg_execute_build_process( COMMAND make -j$(nproc) - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${NODE_SOURCE_DIRECTORY_NAME} + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME "make-node" ) vcpkg_execute_build_process( COMMAND make -j$(nproc) install - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${NODE_SOURCE_DIRECTORY_NAME} + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME "install-node" ) endif ()