aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchausner <15180557+chausner@users.noreply.github.com>2021-10-12 05:22:16 +0200
committerGitHub <noreply@github.com>2021-10-11 20:22:16 -0700
commit63118c20cbef6ddea61656ab0d296dfc0690a026 (patch)
tree28ccb9aef0ed09ba57b816a11a0f530a74cfdd1d
parent69e12e74610c0508d3c656622ced81d71d9995f8 (diff)
downloadvcpkg-63118c20cbef6ddea61656ab0d296dfc0690a026.tar.gz
vcpkg-63118c20cbef6ddea61656ab0d296dfc0690a026.zip
[libhv] Update to 1.2.2 (#20637)
* Update libhv to 1.2.2 * Update CI baseline Co-authored-by: chausner <chausner@users.noreply.github.com>
-rw-r--r--ports/libhv/portfile.cmake13
-rw-r--r--ports/libhv/vcpkg.json10
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/l-/libhv.json5
4 files changed, 20 insertions, 10 deletions
diff --git a/ports/libhv/portfile.cmake b/ports/libhv/portfile.cmake
index 2661a4566..cb13974b9 100644
--- a/ports/libhv/portfile.cmake
+++ b/ports/libhv/portfile.cmake
@@ -3,17 +3,16 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ithewei/libhv
- REF v1.2.1
- SHA512 c917b50a2def643b808782631cae33289b62193b9ccb95f4f7736f4d1256de72358931263d5cc06f4581950d91656e700941cb0b929d2f73f650f5297d358b38
+ REF v1.2.2
+ SHA512 D0CB0BE3901E282E642FE454ADF0CAAF1840DD0CD340B6558E40270CF32608FF0773AAAD0BE1B9EA97BE5BD41B4CEB00FA92CDDA1590B71900A3D8EE4AB2358F
HEAD_REF master
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
+vcpkg_cmake_configure(
+ SOURCE_PATH "${SOURCE_PATH}"
DISABLE_PARALLEL_CONFIGURE
OPTIONS
-DBUILD_EXAMPLES=OFF
@@ -22,11 +21,11 @@ vcpkg_configure_cmake(
-DBUILD_SHARED=${BUILD_SHARED}
)
-vcpkg_install_cmake()
+vcpkg_cmake_install()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/hv.dll")
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin")
diff --git a/ports/libhv/vcpkg.json b/ports/libhv/vcpkg.json
index 80978ea7d..6df137e12 100644
--- a/ports/libhv/vcpkg.json
+++ b/ports/libhv/vcpkg.json
@@ -1,7 +1,13 @@
{
"name": "libhv",
- "version": "1.2.1",
+ "version": "1.2.2",
"description": "Libhv is a C/C++ network library similar to libevent/libuv.",
"homepage": "https://github.com/ithewei/libhv",
- "supports": "!(arm | uwp)"
+ "supports": "!(arm | uwp)",
+ "dependencies": [
+ {
+ "name": "vcpkg-cmake",
+ "host": true
+ }
+ ]
}
diff --git a/versions/baseline.json b/versions/baseline.json
index 7b75de895..32c1acbe7 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3449,7 +3449,7 @@
"port-version": 0
},
"libhv": {
- "baseline": "1.2.1",
+ "baseline": "1.2.2",
"port-version": 0
},
"libhydrogen": {
diff --git a/versions/l-/libhv.json b/versions/l-/libhv.json
index a291410e7..ad084ec2c 100644
--- a/versions/l-/libhv.json
+++ b/versions/l-/libhv.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "49dd8455e873417e8c6e336cdac63bc40cae8342",
+ "version": "1.2.2",
+ "port-version": 0
+ },
+ {
"git-tree": "70132ddc099b347cfea66a4ed2de435abafb9c6f",
"version": "1.2.1",
"port-version": 0