[zlib-ng] update fix-cmake.patch

luncliff · Mar 12, 2024 · 2baf271 · 2baf271
1 parent d6cc086
commit 2baf271
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/ports/zlib-ng/fix-cmake.patch b/ports/zlib-ng/fix-cmake.patch
@@ -1,15 +1,19 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8bcfaf7..336e9bb 100644
+index 8bcfaf7..3d11f12 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1209,7 +1209,9 @@ if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL)
+@@ -1208,9 +1208,11 @@ if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL)
+         endif()
      endif()
      install(TARGETS ${ZLIB_INSTALL_LIBRARIES}
-         EXPORT ${EXPORT_NAME}
+-        EXPORT ${EXPORT_NAME}
 -        DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+-    install(EXPORT ${EXPORT_NAME}
++        EXPORT ${EXPORT_NAME}Config
 +        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
 +        ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
 +        LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-     install(EXPORT ${EXPORT_NAME}
++    install(EXPORT ${EXPORT_NAME}Config
          DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${EXPORT_NAME}"
          NAMESPACE ${EXPORT_NAME}::)
+ endif()
diff --git a/ports/zlib-ng/portfile.cmake b/ports/zlib-ng/portfile.cmake
@@ -4,8 +4,8 @@ vcpkg_from_github(
     REF 2.1.6
     SHA512 59ef586c09b9a63788475abfd6dd59ed602316b38f543f801bea802ff8bec8b55a89bee90375b8bbffa3bdebc7d92a00903f4b7c94cdc1a53a36e2e1fd71d13a
     HEAD_REF develop
-    # PATCHES
-    #     fix-cmake.patch
+    PATCHES
+        fix-cmake.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

diff --git a/versions/z-/zlib-ng.json b/versions/z-/zlib-ng.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "a5ac30de802293f9c6b035a82ad3cfd7a93bd323",
+      "git-tree": "8eeae331a085e2e8447359500c84bcb701e29eb6",
       "version": "2.1.6",
       "port-version": 0
     },