diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2021-06-17 05:39:53 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-16 14:39:53 -0700 |
| commit | 183a12585a95b36bfdda342eb6d302d3ab3ad466 (patch) | |
| tree | 733de3496a3b40f49e2679df15078a7c57b82cbe | |
| parent | 4dc864e2401f2ed3230c9042a4dd56f6d1c30360 (diff) | |
| download | vcpkg-183a12585a95b36bfdda342eb6d302d3ab3ad466.tar.gz vcpkg-183a12585a95b36bfdda342eb6d302d3ab3ad466.zip | |
[minizip] Fix usage, fix minizipConfig.cmake (#18472)
* [minizip] Fix usage, fix minizipConfig.cmake
* update version record
| -rw-r--r-- | ports/minizip/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ports/minizip/CONTROL | 11 | ||||
| -rw-r--r-- | ports/minizip/minizipConfig.cmake.in | 8 | ||||
| -rw-r--r-- | ports/minizip/vcpkg.json | 19 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/m-/minizip.json | 5 |
6 files changed, 34 insertions, 13 deletions
diff --git a/ports/minizip/CMakeLists.txt b/ports/minizip/CMakeLists.txt index a5e8e053c..c17ab8974 100644 --- a/ports/minizip/CMakeLists.txt +++ b/ports/minizip/CMakeLists.txt @@ -53,7 +53,7 @@ target_link_libraries(minizip PRIVATE ZLIB::ZLIB) target_compile_definitions(minizip PRIVATE -D_ZLIB_H) if(ENABLE_BZIP2) - target_link_libraries(minizip PRIVATE ${BZIP2_LIBRARIES}) + target_link_libraries(minizip PUBLIC ${BZIP2_LIBRARIES}) target_compile_definitions(minizip PRIVATE -DHAVE_BZIP2=1) endif() if(ANDROID) diff --git a/ports/minizip/CONTROL b/ports/minizip/CONTROL deleted file mode 100644 index d761f1a88..000000000 --- a/ports/minizip/CONTROL +++ /dev/null @@ -1,11 +0,0 @@ -Source: minizip
-Version: 1.2.11
-Port-Version: 8
-Build-Depends: zlib
-Homepage: https://github.com/madler/zlib
-Description: Zip compression library
-Supports: !uwp
-
-Feature: bzip2
-Build-Depends: bzip2
-Description: Support compression using bzip2 library
diff --git a/ports/minizip/minizipConfig.cmake.in b/ports/minizip/minizipConfig.cmake.in index 9f27956c0..17fc694e7 100644 --- a/ports/minizip/minizipConfig.cmake.in +++ b/ports/minizip/minizipConfig.cmake.in @@ -1,4 +1,12 @@ #@PACKAGE_INIT@
+include(CMakeFindDependencyMacro)
+
+find_dependency(ZLIB)
+
+if (@ENABLE_BZIP2@)
+ find_dependency(BZip2)
+endif()
+
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
check_required_components("@PROJECT_NAME@")
\ No newline at end of file diff --git a/ports/minizip/vcpkg.json b/ports/minizip/vcpkg.json new file mode 100644 index 000000000..9e8c24b81 --- /dev/null +++ b/ports/minizip/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "minizip", + "version-semver": "1.2.11", + "port-version": 9, + "description": "Zip compression library", + "homepage": "https://github.com/madler/zlib", + "supports": "!uwp", + "dependencies": [ + "zlib" + ], + "features": { + "bzip2": { + "description": "Support compression using bzip2 library", + "dependencies": [ + "bzip2" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index c46e2c457..1d19fbd84 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4034,7 +4034,7 @@ }, "minizip": { "baseline": "1.2.11", - "port-version": 8 + "port-version": 9 }, "minizip-ng": { "baseline": "3.0.2", diff --git a/versions/m-/minizip.json b/versions/m-/minizip.json index 4c3ca9470..acbf12137 100644 --- a/versions/m-/minizip.json +++ b/versions/m-/minizip.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "fc89de0b8a1105f6bee9625bba4031b138862a39", + "version-semver": "1.2.11", + "port-version": 9 + }, + { "git-tree": "4bf6a0d8bac1c47fa80e0c51188aa3d2ecb86414", "version-string": "1.2.11", "port-version": 8 |