[minizip-ng] Update to 4.0.4 (#36408)

This commit is contained in:
Kevin Leonardic 2024-01-30 03:19:02 +01:00 committed by GitHub
parent 2aa677e1a7
commit 2d19a1a5b1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 24 additions and 10 deletions

View File

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f6c6bc..1856944 100644
index 0902052..f301b43 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -334,12 +334,8 @@ endif()
@@ -340,20 +340,8 @@ endif()
if(MZ_ZSTD)
# Check if zstd is present
if(NOT MZ_FORCE_FETCH_LIBS)
@ -10,9 +10,18 @@ index 6f6c6bc..1856944 100644
- if(PKGCONFIG_FOUND)
- pkg_check_modules(ZSTD libzstd)
- endif()
if(NOT ZSTD_FOUND)
- if(NOT ZSTD_FOUND)
- find_package(ZSTD QUIET)
+ find_package(ZSTD NAMES zstd REQUIRED)
if(ZSTD_FOUND)
if(TARGET zstd::libzstd_static)
list(APPEND ZSTD_LIBRARIES zstd::libzstd_static)
- if(ZSTD_FOUND)
- if(TARGET zstd::libzstd_static)
- list(APPEND ZSTD_LIBRARIES zstd::libzstd_static)
- else()
- list(APPEND ZSTD_LIBRARIES zstd::libzstd_shared)
- endif()
- endif()
- endif()
+ find_package(ZSTD NAMES zstd REQUIRED)
+ list(APPEND ZSTD_LIBRARIES $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>)
endif()
if(ZSTD_FOUND AND NOT MZ_FORCE_FETCH_LIBS)

View File

@ -6,7 +6,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO zlib-ng/minizip-ng
REF "${VERSION}"
SHA512 4e626a312c35e5f003e4f365261ef3e1bf33488f8698ec31b1b33d32f6a34ed0b54f0e3ffdae658e5b441532dde3cee45c3822532f52e68ea588e809e8f4081c
SHA512 2662ddf90666babe73474f6fc48f5a64f276d555b7a0f04f790b9edef570cb958356e900632c3795fb2053f4813c449240ff101d32b063eca4ad869bef0546fd
HEAD_REF master
PATCHES
fix_find_zstd.patch

View File

@ -1,6 +1,6 @@
{
"name": "minizip-ng",
"version": "4.0.2",
"version": "4.0.4",
"description": "minizip-ng is a zip manipulation library written in C that is supported on Windows, macOS, and Linux.",
"homepage": "https://github.com/zlib-ng/minizip-ng",
"license": "Zlib",

View File

@ -5665,7 +5665,7 @@
"port-version": 1
},
"minizip-ng": {
"baseline": "4.0.2",
"baseline": "4.0.4",
"port-version": 0
},
"mio": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "cfab4e259bccd7d7f1a0470b32c7b7bf912609f4",
"version": "4.0.4",
"port-version": 0
},
{
"git-tree": "33b696b13c4de3a5319c042daab76baa51945f8f",
"version": "4.0.2",