Play catch up with recent configure.in changes:

- Link dumpcap (and only dumpcap) against gthread
- gtk/gsm_a_stat.c and gtk/menus.c are dirty when configured with UI_MANAGER=1
- Add support run "cmake ... -DWANT_PACKET_EDITOR=1 ..."

svn path=/trunk/; revision=37103

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 659868f442ed088913445c1d7ab1c9c0e9b1372b..1364f7c5621c68af6e353c0fb40414eb0a9d481d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -236,6 +236,11 @@ if(BUILD_wireshark)
        set(GTK2_DEBUG false)
 endif()
 
+if(BUILD_dumpcap)
+       set(PACKAGELIST ${PACKAGELIST} GTHREAD2)
+       set(GHTREAD2_REQUIRED)
+endif()
+
 # SMI SNMP
 if(ENABLE_SMI)
        set(PACKAGELIST ${PACKAGELIST} SMI)
@@ -820,6 +825,7 @@ if(BUILD_dumpcap)
 #              @SOCKET_LIBS@
 #              @NSL_LIBS@
                ${GLIB2_LIBRARIES}
+               ${GTHREAD2_LIBRARIES}
                ${ZLIB_LIBRARIES}
                ${APPLE_COCOA_LIBRARY}
        )

diff --git a/cmake/modules/FindGTHREAD2.cmake b/cmake/modules/FindGTHREAD2.cmake
new file mode 100644 (file)
index 0000000..8bcbaca
--- /dev/null
+++ b/cmake/modules/FindGTHREAD2.cmake
@@ -0,0 +1,61 @@
+# - Try to find GThread2 
+#
+# $Id$
+#
+# Find GThread headers, libraries and the answer to all questions.
+#
+#  GTHREAD2_FOUND               True if GTHREAD2 got found
+#  GTHREAD2_INCLUDE_DIRS        Location of GTHREAD2 headers 
+#  GTHREAD2_LIBRARIES           List of libraries to use GTHREAD2 
+#
+#  Copyright (c) 2008 Bjoern Ricks <bjoern.ricks@googlemail.com>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+INCLUDE( FindPkgConfig )
+
+IF ( GTHREAD2_FIND_REQUIRED )
+       SET( _pkgconfig_REQUIRED "REQUIRED" )
+ELSE( GTHREAD2_FIND_REQUIRED )
+       SET( _pkgconfig_REQUIRED "" )   
+ENDIF ( GTHREAD2_FIND_REQUIRED )
+
+IF ( GTHREAD2_MIN_VERSION )
+       PKG_SEARCH_MODULE( GTHREAD2 ${_pkgconfig_REQUIRED} gthread-2.0>=${GTHREAD2_MIN_VERSION} )
+ELSE ( GTHREAD2_MIN_VERSION )
+       PKG_SEARCH_MODULE( GTHREAD2 ${_pkgconfig_REQUIRED} gthread-2.0 )
+ENDIF ( GTHREAD2_MIN_VERSION )
+
+
+IF( NOT GTHREAD2_FOUND AND NOT PKG_CONFIG_FOUND )
+       FIND_PATH( GTHREAD2_INCLUDE_DIRS gthread.h PATH_SUFFIXES glib-2.0 glib GLib.framework/Headers/glib )
+       IF ( APPLE ) 
+               FIND_LIBRARY( GTHREAD2_LIBRARIES glib )
+       ELSE ( APPLE )
+               FIND_LIBRARY( GTHREAD2_LIBRARIES gthread-2.0 )
+       ENDIF ( APPLE )
+       
+       #MESSAGE( STATUS "Gthread headers: ${GTHREAD2_INCLUDE_DIRS}" )
+       #MESSAGE( STATUS "Gthread libs: ${GTHREAD2_LIBRARIES}" )
+       
+       # Report results
+       IF ( GTHREAD2_LIBRARIES AND GTHREAD2_INCLUDE_DIRS )     
+               SET( GTHREAD2_FOUND 1 )
+               IF ( NOT GTHREAD2_FIND_QUIETLY )
+                       MESSAGE( STATUS "Found GTHREAD2: ${GTHREAD2_LIBRARIES} ${GTHREAD2_INCLUDE_DIRS}" )
+               ENDIF ( NOT GTHREAD2_FIND_QUIETLY )
+       ELSE ( GTHREAD2_LIBRARIES AND GTHREAD2_INCLUDE_DIRS )   
+               IF ( GTHREAD2_FIND_REQUIRED )
+                       MESSAGE( SEND_ERROR "Could NOT find GTHREAD2" )
+               ELSE ( GTHREAD2_FIND_REQUIRED )
+                       IF ( NOT GTHREAD2_FIND_QUIETLY )
+                               MESSAGE( STATUS "Could NOT find GTHREAD2" )     
+                       ENDIF ( NOT GTHREAD2_FIND_QUIETLY )
+               ENDIF ( GTHREAD2_FIND_REQUIRED )
+       ENDIF ( GTHREAD2_LIBRARIES AND GTHREAD2_INCLUDE_DIRS )
+ENDIF( NOT GTHREAD2_FOUND AND NOT PKG_CONFIG_FOUND )
+
+MARK_AS_ADVANCED( GTHREAD2_LIBRARIES GTHREAD2_INCLUDE_DIRS )

diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt
index 10a34c6a32a58e155cda6e06c92f57f8d72852de..7f02d21d5a59a52ccb84ca07023c1ca5527c0a1f 100644 (file)
--- a/gtk/CMakeLists.txt
+++ b/gtk/CMakeLists.txt
@@ -77,7 +77,7 @@ set(WIRESHARK_GTK_SRC
        main_welcome.c
        manual_addr_resolv.c
        mcast_stream.c
-       menus.c
+       # menus.c
        new_packet_list.c
        packet_history.c
        packet_list_store.c
@@ -150,7 +150,6 @@ set(WIRESHARK_TAP_SRC
        fc_stat.c
        flow_graph.c
        funnel_stat.c
-       gsm_a_stat.c
        gsm_map_stat.c
        gsm_map_summary.c
        gtp_stat.c
@@ -224,6 +223,11 @@ if (UI_MANAGER)
                -DMAIN_MENU_USE_UIMANAGER=1
        )
 endif()
+if (WANT_PACKET_EDITOR)
+       add_definitions(
+               -DWANT_PACKET_EDITOR=1
+       )
+endif()
 
 register_tap_files(wireshark-tap-register.c
        ${WIRESHARK_TAP_SRC}
@@ -231,6 +235,8 @@ register_tap_files(wireshark-tap-register.c
 
 add_library(ui STATIC
        ${WIRESHARK_GTK_SRC}
+       gsm_a_stat.c
+       menus.c
        ${WIRESHARK_TAP_SRC}
        wireshark-tap-register.c
 )