aboutsummaryrefslogtreecommitdiff
path: root/ports/jsonnet
diff options
context:
space:
mode:
authorBilly O'Neal <bion@microsoft.com>2020-10-27 20:48:14 -0700
committerGitHub <noreply@github.com>2020-10-27 20:48:14 -0700
commita6a1722cfa94caa5db98848679b99377bc5a0112 (patch)
tree0f17c63e4a0551866280600e466f21267c8ae1ce /ports/jsonnet
parentc34c4189ebbf0795e1f8e2de562c527a854c8db4 (diff)
downloadvcpkg-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 'ports/jsonnet')
-rw-r--r--ports/jsonnet/CONTROL1
-rw-r--r--ports/jsonnet/portfile.cmake5
2 files changed, 4 insertions, 2 deletions
diff --git a/ports/jsonnet/CONTROL b/ports/jsonnet/CONTROL
index 99d73af6c..b069a6b1b 100644
--- a/ports/jsonnet/CONTROL
+++ b/ports/jsonnet/CONTROL
@@ -1,5 +1,6 @@
Source: jsonnet
Version: 0.16.0
+Port-Version: 1
Homepage: https://github.com/google/jsonnet
Description: Jsonnet - The data templating language
Build-Depends: nlohmann-json
diff --git a/ports/jsonnet/portfile.cmake b/ports/jsonnet/portfile.cmake
index 77e8b8783..b2769cd85 100644
--- a/ports/jsonnet/portfile.cmake
+++ b/ports/jsonnet/portfile.cmake
@@ -15,8 +15,9 @@ vcpkg_from_github(
)
if(VCPKG_TARGET_IS_WINDOWS)
- vcpkg_execute_required_process(
- COMMAND Powershell -Command "((Get-Content -AsByteStream \"${SOURCE_PATH}/stdlib/std.jsonnet\") -join ',') + ',0' | Out-File -Encoding Ascii \"${SOURCE_PATH}/core/std.jsonnet.h\""
+ find_program(PWSH_PATH pwsh)
+ vcpkg_execute_required_process(
+ COMMAND "${PWSH_PATH}" -Command "((Get-Content -AsByteStream \"${SOURCE_PATH}/stdlib/std.jsonnet\") -join ',') + ',0' | Out-File -Encoding Ascii \"${SOURCE_PATH}/core/std.jsonnet.h\""
WORKING_DIRECTORY "${SOURCE_PATH}"
LOGNAME "std.jsonnet"
)