Wireshark-commits: [Wireshark-commits] master 7471b46: cmake: fix libnl caching issue, make it more
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=7471b467682f84501d15cebd580d0b28abd77cf5
Submitter: Peter Wu (peter@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
7471b46 by Peter Wu (peter@xxxxxxxxxxxxx):
cmake: fix libnl caching issue, make it more robust
Dario reported that the cmake build fails after installing libnl3-devel
(libnl-devel was already present). This results from a name collision
for NL_LIBRARY and NL_INCLUDE_DIR variables.
Initially these variables contained the values for libnl-1. When libnl3
is installed, these variables were not updated (because it was cached),
but HAVE_LIBNL3 would still be set, resulting in a header and feature
mismatch. Use separate variables for libnl1 and libnl3 to fix this.
Other fixes: also set HAVE_LIBNL for libnl1; fallback to libnl1 if
libnl3 is unusable (e.g. because libnl-route-3.0 is missing).
Change-Id: Icf0a03843ea870347ddf365f69bacf4883d07f6d
Reviewed-on: https://code.wireshark.org/review/17449
Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Dario Lombardo <lomato@xxxxxxxxx>
Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
Actions performed:
from a547dfb SMB2: dissect getinfo request fixed parameters
adds 7471b46 cmake: fix libnl caching issue, make it more robust
Summary of changes:
cmake/modules/FindNL.cmake | 93 ++++++++++++++++++++++++++------------------
1 file changed, 55 insertions(+), 38 deletions(-)
