diff options
| author | alcroito <placinta@gmail.com> | 2019-07-18 00:14:57 +0200 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-07-17 15:14:57 -0700 |
| commit | ab0ca36d9721e1c9138eba6a0c3d1a2b05deb186 (patch) | |
| tree | c65a8e1f37fbd15a9c39f91bf385480ae4a00502 | |
| parent | 4d2d85765f61c874d28d4301bdffe39ad1f482ed (diff) | |
| download | vcpkg-ab0ca36d9721e1c9138eba6a0c3d1a2b05deb186.tar.gz vcpkg-ab0ca36d9721e1c9138eba6a0c3d1a2b05deb186.zip | |
[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.
| -rw-r--r-- | ports/botan/portfile.cmake | 6 |
1 files 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") |