#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
project(Wireshark C CXX)
# cmake_policy(SET CMP0015 NEW)
endif(COMMAND cmake_policy)
-# set(PROJECT_VERSION "1.3.4-rc5")
-# set(PROJECT_VERSION "1.3.4rc5")
-# set(PROJECT_VERSION "1.3.4")
-# If not set, copy over Wireshark version from configure.in AC_INIT
-if(NOT PROJECT_VERSION)
+# set(PROJECT_MAJOR_VERSION 1)
+# set(PROJECT_MINOR_VERSION 9)
+# set(PROJECT_PATCH_VERSION 0)
+# set(PROJECT_VERSION_EXTENSION "-rc5")
+# If not set, copy over Wireshark version from configure.ac
+if(NOT PROJECT_MAJOR_VERSION)
file(STRINGS
- ${CMAKE_SOURCE_DIR}/configure.in
- VERSIONLINE
- REGEX "\\(wireshark, .*\\)"
+ ${CMAKE_SOURCE_DIR}/configure.ac
+ PROJECT_MAJOR_VERSION_TMP
+ REGEX "^m4_define\\(\\[?version_major\\]?, *\\[?[0-9]+\\]?\\)"
)
- string(REGEX REPLACE ".*\\(wireshark, (.*)\\).*"
+ file(STRINGS
+ ${CMAKE_SOURCE_DIR}/configure.ac
+ PROJECT_MINOR_VERSION_TMP
+ REGEX "^m4_define\\(\\[?version_minor\\]?, *\\[?[0-9]+\\]?\\)"
+ )
+ file(STRINGS
+ ${CMAKE_SOURCE_DIR}/configure.ac
+ PROJECT_PATCH_VERSION_TMP
+ REGEX "^m4_define\\(\\[?version_micro\\]?, *\\[?[0-9]+\\]?\\)"
+ )
+ # XXX pull VERSION_EXTENSION out of configure.ac ?
+
+ string(REGEX REPLACE "m4_define\\(\\[?version_major\\]?, *\\[?([0-9]+)\\]?\\)"
+ "\\1"
+ PROJECT_MAJOR_VERSION
+ ${PROJECT_MAJOR_VERSION_TMP}
+ )
+ string(REGEX REPLACE "m4_define\\(\\[?version_minor\\]?, *\\[?([0-9]+)\\]?\\)"
"\\1"
- PROJECT_VERSION
- ${VERSIONLINE}
+ PROJECT_MINOR_VERSION
+ ${PROJECT_MINOR_VERSION_TMP}
+ )
+ string(REGEX REPLACE "m4_define\\(\\[?version_micro\\]?, *\\[?([0-9]+)\\]?\\)"
+ "\\1"
+ PROJECT_PATCH_VERSION
+ ${PROJECT_PATCH_VERSION_TMP}
)
endif()
-string(REGEX REPLACE "([0-9]+)\\..*"
- "\\1"
- PROJECT_MAJOR_VERSION
- ${PROJECT_VERSION}
-)
-string(REGEX REPLACE ".*\\.([0-9]+)\\..*"
- "\\1"
- PROJECT_MINOR_VERSION
- ${PROJECT_VERSION}
-)
-string(REGEX REPLACE ".*\\..*\\.([0-9]+).*"
- "\\1"
- PROJECT_PATCH_VERSION
- ${PROJECT_VERSION}
-)
-string(REGEX REPLACE ".*\\..*\\.[0-9]+(.*)"
- "\\1"
- PROJECT_VERSION_EXTENSION
- ${PROJECT_VERSION}
-)
+
+
+if(PROJECT_VERSION_EXTENSION)
+ set(PROJECT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}${PROJECT_VERSION_EXTENSION})
+else()
+ set(PROJECT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION})
+endif()
+
message(STATUS "V: ${PROJECT_VERSION}, MaV: ${PROJECT_MAJOR_VERSION}, MiV: ${PROJECT_MINOR_VERSION}, PL: ${PROJECT_PATCH_VERSION}, EV: ${PROJECT_VERSION_EXTENSION}.")
#Where to find local cmake scripts
set(WIRESHARK_C_FLAGS
-O2
+ -g
-Wall
-W
-Wextra
-Wcast-align
-Wformat-security
-fexcess-precision=fast
+)
+set(WIRESHARK_C_ONLY_FLAGS
# The following are C only, not C++
-Wdeclaration-after-statement
-Wno-pointer-sign
# More cleanup needed for this on LP64
-Wshorten-64-to-32
+)
+
+set(WIRESHARK_EXTRA_C_ONLY_FLAGS
# The following are C only, not C++
-Wbad-function-cast
-Wc++-compat
if(ENABLE_EXTRA_GCC_CHECKS) # This overrides -Werror
set(WIRESHARK_C_FLAGS ${WIRESHARK_C_FLAGS} ${WIRESHARK_EXTRA_C_FLAGS})
+ set(WIRESHARK_C_ONLY_FLAGS ${WIRESHARK_C_ONLY_FLAGS} ${WIRESHARK_EXTRA_C_ONLY_FLAGS})
endif()
add_definitions(
- -DHAVE_CONFIG_H
-DG_DISABLE_DEPRECATED
-DG_DISABLE_SINGLE_INCLUDES
)
set(V WS_C_FLAG_VALID${C})
check_c_compiler_flag(${${F}} ${V})
if (${${V}})
- add_definitions(${${F}})
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${${F}}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${F}}")
+ endif()
+ math(EXPR C "${C} + 1")
+endforeach()
+# Continue increasing C from previous loop
+foreach(THIS_FLAG ${WIRESHARK_C_ONLY_FLAGS})
+ set(F WS_C_FLAG_${C})
+ set(${F} ${THIS_FLAG})
+ set(V WS_C_FLAG_VALID${C})
+ check_c_compiler_flag(${${F}} ${V})
+ if (${${V}})
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${${F}}")
endif()
math(EXPR C "${C} + 1")
endforeach()
+message(STATUS "C-Flags: ${CMAKE_C_FLAGS}\nCXX-Flags: ${CMAKE_CXX_FLAGS}")
+
+check_c_compiler_flag(-fvisibility=hidden FVHIDDEN)
+if((FVHIDDEN))
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
+else() # TODO add alternate compiler flags for hiding symbols
+ message(WARNING "Hiding shared library symbols is not supported by the compiler."
+ " All shared library symbols will be exported.")
+endif()
if(NOT DISABLE_WERROR AND NOT ENABLE_EXTRA_GCC_CHECKS)
check_c_compiler_flag(-Werror WERROR)
unset(WERROR)
endif()
-if(CMAKE_COMPILER_IS_GNUCC)
+if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_CXX_COMPILER MATCHES ".*clang")
set (C_UNUSED "__attribute__((unused))" )
else()
set (C_UNUSED "" )
set(PACKAGELIST ${PACKAGELIST} GEOIP)
endif()
+if(ENABLE_NETLINK)
+ set(PACKAGELIST ${PACKAGELIST} NL)
+endif()
+
# Capabilities
if(ENABLE_CAP)
set(PACKAGELIST ${PACKAGELIST} CAP)
set(PACKAGELIST ${PACKAGELIST} POD)
-set(PROGLIST text2pcap mergecap capinfos editcap dumpcap)
+set(PROGLIST text2pcap mergecap capinfos editcap reordercap dumpcap)
#Let's loop the package list
foreach(PACKAGE ${PACKAGELIST})
endif()
if(HAVE_LIBLUA)
set(HAVE_LUA_H 1)
- set(HAVE_LUA_5_1 1)
+ set(HAVE_LUA 1)
endif()
if(HAVE_LIBKERBEROS)
set(HAVE_KERBEROS 1)
endif()
if(ENABLE_AIRPCAP)
set(HAVE_AIRPCAP 1)
- set(HAVE_WIRELESS_TOOLBAR 1)
+endif()
+if(HAVE_LIBNL AND ENABLE_AIRPCAP)
+ message(ERROR "Airpcap and Libnl support are mutually exclusive")
endif()
# No matter which version of GTK is present
if(GTK2_FOUND OR GTK3_FOUND)
plugins/unistim
plugins/wimax
plugins/wimaxasncp
+ plugins/wimaxmacphy
)
# It seems this stuff doesn't build with autofoo either...
# if(YAPP_FOUND)
add_subdirectory( wiretap )
add_subdirectory( wsutil )
+add_custom_target(dumpabi DEPENDS dumpabi-libwireshark dumpabi-libwiretap dumpabi-libwsutil color.h)
+
+if((BUILD_wireshark AND GTK_FOUND) OR (BUILD_qtshark AND QT_FOUND))
+ add_subdirectory( ui )
+endif()
+
if(BUILD_wireshark AND GTK_FOUND)
add_subdirectory( ui/gtk )
endif()
endif()
#Platform specific
-if(UNIX)
- set(WS_VAR_IMPORT "extern")
-endif()
+#if(UNIX)
+#endif()
if(APPLE)
-#TODO verify that APPLE implies HAVE_OS_X_FRAMEWORKS
+ #
+ # We assume that APPLE means OS X so that we have the OS X
+ # frameworks.
+ #
set(HAVE_OS_X_FRAMEWORKS 1)
- FIND_LIBRARY (APPLE_CORE_SERVICES_LIBRARY CoreServices)
- FIND_LIBRARY (APPLE_COCOA_LIBRARY Cocoa)
+ FIND_LIBRARY (APPLE_APPLICATION_SERVICES_LIBRARY ApplicationServices)
+ FIND_LIBRARY (APPLE_CORE_FOUNDATION_LIBRARY CoreFoundation)
+ FIND_LIBRARY (APPLE_SYSTEM_CONFIGURATION_LIBRARY SystemConfiguration)
endif()
if(WIN32)
- add_definitions(-D_NEED_VAR_IMPORT_)
- set(WS_VAR_IMPORT "__declspec(dllimport) extern")
set(WS_MSVC_NORETURN "__declspec(noreturn)")
# Disable deprecation
configure_file(${CMAKE_SOURCE_DIR}/cmakeconfig.h.in ${CMAKE_BINARY_DIR}/config.h)
+set( configure_input "Built with CMake ${CMAKE_VERSION}" )
+set( VERSION ${PROJECT_VERSION} )
+
+configure_file(
+ ${CMAKE_SOURCE_DIR}/packaging/macosx/Info.plist.in
+ ${CMAKE_SOURCE_DIR}/packaging/macosx/Info.plist
+ @ONLY)
+
include(FeatureSummary)
#SET_FEATURE_INFO(NAME DESCRIPTION [URL [COMMENT] ]
#FEATURE_SUMMARY(WHAT ALL) Requires removal of our local copy of FeatureSummary
PRINT_DISABLED_FEATURES()
link_directories(
+ ${CMAKE_BINARY_DIR}/ui
${CMAKE_BINARY_DIR}/ui/gtk
${CMAKE_BINARY_DIR}/ui/qt
${CMAKE_BINARY_DIR}/codecs
if(UNIX)
set(PLATFORM_SRC
- capture-pcap-util-unix.c
+ capture-pcap-util-unix.c capture_unix_ifnames.c
)
endif()
if(WIN32)
set(PLATFORM_SRC
- capture-wpcap.c capture_wpcap_packet.c
+ capture-wpcap.c capture_wpcap_packet.c capture_win_ifnames.c
)
endif()
${PLATFORM_SRC}
capture-pcap-util.c
cfile.c
+ cfutils.c
clopts_common.c
disabled_protos.c
frame_data_sequence.c
${CMAKE_BINARY_DIR}/dftest.html
${CMAKE_BINARY_DIR}/dumpcap.html
${CMAKE_BINARY_DIR}/editcap.html
+ ${CMAKE_BINARY_DIR}/asn2deb.html
+ ${CMAKE_BINARY_DIR}/idl2deb.html
${CMAKE_BINARY_DIR}/idl2wrs.html
ipmap.html
manuf
pdml2html.xsl
${CMAKE_BINARY_DIR}/randpkt.html
${CMAKE_BINARY_DIR}/rawshark.html
+ ${CMAKE_BINARY_DIR}/reordercap.html
services
smi_modules
${CMAKE_BINARY_DIR}/text2pcap.html
fileset.c
filters.c
g711.c
+ iface_monitor.c
merge.c
proto_hier_stats.c
- recent.c
summary.c
tempfile.c
u3.c
- ui/alert_box.c
- ui/util.c
+ ws80211_utils.c
${SHARK_COMMON_CAPTURE_SRC}
${WIRESHARK_COMMON_SRC}
)
if(BUILD_wireshark AND GTK_FOUND)
set(wireshark_LIBS
gtkui
+ ui
+ ui_dirty
${GTK2_LIBRARIES}
${GTK3_LIBRARIES}
${GTHREAD2_LIBRARIES}
codecs
${PORTAUDIO_LIBRARIES}
${LIBEPAN_LIBS}
+ ${APPLE_APPLICATION_SERVICES_LIBRARY}
${APPLE_CORE_SERVICES_LIBRARY}
- ${APPLE_COCOA_LIBRARY}
+ ${APPLE_SYSTEM_CONFIGURATION_LIBRARY}
+ ${NL_LIBRARIES}
)
# qtshark and wireshark share wireshark_FILES
if(BUILD_qtshark AND QT_FOUND)
set(qtshark_LIBS
qtui
+ ui
+ ui_dirty
${QT_LIBRARIES}
${GTHREAD2_LIBRARIES}
codecs
${PORTAUDIO_LIBRARIES}
${LIBEPAN_LIBS}
- ${APPLE_CORE_SERVICES_LIBRARY}
- ${APPLE_COCOA_LIBRARY}
+ ${APPLE_APPLICATION_SERVICES_LIBRARY}
+ ${APPLE_CORE_FOUNDATION_LIBRARY}
+ ${APPLE_SYSTEM_CONFIGURATION_LIBRARY}
+ ${NL_LIBRARIES}
)
# qtshark and wireshark share wireshark_FILES
if(BUILD_tshark)
set(tshark_LIBS
${LIBEPAN_LIBS}
- ${APPLE_COCOA_LIBRARY}
+ ${APPLE_CORE_FOUNDATION_LIBRARY}
+ ${APPLE_SYSTEM_CONFIGURATION_LIBRARY}
)
set(tshark_FILES
capture_opts.c
if(BUILD_rawshark AND PCAP_FOUND)
set(rawshark_LIBS
${LIBEPAN_LIBS}
- ${APPLE_COCOA_LIBRARY}
+ ${APPLE_CORE_FOUNDATION_LIBRARY}
+ ${APPLE_SYSTEM_CONFIGURATION_LIBRARY}
)
set(rawshark_FILES
${WIRESHARK_COMMON_SRC}
if(BUILD_text2pcap)
set(text2pcap_LIBS
- wiretap
+ wsutil
${M_LIBRARIES}
${ZLIB_LIBRARIES}
)
set(text2pcap_CLEAN_FILES
text2pcap.c
+ pcapio.c
)
set(text2pcap_FILES
${text2pcap_CLEAN_FILES}
mergecap.c
merge.c
svnversion.h
+ ${WTAP_PLUGIN_SOURCES}
)
add_executable(mergecap ${mergecap_FILES})
add_dependencies(mergecap svnversion)
install(TARGETS mergecap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
+if(BUILD_reordercap)
+ set(reordercap_LIBS
+ wiretap
+ ${ZLIB_LIBRARIES}
+ )
+ set(reordercap_FILES
+ reordercap.c
+ svnversion.h
+ ${WTAP_PLUGIN_SOURCES}
+ )
+ add_executable(reordercap ${reordercap_FILES})
+ add_dependencies(reordercap svnversion)
+ set_target_properties(reordercap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
+ target_link_libraries(reordercap ${reordercap_LIBS})
+ install(TARGETS reordercap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
+
if(BUILD_capinfos)
set(capinfos_LIBS
wiretap
+ wsutil
${ZLIB_LIBRARIES}
${GCRYPT_LIBRARIES}
- ${APPLE_COCOA_LIBRARY}
)
set(capinfos_FILES
capinfos.c
${GLIB2_LIBRARIES}
${GTHREAD2_LIBRARIES}
${ZLIB_LIBRARIES}
- ${APPLE_COCOA_LIBRARY}
+ ${APPLE_CORE_FOUNDATION_LIBRARY}
+ ${APPLE_SYSTEM_CONFIGURATION_LIBRARY}
+ ${NL_LIBRARIES}
)
set(dumpcap_FILES
svnversion.h
capture_opts.c
capture-pcap-util.c
capture_stop_conditions.c
+ cfutils.c
clopts_common.c
conditions.c
dumpcap.c
pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/dftest 1 )
pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/dumpcap 1 )
pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/editcap 1 )
+pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/asn2deb 1 )
+pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/idl2deb 1 )
pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/idl2wrs 1 )
pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/mergecap 1 )
pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/randpkt 1 )
pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/rawshark 1 )
+pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/reordercap 1 )
pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/text2pcap 1 )
pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/tshark 1 )
pod2manhtml( wireshark 1 )
dftest.html
dumpcap.html
editcap.html
+ asn2deb.html
+ idl2deb.html
idl2wrs.html
mergecap.html
randpkt.html
rawshark.html
+ reordercap.html
text2pcap.html
tshark.html
wireshark.html
${CMAKE_BINARY_DIR}/mergecap.1
${CMAKE_BINARY_DIR}/randpkt.1
${CMAKE_BINARY_DIR}/rawshark.1
+ ${CMAKE_BINARY_DIR}/reordercap.1
${CMAKE_BINARY_DIR}/text2pcap.1
${CMAKE_BINARY_DIR}/tshark.1
${CMAKE_BINARY_DIR}/wireshark.1
PATTERN "*.pdf"
)
endif()
-
git.samba.org / metze / wireshark / wip.git / blobdiff