From c76cc635dc412963dcfd203d0f67ea29f82d68bb Mon Sep 17 00:00:00 2001
From: emptyVoid <emptyVoid@users.noreply.github.com>
Date: Sun, 2 Jun 2019 22:26:04 +0700
Subject: Move gpg-agent termination to vcpkg_acquire_msys.

---
 ports/icu/portfile.cmake               | 8 --------
 scripts/cmake/vcpkg_acquire_msys.cmake | 8 ++++++++
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake
index 91cba5db7..2061111e9 100644
--- a/ports/icu/portfile.cmake
+++ b/ports/icu/portfile.cmake
@@ -209,11 +209,3 @@ vcpkg_copy_pdbs()
 # Handle copyright
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/icu)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/icu/LICENSE ${CURRENT_PACKAGES_DIR}/share/icu/copyright)
-
-# Deal with a stale process created by MSYS
-if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    vcpkg_execute_required_process(
-        COMMAND TASKKILL /F /IM gpg-agent.exe /fi "memusage gt 2"
-        WORKING_DIRECTORY ${SOURCE_PATH}
-    )
-endif()
diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake
index adbd58ca5..09090db68 100644
--- a/scripts/cmake/vcpkg_acquire_msys.cmake
+++ b/scripts/cmake/vcpkg_acquire_msys.cmake
@@ -113,5 +113,13 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT)
     message(STATUS "Acquiring MSYS Packages... OK")
   endif()
 
+  # Deal with a stale process created by MSYS
+  if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+      vcpkg_execute_required_process(
+          COMMAND TASKKILL /F /IM gpg-agent.exe /fi "memusage gt 2"
+          WORKING_DIRECTORY ${SOURCE_PATH}
+      )
+  endif()
+
   set(${PATH_TO_ROOT_OUT} ${PATH_TO_ROOT} PARENT_SCOPE)
 endfunction()
-- 
cgit v1.2.3