URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=af72ba7e84ca85bc5ea57c3c88b70398a83dbb0f
Submitter: "Peter Wu <peter@xxxxxxxxxxxxx>"
Changed: branch: master
Repository: wireshark
Commits:
af72ba7 by Peter Wu (peter@xxxxxxxxxxxxx):
FindPCAP: fix broken search logic
Do not fully trust the output from neither pkg-config nor pcap-config.
These tools might provide bogus output. Instead, use their outputs as
hints to let CMake find the correct include and (static) library paths.
Correct some variable names (PCAP_STATIC_LIBRARIES and PCAP_INCLUDE_DIRS
*must not* be the result of find_path/find_library) and ensure that an
empty include directory from pkg-config does not result in an empty
PCAP_INCLUDE_DIRS variable that would break the build.
Change-Id: If3de90fb497d8163d92e4fe190a227159f0b6acb
Fixes: v3.1.0rc0-645-gc602119bcf ("Use pkg-config if possible; if not, use pcap-config if present.")
Reviewed-on: https://code.wireshark.org/review/32999
Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
Actions performed:
from 74a083d [Automatic update for 2019-04-28]
add af72ba7 FindPCAP: fix broken search logic
Summary of changes:
cmake/modules/FindPCAP.cmake | 316 +++++++++++++++++--------------------------
1 file changed, 123 insertions(+), 193 deletions(-)