mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-28 05:15:11 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[botan] Fix parallel build (#7303)

Browse Source 
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.
This commit is contained in:
alcroito 2019-07-18 00:14:57 +02:00 committed by Phil Christensen
parent 4d2d85765f
commit ab0ca36d97
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/botan/portfile.cmake
View File

@ -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")