git.samba.org
/
obnox
/
wireshark
/
wip.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix build by #if 0 out unused de_sgsap_tmsi() function.
[obnox/wireshark/wip.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 6c25fbffef0ea14ca5298b5f904db7ddaedb91a1..4de268e700fc287a9ba95272a60d7f0909b651f3 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-210,7
+210,7
@@
if(ENABLE_STATIC)
set(LINK_MODE_MODULE STATIC)
else()
set(LINK_MODE_LIB SHARED)
set(LINK_MODE_MODULE STATIC)
else()
set(LINK_MODE_LIB SHARED)
- set(LINK_MODE_MODULE
SHARED
)
+ set(LINK_MODE_MODULE
MODULE
)
endif()
# The packagelist is doing some magic: If we add XXX to the packagelist, we
endif()
# The packagelist is doing some magic: If we add XXX to the packagelist, we
@@
-221,85
+221,98
@@
endif()
# - set HAVE_XXX
#The minimum package list
# - set HAVE_XXX
#The minimum package list
-set(PACKAGELIST GLIB2 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_MIN_VERSION 2.4.0)
+set(PCAP_REQUIRED)
+set(M_REQUIRED)
+
+set(PACKAGELIST ${PACKAGELIST} HtmlViewer)
#Build the gui ?
if(BUILD_wireshark)
#Build the gui ?
if(BUILD_wireshark)
- set(PACKAGELIST
GTK2 ${PACKAGELIST}
)
+ set(PACKAGELIST
${PACKAGELIST} GTK2
)
set(GTK2_OPTIONS COMPONENTS gtk)
set(GTK2_DEBUG false)
endif()
# SMI SNMP
if(ENABLE_SMI)
set(GTK2_OPTIONS COMPONENTS gtk)
set(GTK2_DEBUG false)
endif()
# SMI SNMP
if(ENABLE_SMI)
- set(PACKAGELIST
SMI ${PACKAGELIST}
)
+ set(PACKAGELIST
${PACKAGELIST} SMI
)
endif()
# GNU crypto
if(ENABLE_GCRYPT)
endif()
# GNU crypto
if(ENABLE_GCRYPT)
- set(PACKAGELIST
GCRYPT ${PACKAGELIST}
)
+ set(PACKAGELIST
${PACKAGELIST} GCRYPT
)
endif()
# GNU SSL/TLS support
if(ENABLE_GNUTLS)
endif()
# GNU SSL/TLS support
if(ENABLE_GNUTLS)
- set(PACKAGELIST
GNUTLS ${PACKAGELIST}
)
+ set(PACKAGELIST
${PACKAGELIST} GNUTLS
)
endif()
# Regular expressions lib
if(ENABLE_PCRE)
endif()
# Regular expressions lib
if(ENABLE_PCRE)
- set(PACKAGELIST
PCRE ${PACKAGELIST}
)
+ set(PACKAGELIST
${PACKAGELIST} PCRE
)
endif()
# Kerberos
if(ENABLE_KERBEROS)
endif()
# Kerberos
if(ENABLE_KERBEROS)
- set(PACKAGELIST
KERBEROS ${PACKAGELIST}
)
+ set(PACKAGELIST
${PACKAGELIST} KERBEROS
)
endif()
# Portable audio
if(ENABLE_PORTAUDIO)
endif()
# Portable audio
if(ENABLE_PORTAUDIO)
- set(PACKAGELIST
PORTAUDIO ${PACKAGELIST}
)
+ set(PACKAGELIST
${PACKAGELIST} PORTAUDIO
)
endif()
# Prefer c-ares over adns
if(ENABLE_CARES) # C Asynchronouse resolver
endif()
# Prefer c-ares over adns
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()
# Zlib compression
if(ENABLE_ZLIB)
endif()
# Zlib compression
if(ENABLE_ZLIB)
- set(PACKAGELIST
ZLIB ${PACKAGELIST}
)
+ set(PACKAGELIST
${PACKAGELIST} ZLIB
)
endif()
# Lua 5.1 dissectors
if(ENABLE_LUA)
endif()
# Lua 5.1 dissectors
if(ENABLE_LUA)
- set(PACKAGELIST
LUA ${PACKAGELIST}
)
+ set(PACKAGELIST
${PACKAGELIST} LUA
)
endif()
# GeoIP address resolving
if(ENABLE_GEOIP)
endif()
# GeoIP address resolving
if(ENABLE_GEOIP)
- set(PACKAGELIST
GEOIP ${PACKAGELIST}
)
+ set(PACKAGELIST
${PACKAGELIST} GEOIP
)
endif()
# Capabilities
if(ENABLE_CAP)
endif()
# Capabilities
if(ENABLE_CAP)
- set(PACKAGELIST
CAP ${PACKAGELIST}
)
+ set(PACKAGELIST
${PACKAGELIST} CAP
)
endif()
if(ENABLE_PYTHON)
endif()
if(ENABLE_PYTHON)
- set(PACKAGELIST
PYTHON ${PACKAGELIST}
)
+ set(PACKAGELIST
${PACKAGELIST} PYTHON
)
endif()
endif()
+set(PACKAGELIST ${PACKAGELIST} YAPP)
+
+set(PACKAGELIST ${PACKAGELIST} POD)
+
+
set(PROGLIST text2pcap mergecap capinfos editcap dumpcap)
#Let's loop the package list
foreach(PACKAGE ${PACKAGELIST})
if(${PACKAGE}_OPTIONS)
find_package(${PACKAGE} ${${PACKAGE}_OPTIONS})
set(PROGLIST text2pcap mergecap capinfos editcap dumpcap)
#Let's loop the package list
foreach(PACKAGE ${PACKAGELIST})
if(${PACKAGE}_OPTIONS)
find_package(${PACKAGE} ${${PACKAGE}_OPTIONS})
- else
(
)
+ else
if(${PACKAGE}_REQUIRED
)
find_package(${PACKAGE} REQUIRED)
find_package(${PACKAGE} REQUIRED)
+ else()
+ find_package(${PACKAGE})
endif()
message(${PACKAGE}_FOUND)
if (${PACKAGE}_FOUND)
endif()
message(${PACKAGE}_FOUND)
if (${PACKAGE}_FOUND)
@@
-310,8
+323,6
@@
foreach(PACKAGE ${PACKAGELIST})
endif()
endforeach()
endif()
endforeach()
-find_package(YAPP)
-
#packaging
include(CPackConfig.txt)
#packaging
include(CPackConfig.txt)
@@
-392,17
+403,22
@@
endforeach()
add_subdirectory( codecs )
add_subdirectory( epan )
add_subdirectory( codecs )
add_subdirectory( epan )
-add_subdirectory( gtk )
add_subdirectory( tools/lemon )
add_subdirectory( wiretap )
add_subdirectory( wsutil )
add_subdirectory( tools/lemon )
add_subdirectory( wiretap )
add_subdirectory( wsutil )
+if(BUILD_wireshark AND GTK2_FOUND)
+ add_subdirectory( gtk )
+endif()
+
+# Basedir where to install guides
+set(DOC_DIR "$ENV{docdir}")
+message(STATUS "docdir: ${DOC_DIR}")
+
if(ENABLE_GUIDES)
add_subdirectory( docbook )
endif()
if(ENABLE_GUIDES)
add_subdirectory( docbook )
endif()
-find_package(POD)
-
#Platform specific
if(UNIX)
set(WS_VAR_IMPORT "extern")
#Platform specific
if(UNIX)
set(WS_VAR_IMPORT "extern")
@@
-427,10
+443,6
@@
endif()
configure_file(${CMAKE_SOURCE_DIR}/cmakeconfig.h.in ${CMAKE_BINARY_DIR}/config.h)
configure_file(${CMAKE_SOURCE_DIR}/cmakeconfig.h.in ${CMAKE_BINARY_DIR}/config.h)
-# Basedir where to install guides
-set(DOC_DIR "$ENV{docdir}")
-message(STATUS "docdir: ${DOC_DIR}")
-
include(FeatureSummary)
#SET_FEATURE_INFO(NAME DESCRIPTION [URL [COMMENT] ]
PRINT_ENABLED_FEATURES()
include(FeatureSummary)
#SET_FEATURE_INFO(NAME DESCRIPTION [URL [COMMENT] ]
PRINT_ENABLED_FEATURES()
@@
-555,6
+567,7
@@
set(TSHARK_TAP_SRC
set(INSTALL_DIRS
diameter
set(INSTALL_DIRS
diameter
+ docbook
dtds
help
radius
dtds
help
radius
@@
-608,7
+621,7
@@
set(LIBEPAN_LIBS
${M_LIBRARIES}
)
${M_LIBRARIES}
)
-if(BUILD_wireshark)
+if(BUILD_wireshark
AND GTK2_FOUND
)
set(wireshark_LIBS
ui
${GTK2_LIBRARIES}
set(wireshark_LIBS
ui
${GTK2_LIBRARIES}
@@
-634,6
+647,7
@@
if(BUILD_wireshark)
proto_hier_stats.c
summary.c
tempfile.c
proto_hier_stats.c
summary.c
tempfile.c
+ u3.c
${SHARK_COMMON_CAPTURE_SRC}
${WIRESHARK_COMMON_SRC}
)
${SHARK_COMMON_CAPTURE_SRC}
${WIRESHARK_COMMON_SRC}
)