aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeckoEidechse <gecko.eidechse+git@pm.me>2024-02-04 02:18:12 +0100
committerGeckoEidechse <gecko.eidechse+git@pm.me>2024-02-04 02:18:12 +0100
commit40569abaed25ae98169ef046a466d094bcac37ac (patch)
tree70f027e058f0feb9d372980d024bee165d2facfe
parentedf013952ca2d110f190dc8cd16e5529846656e4 (diff)
downloadNorthstarLauncher-40569abaed25ae98169ef046a466d094bcac37ac.tar.gz
NorthstarLauncher-40569abaed25ae98169ef046a466d094bcac37ac.zip
Revert "Pull zlib from custom fork (#650)"
This reverts commit abe5d029e52b695cb05fb2034deebf31560dbc6e.
-rw-r--r--primedev/cmake/Findminizip.cmake5
1 files changed, 0 insertions, 5 deletions
diff --git a/primedev/cmake/Findminizip.cmake b/primedev/cmake/Findminizip.cmake
index 2884f909..a6d0f914 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