mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 19:09:00 +08:00
[jsonnet] update to 0.20.0 (#34020)
* [jsonnet] update to 0.20.0 * fix deps
This commit is contained in:
parent
5603a73a1a
commit
c51a36dddd
20
ports/jsonnet/0006-use-cxx17.patch
Normal file
20
ports/jsonnet/0006-use-cxx17.patch
Normal file
@ -0,0 +1,20 @@
|
||||
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
|
||||
index e8a0efa..5dfd2e4 100644
|
||||
--- a/core/CMakeLists.txt
|
||||
+++ b/core/CMakeLists.txt
|
||||
@@ -34,6 +34,7 @@ if (BUILD_SHARED_BINARIES)
|
||||
add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE})
|
||||
add_dependencies(libjsonnet stdlib)
|
||||
target_link_libraries(libjsonnet nlohmann_json::nlohmann_json ryml)
|
||||
+target_compile_features(libjsonnet PRIVATE cxx_std_17)
|
||||
|
||||
file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/../include/libjsonnet.h JSONNET_VERSION_DEF
|
||||
REGEX "[#]define[ \t]+LIB_JSONNET_VERSION[ \t]+")
|
||||
@@ -60,6 +61,7 @@ if (BUILD_STATIC_LIBS)
|
||||
add_library(libjsonnet_static STATIC ${LIBJSONNET_SOURCE})
|
||||
add_dependencies(libjsonnet_static stdlib)
|
||||
target_link_libraries(libjsonnet_static nlohmann_json::nlohmann_json ryml)
|
||||
+ target_compile_features(libjsonnet_static PRIVATE cxx_std_17)
|
||||
set_target_properties(libjsonnet_static PROPERTIES OUTPUT_NAME jsonnet)
|
||||
install(TARGETS libjsonnet_static DESTINATION "${CMAKE_INSTALL_LIBDIR}")
|
||||
target_include_directories(libjsonnet_static INTERFACE
|
@ -5,8 +5,8 @@ endif()
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO google/jsonnet
|
||||
REF v0.18.0
|
||||
SHA512 08a64a4b132df1519292378cef93deb3c60d21636b2a71bce6c13e29cfd93cab465cad77e11f000fb984c5c75a4ca1c92504654fd2e5201343df767ea0e610d1
|
||||
REF "v${VERSION}"
|
||||
SHA512 d46d2521d4389d05f91a16ecd9f181be1853f674a9264e9fac23e413f1084dee947e80682af59603e15e443061a0beb50a30c14c858853e10ed1ae7187d09730
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
001-enable-msvc.patch
|
||||
@ -14,6 +14,7 @@ vcpkg_from_github(
|
||||
0003-use-upstream-nlohmann-json.patch
|
||||
0004-incorporate-md5.patch
|
||||
0005-use-upstream-rapidyaml.patch
|
||||
0006-use-cxx17.patch
|
||||
)
|
||||
|
||||
# see https://github.com/google/jsonnet/blob/v0.18.0/Makefile#L220
|
||||
|
@ -1,7 +1,6 @@
|
||||
{
|
||||
"name": "jsonnet",
|
||||
"version": "0.18.0",
|
||||
"port-version": 1,
|
||||
"version": "0.20.0",
|
||||
"description": "Jsonnet - The data templating language",
|
||||
"homepage": "https://github.com/google/jsonnet",
|
||||
"license": "Apache-2.0",
|
||||
|
@ -3589,8 +3589,8 @@
|
||||
"port-version": 0
|
||||
},
|
||||
"jsonnet": {
|
||||
"baseline": "0.18.0",
|
||||
"port-version": 1
|
||||
"baseline": "0.20.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"jwt-cpp": {
|
||||
"baseline": "0.6.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "d58bf2d0d8b29fbcd87bfa9bcc4725aaec9283ad",
|
||||
"version": "0.20.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "d44312d784436a66ae779d4b644aa29e3ebe23e8",
|
||||
"version": "0.18.0",
|
||||
|
Loading…
Reference in New Issue
Block a user