kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Require minizip<2.0.0 aka. zlib minizip, not minizip-ng

Browse source 
Original zlib minizip and newer minizip-ng are ABI incompatible.
tdesktop bundles old zlib minizip, but systems such as OpenBSD ship
minizip-ng as their "minizip" package.

http://zlib.net/ shows 1.2.11 as the latest version as of today.

Require the same major version to prevent detecting minizip-ng as
zlib minizip breaking the build.
This commit is contained in:
Klemens Nanni 2021-12-28 08:52:08 +01:00 • committed by John Preston
parent 262774e504
commit 509ab07763
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
external/minizip/CMakeLists.txt vendored
View file

@ -9,7 +9,7 @@ add_library(desktop-app::external_minizip ALIAS external_minizip)
if (DESKTOP_APP_USE_PACKAGED)
find_package(PkgConfig REQUIRED)
pkg_check_modules(MINIZIP IMPORTED_TARGET minizip)
pkg_check_modules(MINIZIP IMPORTED_TARGET minizip<2.0.0)
if (MINIZIP_FOUND)
target_link_libraries(external_minizip INTERFACE PkgConfig::MINIZIP)