From ff94a7fffb06c54d9b6798a86494cbc25f671506 Mon Sep 17 00:00:00 2001 From: Joerg Mayer Date: Fri, 22 Aug 2014 12:53:27 +0200 Subject: [PATCH] Move generating HAVE_AIRPCAP to main CMakeLists.txt as is done with other liberaries. Also: After set( variable 0 ) the variable is defined. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Id26a771875b7643c19f173ce77bb29a4059a1bd0 Reviewed-on: https://code.wireshark.org/review/3793 Reviewed-by: Jörg Mayer --- CMakeLists.txt | 3 +++ cmake/modules/FindAIRPCAP.cmake | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 07a9863783..154f0ae169 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -666,6 +666,9 @@ WSExtendPath( "${WS_ALL_LIBS}" "${CMAKE_BINARY_DIR}/setpath.bat" ) #packaging include(CPackConfig.txt) +if(HAVE_LIBAIRPCAP) + set(HAVE_AIRPCAP 1) +endif() if(HAVE_LIBLUA) set(HAVE_LUA_H 1) set(HAVE_LUA 1) diff --git a/cmake/modules/FindAIRPCAP.cmake b/cmake/modules/FindAIRPCAP.cmake index d5501e4a9d..afc93f97c0 100644 --- a/cmake/modules/FindAIRPCAP.cmake +++ b/cmake/modules/FindAIRPCAP.cmake @@ -34,11 +34,9 @@ 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 )