- Reorder how packagetests are run
- Add packet-reload.c - Make most packages not-required (not tested) - Does *not* (yet) add an optional/whatever case to enable_ svn path=/trunk/; revision=34307
This commit is contained in:
parent
5d10ffdef5
commit
34c7218d1a
|
@ -221,88 +221,100 @@ endif()
|
||||||
# - set HAVE_XXX
|
# - set HAVE_XXX
|
||||||
|
|
||||||
#The minimum package list
|
#The minimum package list
|
||||||
set(PACKAGELIST GLIB2 GMODULE2 PCAP M LEX YACC Perl SH PythonInterp HtmlViewer ${PACKAGELIST})
|
set(PACKAGELIST GLIB2 GMODULE2 PCAP M LEX YACC Perl SH PythonInterp)
|
||||||
|
|
||||||
set(GLIB2_FIND_REQUIRED)
|
set(GLIB2_FIND_REQUIRED)
|
||||||
set(GLIB2_MIN_VERSION 2.4.0)
|
set(GLIB2_MIN_VERSION 2.4.0)
|
||||||
|
set(PCAP_REQUIRED)
|
||||||
|
set(M_REQUIRED)
|
||||||
|
|
||||||
|
set(PACKAGELIST ${PACKAGELIST} HtmlViewer)
|
||||||
|
|
||||||
#Build the gui ?
|
#Build the gui ?
|
||||||
if(BUILD_wireshark)
|
if(BUILD_wireshark)
|
||||||
set(PACKAGELIST GTK2 ${PACKAGELIST})
|
set(PACKAGELIST ${PACKAGELIST} GTK2)
|
||||||
set(GTK2_OPTIONS COMPONENTS gtk)
|
set(GTK2_OPTIONS COMPONENTS gtk)
|
||||||
set(GTK2_DEBUG false)
|
set(GTK2_DEBUG false)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# SMI SNMP
|
# SMI SNMP
|
||||||
if(ENABLE_SMI)
|
if(ENABLE_SMI)
|
||||||
set(PACKAGELIST SMI ${PACKAGELIST})
|
set(PACKAGELIST ${PACKAGELIST} SMI)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# GNU crypto
|
# GNU crypto
|
||||||
if(ENABLE_GCRYPT)
|
if(ENABLE_GCRYPT)
|
||||||
set(PACKAGELIST GCRYPT ${PACKAGELIST})
|
set(PACKAGELIST ${PACKAGELIST} GCRYPT)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# GNU SSL/TLS support
|
# GNU SSL/TLS support
|
||||||
if(ENABLE_GNUTLS)
|
if(ENABLE_GNUTLS)
|
||||||
set(PACKAGELIST GNUTLS ${PACKAGELIST})
|
set(PACKAGELIST ${PACKAGELIST} GNUTLS)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Regular expressions lib
|
# Regular expressions lib
|
||||||
if(ENABLE_PCRE)
|
if(ENABLE_PCRE)
|
||||||
set(PACKAGELIST PCRE ${PACKAGELIST})
|
set(PACKAGELIST ${PACKAGELIST} PCRE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Kerberos
|
# Kerberos
|
||||||
if(ENABLE_KERBEROS)
|
if(ENABLE_KERBEROS)
|
||||||
set(PACKAGELIST KERBEROS ${PACKAGELIST})
|
set(PACKAGELIST ${PACKAGELIST} KERBEROS)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Portable audio
|
# Portable audio
|
||||||
if(ENABLE_PORTAUDIO)
|
if(ENABLE_PORTAUDIO)
|
||||||
set(PACKAGELIST PORTAUDIO ${PACKAGELIST})
|
set(PACKAGELIST ${PACKAGELIST} PORTAUDIO)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
# Prefer c-ares over adns
|
# Prefer c-ares over adns
|
||||||
if(ENABLE_CARES) # C Asynchronouse resolver
|
if(ENABLE_CARES) # C Asynchronouse resolver
|
||||||
set(PACKAGELIST CARES ${PACKAGELIST})
|
set(PACKAGELIST ${PACKAGELIST} CARES)
|
||||||
elseif(ENABLE_ADNS) # Gnu asynchronous DNS
|
elseif(ENABLE_ADNS) # Gnu asynchronous DNS
|
||||||
set(PACKAGELIST ADNS ${PACKAGELIST})
|
set(PACKAGELIST ${PACKAGELIST} ADNS)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Zlib compression
|
# Zlib compression
|
||||||
if(ENABLE_ZLIB)
|
if(ENABLE_ZLIB)
|
||||||
set(PACKAGELIST ZLIB ${PACKAGELIST})
|
set(PACKAGELIST ${PACKAGELIST} ZLIB)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Lua 5.1 dissectors
|
# Lua 5.1 dissectors
|
||||||
if(ENABLE_LUA)
|
if(ENABLE_LUA)
|
||||||
set(PACKAGELIST LUA ${PACKAGELIST})
|
set(PACKAGELIST ${PACKAGELIST} LUA)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# GeoIP address resolving
|
# GeoIP address resolving
|
||||||
if(ENABLE_GEOIP)
|
if(ENABLE_GEOIP)
|
||||||
set(PACKAGELIST GEOIP ${PACKAGELIST})
|
set(PACKAGELIST ${PACKAGELIST} GEOIP)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Capabilities
|
# Capabilities
|
||||||
if(ENABLE_CAP)
|
if(ENABLE_CAP)
|
||||||
set(PACKAGELIST CAP ${PACKAGELIST})
|
set(PACKAGELIST ${PACKAGELIST} CAP)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(ENABLE_PYTHON)
|
if(ENABLE_PYTHON)
|
||||||
set(PACKAGELIST PYTHON ${PACKAGELIST})
|
set(PACKAGELIST ${PACKAGELIST} PYTHON)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
set(PACKAGELIST ${PACKAGELIST} YAPP)
|
||||||
|
|
||||||
|
if(ENABLE_GUIDES)
|
||||||
|
set(PACKAGELIST ${PACKAGELIST} POD)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
|
||||||
set(PROGLIST text2pcap mergecap capinfos editcap dumpcap)
|
set(PROGLIST text2pcap mergecap capinfos editcap dumpcap)
|
||||||
|
|
||||||
#Let's loop the package list
|
#Let's loop the package list
|
||||||
foreach(PACKAGE ${PACKAGELIST})
|
foreach(PACKAGE ${PACKAGELIST})
|
||||||
if(${PACKAGE}_OPTIONS)
|
if(${PACKAGE}_OPTIONS)
|
||||||
find_package(${PACKAGE} ${${PACKAGE}_OPTIONS})
|
find_package(${PACKAGE} ${${PACKAGE}_OPTIONS})
|
||||||
else()
|
elseif(${PACKAGE}_REQUIRED)
|
||||||
find_package(${PACKAGE} REQUIRED)
|
find_package(${PACKAGE} REQUIRED)
|
||||||
|
else()
|
||||||
|
find_package(${PACKAGE})
|
||||||
endif()
|
endif()
|
||||||
message(${PACKAGE}_FOUND)
|
message(${PACKAGE}_FOUND)
|
||||||
if (${PACKAGE}_FOUND)
|
if (${PACKAGE}_FOUND)
|
||||||
|
@ -313,8 +325,6 @@ foreach(PACKAGE ${PACKAGELIST})
|
||||||
endif()
|
endif()
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
find_package(YAPP)
|
|
||||||
|
|
||||||
#packaging
|
#packaging
|
||||||
include(CPackConfig.txt)
|
include(CPackConfig.txt)
|
||||||
|
|
||||||
|
@ -408,8 +418,6 @@ if(ENABLE_GUIDES)
|
||||||
add_subdirectory( docbook )
|
add_subdirectory( docbook )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
find_package(POD)
|
|
||||||
|
|
||||||
#Platform specific
|
#Platform specific
|
||||||
if(UNIX)
|
if(UNIX)
|
||||||
set(WS_VAR_IMPORT "extern")
|
set(WS_VAR_IMPORT "extern")
|
||||||
|
|
|
@ -863,6 +863,7 @@ set(DISSECTOR_SRC
|
||||||
dissectors/packet-rdt.c
|
dissectors/packet-rdt.c
|
||||||
dissectors/packet-redback.c
|
dissectors/packet-redback.c
|
||||||
dissectors/packet-redbackli.c
|
dissectors/packet-redbackli.c
|
||||||
|
dissectors/packet-reload.c
|
||||||
dissectors/packet-retix-bpdu.c
|
dissectors/packet-retix-bpdu.c
|
||||||
dissectors/packet-rfc2190.c
|
dissectors/packet-rfc2190.c
|
||||||
dissectors/packet-rgmp.c
|
dissectors/packet-rgmp.c
|
||||||
|
|
Loading…
Reference in New Issue