Merge pull request #648 from microsoft/master

[minizip] Fix usage, fix minizipConfig.cmake (microsoft#18472)
Jimmy-Hu · Jun 17, 2021 · 57f2243 · 57f2243
2 parents bcb872b + 183a125
commit 57f2243
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 13 deletions.
diff --git 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
diff --git 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@")
diff --git a/ports/minizip/vcpkg.json 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
@@ -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
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fc89de0b8a1105f6bee9625bba4031b138862a39",
+      "version-semver": "1.2.11",
+      "port-version": 9
+    },
     {
       "git-tree": "4bf6a0d8bac1c47fa80e0c51188aa3d2ecb86414",
       "version-string": "1.2.11",