From 40569abaed25ae98169ef046a466d094bcac37ac Mon Sep 17 00:00:00 2001 From: GeckoEidechse Date: Sun, 4 Feb 2024 02:18:12 +0100 Subject: [PATCH 1/2] Revert "Pull zlib from custom fork (#650)" This reverts commit abe5d029e52b695cb05fb2034deebf31560dbc6e. --- primedev/cmake/Findminizip.cmake | 5 ----- 1 file changed, 5 deletions(-) diff --git a/primedev/cmake/Findminizip.cmake b/primedev/cmake/Findminizip.cmake index 2884f9092..a6d0f9142 100644 --- a/primedev/cmake/Findminizip.cmake +++ b/primedev/cmake/Findminizip.cmake @@ -1,9 +1,4 @@ if(NOT minizip_FOUND) - - # zlib 1.3.1 had a cmake change that broke stuff, so this branch on our fork reverts that one commit :) - set(ZLIB_TAG "fix-things") - set(ZLIB_REPOSITORY "https://github.com/R2Northstar/zlib") - check_init_submodule(${PROJECT_SOURCE_DIR}/primedev/thirdparty/minizip) set(MZ_ZLIB From 60d872d3756854d29b65b63fb146aa4f638dd29e Mon Sep 17 00:00:00 2001 From: GeckoEidechse Date: Sun, 4 Feb 2024 17:31:24 +0100 Subject: [PATCH 2/2] fix: Use develop version of zlib --- primedev/cmake/Findminizip.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/primedev/cmake/Findminizip.cmake b/primedev/cmake/Findminizip.cmake index a6d0f9142..db80464c7 100644 --- a/primedev/cmake/Findminizip.cmake +++ b/primedev/cmake/Findminizip.cmake @@ -1,4 +1,8 @@ if(NOT minizip_FOUND) + + # zlib 1.3.1 had a cmake change that broke stuff, use develop for now where a fix has already been applied + set(ZLIB_TAG "develop") + check_init_submodule(${PROJECT_SOURCE_DIR}/primedev/thirdparty/minizip) set(MZ_ZLIB