From 5aead1e6105cf271fc2dc2a4a9570df1e4f1432a Mon Sep 17 00:00:00 2001
From: Jonas Vautherin <dev@jonas.vautherin.ch>
Date: Mon, 12 Feb 2024 15:56:12 +0100
Subject: [PATCH] Move to zlib-ng which has better CMake support

---
 third_party/CMakeLists.txt         |  2 +-
 third_party/zlib-ng/CMakeLists.txt | 36 ++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 third_party/zlib-ng/CMakeLists.txt

diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index 1503e7b83b..a38a2b391f 100644
--- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt
@@ -14,7 +14,7 @@ if (SUPERBUILD)
 
     if(NOT BUILD_WITHOUT_CURL)
         if(NOT IOS)
-            build_target(zlib)
+            build_target(zlib-ng)
         endif()
         build_target(curl)
     endif()
diff --git a/third_party/zlib-ng/CMakeLists.txt b/third_party/zlib-ng/CMakeLists.txt
new file mode 100644
index 0000000000..0fb0edfb02
--- /dev/null
+++ b/third_party/zlib-ng/CMakeLists.txt
@@ -0,0 +1,36 @@
+cmake_minimum_required(VERSION 3.1)
+
+project(external-zlib-ng)
+include(ExternalProject)
+
+list(APPEND CMAKE_ARGS
+    "-DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}"
+    "-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}"
+    "-DCMAKE_TOOLCHAIN_FILE:PATH=${CMAKE_TOOLCHAIN_FILE}"
+    "-DCMAKE_POSITION_INDEPENDENT_CODE=ON"
+    "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"
+    "-DBUILD_SHARED_LIBS=OFF"
+    "-DZLIB_COMPAT=ON"
+    "-DZLIB_ENABLE_TESTS=OFF"
+    "-DWITH_GTEST=OFF"
+    )
+
+if(IOS)
+    list(APPEND CMAKE_ARGS
+        "-DPLATFORM=${PLATFORM}"
+        "-DDEPLOYMENT_TARGET=${DEPLOYMENT_TARGET}"
+        "-DENABLE_STRICT_TRY_COMPILE=${ENABLE_STRICT_TRY_COMPILE}"
+        )
+endif()
+
+message(STATUS "Preparing external project \"zlib-ng\" with args:")
+foreach(CMAKE_ARG ${CMAKE_ARGS})
+    message(STATUS "-- ${CMAKE_ARG}")
+endforeach()
+
+ExternalProject_add(
+    zlib-ng
+    URL https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.1.6.tar.gz
+    PREFIX zlib-ng
+    CMAKE_ARGS "${CMAKE_ARGS}"
+    )