From e079862fad331cba874717ec1d0af9e35ba438b5 Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Mon, 12 Sep 2016 10:37:03 +0200 Subject: [PATCH] cmake: fix breakage with libnl2 I accidentally assumed that libnl2 works fine with just libnl.so, but apparently the other libraries are also necessary. Change-Id: I1636710ea3f41ed10a5ccb37106cae9e688abec9 Reviewed-on: https://code.wireshark.org/review/17654 Reviewed-by: Michal Labedzki Petri-Dish: Michal Labedzki Tested-by: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu --- cmake/modules/FindNL.cmake | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cmake/modules/FindNL.cmake b/cmake/modules/FindNL.cmake index 5b12a15319..d4f003e886 100644 --- a/cmake/modules/FindNL.cmake +++ b/cmake/modules/FindNL.cmake @@ -132,11 +132,7 @@ INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(NL DEFAULT_MSG NL_LIBRARY NL_INCLUDE_DIR) IF(NL_FOUND) - if(HAVE_LIBNL3) - set(NL_LIBRARIES ${NLGENL_LIBRARY} ${NLROUTE_LIBRARY} ${NL_LIBRARY}) - else() - set(NL_LIBRARIES ${NL_LIBRARY}) - endif() + set(NL_LIBRARIES ${NLGENL_LIBRARY} ${NLROUTE_LIBRARY} ${NL_LIBRARY}) set(NL_INCLUDE_DIRS ${NL_INCLUDE_DIR}) set(HAVE_LIBNL 1) else()