diff options
| author | Jack <66967891+ASpoonPlaysGames@users.noreply.github.com> | 2024-01-24 21:58:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-24 22:58:18 +0100 |
| commit | abe5d029e52b695cb05fb2034deebf31560dbc6e (patch) | |
| tree | 1c4e0aa96ba417a3aa7f03afd0f086170a060b1b | |
| parent | 7f84bdf8fd5c93286f000bc5f9314eab81128cee (diff) | |
| download | NorthstarLauncher-1.22.X.tar.gz NorthstarLauncher-1.22.X.zip | |
Pull zlib from custom fork (#650)v1.22.2-rc2v1.22.21.22.X
Fixes builds failing due to https://github.com/madler/zlib/commit/2e3d86c4e12c4c23db4229eea7d0c1cd4571273e
| -rw-r--r-- | primedev/cmake/Findminizip.cmake | 5 |
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 |