diff options
| author | Billy O'Neal <bion@microsoft.com> | 2020-10-27 20:48:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-27 20:48:14 -0700 |
| commit | a6a1722cfa94caa5db98848679b99377bc5a0112 (patch) | |
| tree | 0f17c63e4a0551866280600e466f21267c8ae1ce /scripts/cmake | |
| parent | c34c4189ebbf0795e1f8e2de562c527a854c8db4 (diff) | |
| download | vcpkg-a6a1722cfa94caa5db98848679b99377bc5a0112.tar.gz vcpkg-a6a1722cfa94caa5db98848679b99377bc5a0112.zip | |
[vcpkg, jsonnet, openssl-uwp] Enable use of the system powershell-core if it is present. (#13805)
Diffstat (limited to 'scripts/cmake')
| -rw-r--r-- | scripts/cmake/vcpkg_copy_tool_dependencies.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/cmake/vcpkg_copy_tool_dependencies.cmake b/scripts/cmake/vcpkg_copy_tool_dependencies.cmake index 1784a4d14..681c80461 100644 --- a/scripts/cmake/vcpkg_copy_tool_dependencies.cmake +++ b/scripts/cmake/vcpkg_copy_tool_dependencies.cmake @@ -17,16 +17,16 @@ ## * [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.") + find_program(PWSH_EXE pwsh) + if (PWSH_EXE-NOTFOUND) + message(FATAL_ERROR "Could not find PowerShell Core; 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}) vcpkg_execute_required_process( - COMMAND ${PS_EXE} -noprofile -executionpolicy Bypass -nologo - -file ${SCRIPTS}/buildsystems/msbuild/applocal.ps1 + COMMAND "${PWSH_EXE}" -noprofile -executionpolicy Bypass -nologo + -file "${SCRIPTS}/buildsystems/msbuild/applocal.ps1" -targetBinary ${TOOL} -installedDir ${PATH_TO_SEARCH} WORKING_DIRECTORY ${VCPKG_ROOT_DIR} |