[vcpkg_build_qmake] Disable multi-threaded build when file fails to o…

…pen (#12752) * Disable multi-threaded build when file fails to open * re-trigger qt5 test
microsoft · Aug 6, 2020 · 5617464 · 5617464
1 parent ba5707d
commit 5617464
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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}
         )