Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert pulling zlib from custom fork #660

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Revert pulling zlib from custom fork #660

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40569ab
Revert "Pull zlib from custom fork (#650)"
GeckoEidechse Feb 4, 2024
60d872d
fix: Use develop version of zlib
GeckoEidechse Feb 4, 2024
d1d4f2a
Merge branch 'main' into chore/revert-zlib-cmake-fix
GeckoEidechse May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions primedev/cmake/Findminizip.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
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")
# 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)

Expand Down
Loading