From f536de8f153386267032aebf1bd4b65d4476ec30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Tue, 18 Aug 2020 16:49:14 -0700
Subject: [PATCH] [vcpkg_execute_build_process] Re-fix qt5 components build
 (#12864)

---
 ports/qt5/CONTROL                               | 2 +-
 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 2b06636e7b82dd..928cc3672c6729 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 67607d768685a7..7097fbf1b42a39 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")