diff options
| author | emptyVoid <emptyVoid@users.noreply.github.com> | 2019-06-02 22:26:04 +0700 |
|---|---|---|
| committer | emptyVoid <emptyVoid@users.noreply.github.com> | 2019-06-02 22:26:04 +0700 |
| commit | c76cc635dc412963dcfd203d0f67ea29f82d68bb (patch) | |
| tree | ca7f8860a0256fdf506b223b7dfef97993f2cbae /scripts/cmake | |
| parent | 64d6b21c78b2da474fa88b08c6abde86f7603ae5 (diff) | |
| download | vcpkg-c76cc635dc412963dcfd203d0f67ea29f82d68bb.tar.gz vcpkg-c76cc635dc412963dcfd203d0f67ea29f82d68bb.zip | |
Move gpg-agent termination to vcpkg_acquire_msys.
Diffstat (limited to 'scripts/cmake')
| -rw-r--r-- | scripts/cmake/vcpkg_acquire_msys.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
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() |