From ab0ca36d9721e1c9138eba6a0c3d1a2b05deb186 Mon Sep 17 00:00:00 2001 From: alcroito Date: Thu, 18 Jul 2019 00:14:57 +0200 Subject: [botan] Fix parallel build (#7303) The build tool parallel argument should be passed in the regular COMMAND case, not the NO_PARALLEL_COMMAND one. Also the job number argument on Windows should not have a space between the argument and number. --- ports/botan/portfile.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake index 81eb3706c..6d0c81c8d 100644 --- a/ports/botan/portfile.cmake +++ b/ports/botan/portfile.cmake @@ -15,7 +15,7 @@ vcpkg_from_github( if(CMAKE_HOST_WIN32) vcpkg_find_acquire_program(JOM) set(build_tool "${JOM}") - set(parallel_build "/J ${VCPKG_CONCURRENCY}") + set(parallel_build "/J${VCPKG_CONCURRENCY}") else() find_program(MAKE make) set(build_tool "${MAKE}") @@ -87,8 +87,8 @@ function(BOTAN_BUILD BOTAN_BUILD_TYPE) message(STATUS "Build ${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}") vcpkg_execute_build_process( - COMMAND ${build_tool} - NO_PARALLEL_COMMAND "${build_tool} ${parallel_build}" + COMMAND "${build_tool}" ${parallel_build} + NO_PARALLEL_COMMAND "${build_tool}" WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}" LOGNAME build-${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}) message(STATUS "Build ${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE} done") -- cgit v1.2.3