diff options
| author | Graham Bloice <graham.bloice@trihedral.com> | 2014-08-21 23:48:48 +0100 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2014-08-21 23:56:56 +0000 |
| commit | 5b5ef967d2780b130cf010c7e9090357bc34af84 (patch) | |
| tree | 20676d7ba0240849f82008a37cb0af6b391d44b3 /cmake | |
| parent | 87b2364a841ea1c0ddbe335c27acc14b5c1f6dd0 (diff) | |
| download | wireshark-5b5ef967d2780b130cf010c7e9090357bc34af84.tar.gz | |
Fix CMake checks of PCap functions, along with AirPCap
Change-Id: If55498167d5e357258841f2194962749c0dfc81e
Reviewed-on: https://code.wireshark.org/review/3787
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindAIRPCAP.cmake | 2 | ||||
| -rw-r--r-- | cmake/modules/FindPCAP.cmake | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/cmake/modules/FindAIRPCAP.cmake b/cmake/modules/FindAIRPCAP.cmake index afc93f97c0..d5501e4a9d 100644 --- a/cmake/modules/FindAIRPCAP.cmake +++ b/cmake/modules/FindAIRPCAP.cmake @@ -34,9 +34,11 @@ find_package_handle_standard_args( AIRPCAP DEFAULT_MSG AIRPCAP_INCLUDE_DIR AIRPC if( AIRPCAP_FOUND ) set( AIRPCAP_INCLUDE_DIRS ${AIRPCAP_INCLUDE_DIR} ) set( AIRPCAP_LIBRARIES ${AIRPCAP_LIBRARY} ) + set( HAVE_AIRPCAP 1) else() set( AIRPCAP_INCLUDE_DIRS ) set( AIRPCAP_LIBRARIES ) + set( HAVE_AIRPCAP 0) endif() mark_as_advanced( AIRPCAP_LIBRARIES AIRPCAP_INCLUDE_DIRS ) diff --git a/cmake/modules/FindPCAP.cmake b/cmake/modules/FindPCAP.cmake index 2370466e58..268b3e1a22 100644 --- a/cmake/modules/FindPCAP.cmake +++ b/cmake/modules/FindPCAP.cmake @@ -76,11 +76,12 @@ check_function_exists( "pcap_lib_version" HAVE_PCAP_LIB_VERSION ) check_function_exists( "pcap_list_datalinks" HAVE_PCAP_LIST_DATALINKS ) check_function_exists( "pcap_set_datalink" HAVE_PCAP_SET_DATALINK ) check_function_exists( "bpf_image" HAVE_BPF_IMAGE ) +check_function_exists( "pcap_setsampling" HAVE_PCAP_SETSAMPLING ) # Remote pcap checks -check_function_exists( "pcap_open" H_PCAP_OPEN ) +check_function_exists( "pcap_open" HAVE_PCAP_OPEN ) check_function_exists( "pcap_findalldevs_ex" H_FINDALLDEVS_EX ) check_function_exists( "pcap_createsrcstr" H_CREATESRCSTR ) -if( H_PCAP_OPEN AND H_FINDALLDEVS_EX AND H_CREATESRCSTR ) +if( HAVE_PCAP_OPEN AND H_FINDALLDEVS_EX AND H_CREATESRCSTR ) set( HAVE_PCAP_REMOTE 1 ) set( HAVE_REMOTE 1 ) endif() |