diff options
| author | GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com> | 2024-01-24 22:58:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-24 22:58:46 +0100 |
| commit | 2f46eb59b02b837367c0e02aba7097673d2f3bbd (patch) | |
| tree | 96189253a157da15380d411c9d2464a06dd95568 | |
| parent | 3b7d9aaa95449a66be36a057aa49e35bcb8acec6 (diff) | |
| parent | abe5d029e52b695cb05fb2034deebf31560dbc6e (diff) | |
| download | NorthstarLauncher-2f46eb59b02b837367c0e02aba7097673d2f3bbd.tar.gz NorthstarLauncher-2f46eb59b02b837367c0e02aba7097673d2f3bbd.zip | |
Merge branch 'main' into feat/update-for-new-verified-json
| -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 |