Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[vcpkg_execute_build_process] Re-fix qt5 components build #12864

Merged
merged 2 commits into from
Aug 18, 2020
Merged

[vcpkg_execute_build_process] Re-fix qt5 components build #12864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70d805e
[vcpkg_execute_build_process] Change the log selected when detecting …
Aug 12, 2020
a93a473
[qt5] Re-trigger CI test
Aug 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/qt5/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
2 changes: 1 addition & 1 deletion scripts/cmake/vcpkg_execute_build_process.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down