diff options
| author | Billy O'Neal <bion@microsoft.com> | 2020-05-04 15:37:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-04 15:37:57 -0700 |
| commit | 7db401cb1ef1fc559ec9f9ce814d064c328fd767 (patch) | |
| tree | 5e029a2b807bed1e5b7b4d6548f51d7520e2ca39 /scripts | |
| parent | 48decf759ebbf3b281fb2ae4e45f092a70ef48f1 (diff) | |
| download | vcpkg-7db401cb1ef1fc559ec9f9ce814d064c328fd767.tar.gz vcpkg-7db401cb1ef1fc559ec9f9ce814d064c328fd767.zip | |
[qt5] Add -j to make to parallelize on Linux and MacOS (#11111)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_build_qmake.cmake | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/scripts/cmake/vcpkg_build_qmake.cmake b/scripts/cmake/vcpkg_build_qmake.cmake index ef6fb30f3..6f3c871de 100644 --- a/scripts/cmake/vcpkg_build_qmake.cmake +++ b/scripts/cmake/vcpkg_build_qmake.cmake @@ -6,7 +6,6 @@ # :: # vcpkg_build_qmake() # - function(vcpkg_build_qmake) cmake_parse_arguments(_csc "SKIP_MAKEFILES" "BUILD_LOGNAME" "TARGETS;RELEASE_TARGETS;DEBUG_TARGETS" ${ARGN}) @@ -18,9 +17,9 @@ function(vcpkg_build_qmake) set(INVOKE "${MAKE}") endif() - # Make sure that the linker finds the libraries used + # Make sure that the linker finds the libraries used set(ENV_PATH_BACKUP "$ENV{PATH}") - + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" NATIVE_INSTALLED_DIR) if(NOT _csc_BUILD_LOGNAME) @@ -30,7 +29,7 @@ function(vcpkg_build_qmake) function(run_jom TARGETS LOG_PREFIX LOG_SUFFIX) message(STATUS "Package ${LOG_PREFIX}-${TARGET_TRIPLET}-${LOG_SUFFIX}") vcpkg_execute_required_process( - COMMAND ${INVOKE} ${TARGETS} + COMMAND ${INVOKE} -j ${VCPKG_CONCURRENCY} ${TARGETS} WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${LOG_SUFFIX} LOGNAME package-${LOG_PREFIX}-${TARGET_TRIPLET}-${LOG_SUFFIX} ) @@ -46,16 +45,16 @@ function(vcpkg_build_qmake) set(_buildname "DEBUG") list(APPEND BUILDTYPES ${_buildname}) set(_short_name_${_buildname} "dbg") - set(_path_suffix_${_buildname} "/debug") + set(_path_suffix_${_buildname} "/debug") endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") set(_buildname "RELEASE") list(APPEND BUILDTYPES ${_buildname}) set(_short_name_${_buildname} "rel") - set(_path_suffix_${_buildname} "") + set(_path_suffix_${_buildname} "") endif() unset(_buildname) - + foreach(_buildname ${BUILDTYPES}) set(_BUILD_PREFIX "${_path_suffix_${_buildname}}") vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}${_BUILD_PREFIX}/bin") @@ -67,7 +66,7 @@ function(vcpkg_build_qmake) run_jom("${_csc_${_buildname}_TARGETS}" ${_csc_BUILD_LOGNAME} ${_short_name_${_buildname}}) unset(_BUILD_PREFIX) endforeach() - + # Restore the original value of ENV{PATH} set(ENV{PATH} "${ENV_PATH_BACKUP}") set(ENV{_CL_} "${ENV_CL_BACKUP}") |