diff options
| author | Curtis J Bezault <curtbezault@gmail.com> | 2019-08-09 15:06:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-09 15:06:54 -0400 |
| commit | 6c1423f41d8e35268e8705d56f21ec09188be693 (patch) | |
| tree | 1b973366e5ec23b2789f04fc612149cf44a12c20 /ports | |
| parent | c4f1a91ef245ed3e44ea11f13040a77453126165 (diff) | |
| parent | 67643a0ea34aa58337680266024fecb9f04b3eb5 (diff) | |
| download | vcpkg-6c1423f41d8e35268e8705d56f21ec09188be693.tar.gz vcpkg-6c1423f41d8e35268e8705d56f21ec09188be693.zip | |
Merge branch 'master' into external_file_abi
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/jsonnet/CONTROL | 2 | ||||
| -rw-r--r-- | ports/jsonnet/portfile.cmake | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ports/jsonnet/CONTROL b/ports/jsonnet/CONTROL index 35c870658..508f1e7af 100644 --- a/ports/jsonnet/CONTROL +++ b/ports/jsonnet/CONTROL @@ -1,4 +1,4 @@ Source: jsonnet -Version: 2019-05-08 +Version: 2019-05-08-1 Homepage: https://github.com/google/jsonnet Description: Jsonnet - The data templating language diff --git a/ports/jsonnet/portfile.cmake b/ports/jsonnet/portfile.cmake index 5472445da..ffa2973fb 100644 --- a/ports/jsonnet/portfile.cmake +++ b/ports/jsonnet/portfile.cmake @@ -11,12 +11,12 @@ vcpkg_from_github( SHA512 d9f84c39929e9e80272e2b834f68a13b48c1cb4d64b70f5b6fa16e677555d947f7cf57372453e23066a330faa6a429b9aa750271b46f763581977a223d238785 HEAD_REF master PATCHES - 001-enable-msvc.patch + 001-enable-msvc.patch ) if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") vcpkg_execute_required_process( - COMMAND Powershell -Command "((Get-Content -Encoding Byte \"${SOURCE_PATH}/stdlib/std.jsonnet\") -join ',') + ',0' > \"${SOURCE_PATH}/core/std.jsonnet.h\"" + COMMAND Powershell -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" ) @@ -31,7 +31,7 @@ endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS -DBUILD_JSONNET=OFF -DBUILD_TESTS=OFF + OPTIONS -DBUILD_JSONNET=OFF -DBUILD_JSONNETFMT=OFF -DBUILD_TESTS=OFF ) vcpkg_install_cmake() |