From efea8ce1c6a4331bc2ff7090dd3dadd2a80f6d86 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Thu, 25 Sep 2014 15:37:38 -0700 Subject: CMake: Conditional build fixes and updates. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit HAVE_PORTAUDIO_H didn't work for Stig. Use PORTAUDIO_FOUND instead, which is the correct name to use according to the FIND_PACKAGE_HANDLE_STANDARD_ARGS documentation. Use xxx_FOUND in a couple of other places. Conditionally build caputils/airpcap_loader.c. Change-Id: I6a134192902229a446dccf43bfb7bbfe2a55d1e2 Reviewed-on: https://code.wireshark.org/review/4291 Reviewed-by: Gerald Combs Reviewed-by: Graham Bloice Reviewed-by: Stig Bjørlykke Tested-by: Stig Bjørlykke --- caputils/CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'caputils') diff --git a/caputils/CMakeLists.txt b/caputils/CMakeLists.txt index 0d9364f2ad..a3a308ba0f 100644 --- a/caputils/CMakeLists.txt +++ b/caputils/CMakeLists.txt @@ -36,12 +36,18 @@ endif() set(CAPUTILS_SRC ${PLATFORM_CAPUTILS_SRC} - airpcap_loader.c capture-pcap-util.c iface_monitor.c ws80211_utils.c ) +if (AIRPCAP_FOUND) + set(CAPUTILS_SRC + ${CAPUTILS_SRC} + airpcap_loader.c + ) +endif() + set(CLEAN_FILES ${CAPUTILS_SRC} ) -- cgit v1.2.1