D5101: Fix libzip cmake module
Elvis Angelaccio
noreply at phabricator.kde.org
Sat Mar 18 15:31:36 UTC 2017
elvisangelaccio created this revision.
Restricted Application added subscribers: Ark, kde-utils-devel.
Restricted Application added a project: Ark.
REVISION SUMMARY
libzip installs `zipconf.h` in `$prefix/$libdir/libzip/include/`. Some
systems (e.g. archlinux) symlinks this file under `$prefix/$libdir/include`
for compatibility reasons, but cmake fails on systems that do not (e.g.
flatpak). Since libzip supports pkg-config, we can just query pkg-config
which gives us the proper path we are looking for. While at it, use
pkg-config to get the library version, replacing our custom parsing code
which does not work.
This breaks the Applications dependency freeze, but it's an important
fix so it should go in.
TEST PLAN
1. ark master flatpak now can build the new libzip plugin.
2. ark now builds the libzip plugin only if libzip >= 1.2 is found.
REPOSITORY
R36 Ark
BRANCH
master
REVISION DETAIL
https://phabricator.kde.org/D5101
AFFECTED FILES
cmake/modules/FindLibZip.cmake
To: elvisangelaccio, rthomsen
Cc: kde-utils-devel, #ark, tctara
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-utils-devel/attachments/20170318/ef5455b1/attachment.html>
More information about the Kde-utils-devel
mailing list