From 634c1043b01dff682dc9834f4987037683764034 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Mon, 10 Aug 2020 15:40:21 -0700
Subject: [vcpkg_copy_tool_dependencies] Use vcpkg internal powershell (#12776)

* Use vcpkg internal powershell

* [protobuf] change vcpkg_copy_tool_dependencies to vcpkg_copy_tools
---
 scripts/cmake/vcpkg_copy_tool_dependencies.cmake | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'scripts')

diff --git a/scripts/cmake/vcpkg_copy_tool_dependencies.cmake b/scripts/cmake/vcpkg_copy_tool_dependencies.cmake
index 396d20b41..1784a4d14 100644
--- a/scripts/cmake/vcpkg_copy_tool_dependencies.cmake
+++ b/scripts/cmake/vcpkg_copy_tool_dependencies.cmake
@@ -17,14 +17,21 @@
 ## * [glib](https://github.com/Microsoft/vcpkg/blob/master/ports/glib/portfile.cmake)
 ## * [fltk](https://github.com/Microsoft/vcpkg/blob/master/ports/fltk/portfile.cmake)
 function(vcpkg_copy_tool_dependencies TOOL_DIR)
+    find_program(PS_EXE powershell PATHS ${DOWNLOADS}/tool)
+    if (PS_EXE-NOTFOUND)
+        message(FATAL_ERROR "Could not find powershell in vcpkg tools, please open an issue to report this.")
+    endif()
     macro(search_for_dependencies PATH_TO_SEARCH)
         file(GLOB TOOLS ${TOOL_DIR}/*.exe ${TOOL_DIR}/*.dll)
         foreach(TOOL ${TOOLS})
-            execute_process(COMMAND powershell -noprofile -executionpolicy Bypass -nologo
-                -file ${SCRIPTS}/buildsystems/msbuild/applocal.ps1
-                -targetBinary ${TOOL}
-                -installedDir ${PATH_TO_SEARCH}
-                OUTPUT_VARIABLE OUT)
+            vcpkg_execute_required_process(
+                COMMAND ${PS_EXE} -noprofile -executionpolicy Bypass -nologo
+                    -file ${SCRIPTS}/buildsystems/msbuild/applocal.ps1
+                    -targetBinary ${TOOL}
+                    -installedDir ${PATH_TO_SEARCH}
+                WORKING_DIRECTORY ${VCPKG_ROOT_DIR}
+                LOGNAME copy-tool-dependencies
+            )
         endforeach()
     endmacro()
     search_for_dependencies(${CURRENT_PACKAGES_DIR}/bin)
-- 
cgit v1.2.3