diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-08-18 16:49:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-18 16:49:14 -0700 |
| commit | 4a3d9e22d1b104332c5faf98abfcee94b671c9ef (patch) | |
| tree | aa3fbbcbcec26053802dbc52e007cb0078760212 | |
| parent | 356e6b8737fa17c2af75009f08760a25258cf25a (diff) | |
| download | vcpkg-4a3d9e22d1b104332c5faf98abfcee94b671c9ef.tar.gz vcpkg-4a3d9e22d1b104332c5faf98abfcee94b671c9ef.zip | |
[vcpkg_execute_build_process] Re-fix qt5 components build (#12864)
| -rw-r--r-- | ports/qt5/CONTROL | 2 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_execute_build_process.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL index 2b06636e7..928cc3672 100644 --- a/ports/qt5/CONTROL +++ b/ports/qt5/CONTROL @@ -1,6 +1,6 @@ Source: qt5 Version: 5.15.0 -Port-Version: 1 +Port-Version: 2 Homepage: https://www.qt.io/ Description: Qt5 Application Framework Build-Depends: qt5-base[core] diff --git a/scripts/cmake/vcpkg_execute_build_process.cmake b/scripts/cmake/vcpkg_execute_build_process.cmake index 67607d768..7097fbf1b 100644 --- a/scripts/cmake/vcpkg_execute_build_process.cmake +++ b/scripts/cmake/vcpkg_execute_build_process.cmake @@ -63,7 +63,7 @@ function(vcpkg_execute_build_process) OR out_contents MATCHES "LINK : fatal error LNK1104:" OR out_contents MATCHES "LINK : fatal error LNK1201:" # The linker ran out of memory during execution. We will try continuing once more, with parallelism disabled. - OR out_contents MATCHES "Cannot create parent directory" + OR err_contents MATCHES "Cannot create parent directory" OR err_contents MATCHES "Cannot write file" # Multiple threads using the same directory at the same time cause conflicts, will try again. ) message(STATUS "Restarting Build without parallelism because memory exceeded") |