diff options
| author | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-06-04 18:36:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-04 18:36:20 -0700 |
| commit | a2dbe32b726f60db0fee5decc85fbd1744cc4a7e (patch) | |
| tree | 77d135e691cadab5ee3b4e860d70a4e759843fe6 /scripts | |
| parent | 2636041e9a0df24fd9a523ade54f6f664b6f700e (diff) | |
| parent | c52522983c6d684531741880a8b4f27e69112ba0 (diff) | |
| download | vcpkg-a2dbe32b726f60db0fee5decc85fbd1744cc4a7e.tar.gz vcpkg-a2dbe32b726f60db0fee5decc85fbd1744cc4a7e.zip | |
Merge pull request #6729 from emptyVoid/fix-vcpkg_acquire_msys
Fix MSYS hanging of PowerShell
Diffstat (limited to 'scripts')
| -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() |