Wireshark-commits: [Wireshark-commits] master-1.12 c3aabc3: cmake: use pkg-config for resolving dep
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=c3aabc3bdfe2e3b7ef208c3c79836e2f3b37b0eb
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark
Commits:
c3aabc3 by Peter Wu (peter@xxxxxxxxxxxxx):
cmake: use pkg-config for resolving dependencies
Changes:
* Fix glib2 search path.
* Add pkg-config support to CAP, GEOIP, GNUTLS, LUA, PortAudio (API
19), zlib, kerberos.
* Add pkg-config support to libnl3, libnl2 and libnl1 (but tested only
with libnl3).
This makes it easier to do 32-bit builds on 64-bit hosts by just setting
`PKG_CONFIG_LIBDIR`. Due to how HINTS work, it is still fragile though:
missing 32-bit libraries will cause a fallback to 64-bit libraries.
A future patch could check for `<PREFIX>_FOUND` and remove the manual
`find_path` and `find_library` hackery since the paths are already
known.
Change-Id: Ieb4fb74695c96afb1a4c70168e84abb1fa4612c6
Reviewed-on: https://code.wireshark.org/review/4292
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
(cherry picked from commit 9506909223f6155085a7a4d5adc039ebf60030f2)
Reviewed-on: https://code.wireshark.org/review/4399
Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
Actions performed:
from 71e46f4 cmake: update FindGTK2 to v3.0.1-1824-g0b12815
adds c3aabc3 cmake: use pkg-config for resolving dependencies
Summary of changes:
cmake/modules/FindCAP.cmake | 13 ++++++++++---
cmake/modules/FindGEOIP.cmake | 17 ++++++++++++++---
cmake/modules/FindGLIB2.cmake | 6 +++---
cmake/modules/FindGNUTLS.cmake | 30 +++++++++++++++++++++---------
cmake/modules/FindKERBEROS.cmake | 17 ++++++++++++++---
cmake/modules/FindLUA.cmake | 9 +++++++--
cmake/modules/FindNL.cmake | 22 ++++++++++++++++++++++
cmake/modules/FindPORTAUDIO.cmake | 12 ++++++++++--
cmake/modules/FindZLIB.cmake | 5 +++++
9 files changed, 106 insertions(+), 25 deletions(-)
