diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-07-31 09:12:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-31 09:12:17 -0700 |
| commit | 2b8d5bad0a1089783f34d3f8f9b85f18b7cbfb0d (patch) | |
| tree | 5a15f49af829d93c3b810c08937350207a52eac1 /ports/qt5-base | |
| parent | 2cb28482bb5f10332b3458502a3370f821b8f69c (diff) | |
| download | vcpkg-2b8d5bad0a1089783f34d3f8f9b85f18b7cbfb0d.tar.gz vcpkg-2b8d5bad0a1089783f34d3f8f9b85f18b7cbfb0d.zip | |
[qt5 components] Disable parallel build (#12529)
* [qt5-imageformats] Disable parallel build
* [ompl] Disable parallel configure
* [qt5-connectivity] Disable parallel build
* [qwt] Update hash
* [qt5-location] Disable parallel build
* Update ports/qwt/portfile.cmake
* Update ports/qwt/portfile.cmake
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
* [qt5] change build method to vcpkg_execute_build_process
* Add condition when there are some file conflicts
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'ports/qt5-base')
| -rw-r--r-- | ports/qt5-base/CONTROL | 1 | ||||
| -rw-r--r-- | ports/qt5-base/cmake/install_qt.cmake | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index 4788f4b38..2763b32aa 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,5 +1,6 @@ Source: qt5-base
Version: 5.15.0
+Port-Version: 1
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, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows)
diff --git a/ports/qt5-base/cmake/install_qt.cmake b/ports/qt5-base/cmake/install_qt.cmake index a188138f4..97f2e71a2 100644 --- a/ports/qt5-base/cmake/install_qt.cmake +++ b/ports/qt5-base/cmake/install_qt.cmake @@ -4,6 +4,7 @@ function(install_qt) if(CMAKE_HOST_WIN32) vcpkg_find_acquire_program(JOM) set(INVOKE "${JOM}" /J ${VCPKG_CONCURRENCY}) + set(INVOKE_SINGLE "${JOM}" /J 1) else() find_program(MAKE make) set(INVOKE "${MAKE}" -j${VCPKG_CONCURRENCY}) @@ -62,8 +63,9 @@ function(install_qt) endif() message(STATUS "Building ${_build_triplet}") - vcpkg_execute_required_process( + vcpkg_execute_build_process( COMMAND ${INVOKE} + NO_PARALLEL_COMMAND ${INVOKE_SINGLE} WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${_build_triplet} LOGNAME build-${_build_triplet} ) |