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

Jump to bottom

zlib: use nicer patch to install cmake config #874

Merged
merged 1 commit into from
Nov 4, 2019
Merged

zlib: use nicer patch to install cmake config #874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions third_party/zlib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ ExternalProject_add(
zlib
GIT_REPOSITORY https://github.com/madler/zlib
GIT_TAG v1.2.11
PREFIX zlib
PATCH_COMMAND git apply ${PROJECT_SOURCE_DIR}/build_shared_libs.patch
# Patch taken from: https://github.com/madler/zlib/pull/337/files
# Thanks to @Mizux
PATCH_COMMAND git apply ${PROJECT_SOURCE_DIR}/pr-337-cmake-update.patch
CMAKE_ARGS "${CMAKE_ARGS}"
)

89 changes: 0 additions & 89 deletions third_party/zlib/build_shared_libs.patch
View file
Open in desktop

This file was deleted.

Loading