diff options
| author | chausner <15180557+chausner@users.noreply.github.com> | 2021-10-12 05:25:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-11 20:25:26 -0700 |
| commit | 514f2debfc232806d838fe2587375695b2d48bf3 (patch) | |
| tree | f76b2d1a9937c0ec4ef26e6b8cf3f56d3f1f1c0e /ports/jsonnet/001-enable-msvc.patch | |
| parent | cec4e710f7a39db7e19ecbd6a40d80b2a7d28f25 (diff) | |
| download | vcpkg-514f2debfc232806d838fe2587375695b2d48bf3.tar.gz vcpkg-514f2debfc232806d838fe2587375695b2d48bf3.zip | |
[jsonnet] Update to 0.17.0 (#20627)
* Update jsonnet to 0.17.0
* Update CI baseline
* add supports
* update version
* revert portfile.cmake
* update version
Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Jonliu1993 <13720414433@163.com>
Diffstat (limited to 'ports/jsonnet/001-enable-msvc.patch')
| -rw-r--r-- | ports/jsonnet/001-enable-msvc.patch | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ports/jsonnet/001-enable-msvc.patch b/ports/jsonnet/001-enable-msvc.patch index 499c6713d..d5ec55149 100644 --- a/ports/jsonnet/001-enable-msvc.patch +++ b/ports/jsonnet/001-enable-msvc.patch @@ -40,7 +40,6 @@ index c032f02..d80d2a0 100644 + install(TARGETS jsonnetfmt DESTINATION tools/jsonnet)
endif()
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index d277872..bbf67f7 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -28,7 +28,7 @@ set(LIBJSONNET_SOURCE
@@ -59,8 +58,8 @@ index d277872..bbf67f7 100644 - ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+ ARCHIVE DESTINATION "${CMAKE_INSTALL_BINDIR}"
PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-
- if (BUILD_STATIC_LIBS)
+ target_include_directories(libjsonnet INTERFACE
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>)
diff --git a/stdlib/CMakeLists.txt b/stdlib/CMakeLists.txt
index a481d9f..2f58d2f 100644
--- a/stdlib/CMakeLists.txt
|