osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Move generating HAVE_AIRPCAP to main CMakeLists.txt as is done with 

other liberaries. Also: After set( variable 0 ) the variable is defined.

Change-Id: Id26a771875b7643c19f173ce77bb29a4059a1bd0
Reviewed-on: https://code.wireshark.org/review/3793
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
This commit is contained in:
Joerg Mayer 2014-08-22 12:53:27 +02:00 committed by Jörg Mayer
parent d5ba8b4f44
commit ff94a7fffb
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -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)

2
cmake/modules/FindAIRPCAP.cmake
View File

@ -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 )