Add some debugging output to help track down an intermittent problem on

[obnox/wireshark/wip.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09100d7fd1f2d1727dc080fa095900921a97853b..0c611d18225c4b0d517d543d97134aebbb274d91 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -161,6 +161,7 @@ endif()
 add_definitions(
        -DHAVE_CONFIG_H
        -DG_DISABLE_DEPRECATED
+       -DG_DISABLE_SINGLE_INCLUDES
 )
 
 # Counterhack to work around some cache magic in CHECK_C_SOURCE_COMPILES
@@ -181,7 +182,7 @@ endforeach()
 if(NOT DISABLE_WERROR AND NOT ENABLE_EXTRA_GCC_CHECKS)
        check_c_compiler_flag(-Werror WERROR)
 else()
-       set(WERROR 0)
+       unset(WERROR)
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCC)
@@ -227,33 +228,29 @@ endif()
 # - set HAVE_XXX
 
 #The minimum package list
-set(PACKAGELIST GLIB2 GMODULE2 PCAP M LEX YACC Perl SH PythonInterp)
+set(PACKAGELIST GLIB2 GMODULE2 GTHREAD2 M LEX YACC Perl SH PythonInterp)
 set(GLIB2_FIND_REQUIRED)
 set(GLIB2_MIN_VERSION 2.14.0)
+set(GTHREAD2_REQUIRED)
 set(PCAP_REQUIRED)
 set(M_REQUIRED)
 
 set(PACKAGELIST ${PACKAGELIST} HtmlViewer)
 
+if(ENABLE_PCAP)
+       set(PACKAGELIST ${PACKAGELIST} PCAP)
+endif()
+
 #Build the gui ?
 if(BUILD_wireshark)
        if(ENABLE_GTK3)
                set(PACKAGELIST ${PACKAGELIST} GTK3)
-               set(ENABLE_UI_MANAGER ON)
        else()
                set(PACKAGELIST ${PACKAGELIST} GTK2)
                set(GTK2_OPTIONS COMPONENTS gtk)
                set(GTK2_FIND_VERSION 2.12)
                set(GTK2_DEBUG false)
        endif()
-       if(ENABLE_THREADS)
-               set(PACKAGELIST ${PACKAGELIST} GTHREAD2)
-       endif()
-endif()
-
-if(BUILD_dumpcap)
-       set(PACKAGELIST ${PACKAGELIST} GTHREAD2)
-       set(GHTREAD2_REQUIRED)
 endif()
 
 # SMI SNMP
@@ -426,9 +423,6 @@ add_subdirectory( wsutil )
 
 if(BUILD_wireshark AND GTK_FOUND)
        add_subdirectory( gtk )
-       if (ENABLE_UI_MANAGER)
-               set(MAIN_MENU_USE_UIMANAGER 1)
-       endif()
 endif()
 
 # Basedir where to install guides
@@ -443,10 +437,6 @@ if(ENABLE_PCAP_NG_DEFAULT)
        set(PCAP_NG_DEFAULT 1)
 endif()
 
-if(ENABLE_THREADS)
-       set(USE_THREADS 1)
-endif()
-
 #Platform specific
 if(UNIX)
        set(WS_VAR_IMPORT "extern")
@@ -505,10 +495,6 @@ ADD_CUSTOM_COMMAND(
                ${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl
 )
 
-register_tap_files(tshark-tap-register.c
-       ${TSHARK_TAP_SRC}
-)
-
 ADD_CUSTOM_COMMAND(
        OUTPUT  ps.c
        COMMAND ${PYTHON_EXECUTABLE}
@@ -539,7 +525,6 @@ set(WTAP_PLUGIN_SOURCES
 )
 
 set(SHARK_COMMON_CAPTURE_SRC
-       capture_errs.c
        capture_ifinfo.c
        capture_ui_utils.c
 )
@@ -572,6 +557,7 @@ set(TSHARK_TAP_SRC
        tap-comparestat.c
        tap-dcerpcstat.c
        tap-diameter-avp.c
+       tap-expert.c
        tap-funnel.c
        tap-gsm_astat.c
        tap-h225counter.c
@@ -698,6 +684,10 @@ if(BUILD_wireshark AND GTK_FOUND)
        install(TARGETS wireshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
 
+register_tap_files(tshark-tap-register.c
+       ${TSHARK_TAP_SRC}
+)
+
 if(BUILD_tshark)
        set(tshark_LIBS
                ${LIBEPAN_LIBS}