aboutsummaryrefslogtreecommitdiff
path: root/primedev/cmake/Findminizip.cmake
diff options
context:
space:
mode:
authorGeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>2024-01-24 22:58:46 +0100
committerGitHub <noreply@github.com>2024-01-24 22:58:46 +0100
commit2f46eb59b02b837367c0e02aba7097673d2f3bbd (patch)
tree96189253a157da15380d411c9d2464a06dd95568 /primedev/cmake/Findminizip.cmake
parent3b7d9aaa95449a66be36a057aa49e35bcb8acec6 (diff)
parentabe5d029e52b695cb05fb2034deebf31560dbc6e (diff)
downloadNorthstarLauncher-2f46eb59b02b837367c0e02aba7097673d2f3bbd.tar.gz
NorthstarLauncher-2f46eb59b02b837367c0e02aba7097673d2f3bbd.zip
Merge branch 'main' into feat/update-for-new-verified-json
Diffstat (limited to 'primedev/cmake/Findminizip.cmake')
-rw-r--r--primedev/cmake/Findminizip.cmake5
1 files changed, 5 insertions, 0 deletions
diff --git a/primedev/cmake/Findminizip.cmake b/primedev/cmake/Findminizip.cmake
index a6d0f914..2884f909 100644
--- a/primedev/cmake/Findminizip.cmake
+++ b/primedev/cmake/Findminizip.cmake
@@ -1,4 +1,9 @@
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