diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-08-06 07:19:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-06 07:19:54 -0700 |
| commit | 56174640c9b593f088145ea9cea70d84edf65c92 (patch) | |
| tree | 41999260113fba71513884ae0914725e6ed3b824 | |
| parent | ba5707d3b6abda6802bbbc14923aa69f860712ca (diff) | |
| download | vcpkg-56174640c9b593f088145ea9cea70d84edf65c92.tar.gz vcpkg-56174640c9b593f088145ea9cea70d84edf65c92.zip | |
[vcpkg_build_qmake] Disable multi-threaded build when file fails to open (#12752)
* Disable multi-threaded build when file fails to open
* re-trigger qt5 test
| -rw-r--r-- | ports/qt5-base/CONTROL | 2 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_build_qmake.cmake | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index e79f75e49..28247c42d 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,6 +1,6 @@ Source: qt5-base
Version: 5.15.0
-Port-Version: 1
+Port-Version: 2
Homepage: https://www.qt.io/
Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.
Build-Depends: zlib, zstd, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows)
diff --git a/scripts/cmake/vcpkg_build_qmake.cmake b/scripts/cmake/vcpkg_build_qmake.cmake index 6f3c871de..deecf4f06 100644 --- a/scripts/cmake/vcpkg_build_qmake.cmake +++ b/scripts/cmake/vcpkg_build_qmake.cmake @@ -28,8 +28,9 @@ 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( + vcpkg_execute_build_process( COMMAND ${INVOKE} -j ${VCPKG_CONCURRENCY} ${TARGETS} + NO_PARALLEL_COMMAND ${INVOKE} -j 1 ${TARGETS} WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${LOG_SUFFIX} LOGNAME package-${LOG_PREFIX}-${TARGET_TRIPLET}-${LOG_SUFFIX} ) |