As suggested by Anders: back out 37112.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10cc896414943700a7e8b2936adaaf738d42399e..1364f7c5621c68af6e353c0fb40414eb0a9d481d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -155,7 +155,6 @@ endif()
 add_definitions(
        -DHAVE_CONFIG_H
        -DPACKAGE=\"wireshark\"
-       -DNEW_PACKET_LIST
 )
 
 # Counterhack to work around some cache magic in CHECK_C_SOURCE_COMPILES
@@ -222,85 +221,103 @@ endif()
 # - 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)
-       set(PACKAGELIST GTK2 ${PACKAGELIST})
+       set(PACKAGELIST ${PACKAGELIST} GTK2)
        set(GTK2_OPTIONS COMPONENTS gtk)
        set(GTK2_DEBUG false)
 endif()
 
+if(BUILD_dumpcap)
+       set(PACKAGELIST ${PACKAGELIST} GTHREAD2)
+       set(GHTREAD2_REQUIRED)
+endif()
+
 # SMI SNMP
 if(ENABLE_SMI)
-       set(PACKAGELIST SMI ${PACKAGELIST})
+       set(PACKAGELIST ${PACKAGELIST} SMI)
 endif()
 
 # GNU crypto
 if(ENABLE_GCRYPT)
-       set(PACKAGELIST GCRYPT ${PACKAGELIST})
+       set(PACKAGELIST ${PACKAGELIST} GCRYPT)
 endif()
 
 # GNU SSL/TLS support
 if(ENABLE_GNUTLS)
-       set(PACKAGELIST GNUTLS ${PACKAGELIST})
+       set(PACKAGELIST ${PACKAGELIST} GNUTLS)
 endif()
 
 # Regular expressions lib
 if(ENABLE_PCRE)
-       set(PACKAGELIST PCRE ${PACKAGELIST})
+       set(PACKAGELIST ${PACKAGELIST} PCRE)
 endif()
 
 # Kerberos
 if(ENABLE_KERBEROS)
-       set(PACKAGELIST KERBEROS ${PACKAGELIST})
+       set(PACKAGELIST ${PACKAGELIST} KERBEROS)
 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
-       set(PACKAGELIST CARES ${PACKAGELIST})
+       set(PACKAGELIST ${PACKAGELIST} CARES)
 elseif(ENABLE_ADNS)     # Gnu asynchronous DNS
-       set(PACKAGELIST ADNS ${PACKAGELIST})
+       set(PACKAGELIST ${PACKAGELIST} ADNS)
 endif()
 
 # Zlib compression
 if(ENABLE_ZLIB)
-       set(PACKAGELIST ZLIB ${PACKAGELIST})
+       set(PACKAGELIST ${PACKAGELIST} ZLIB)
 endif()
 
 # Lua 5.1 dissectors
 if(ENABLE_LUA)
-       set(PACKAGELIST LUA ${PACKAGELIST})
+       set(PACKAGELIST ${PACKAGELIST} LUA)
 endif()
 
 # GeoIP address resolving
 if(ENABLE_GEOIP)
-       set(PACKAGELIST GEOIP ${PACKAGELIST})
+       set(PACKAGELIST ${PACKAGELIST} GEOIP)
 endif()
 
 # Capabilities
 if(ENABLE_CAP)
-       set(PACKAGELIST CAP ${PACKAGELIST})
+       set(PACKAGELIST ${PACKAGELIST} CAP)
 endif()
 
 if(ENABLE_PYTHON)
-       set(PACKAGELIST PYTHON ${PACKAGELIST})
+       set(PACKAGELIST ${PACKAGELIST} PYTHON)
 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})
-       else()
+       elseif(${PACKAGE}_REQUIRED)
                find_package(${PACKAGE} REQUIRED)
+       else()
+               find_package(${PACKAGE})
        endif()
        message(${PACKAGE}_FOUND)
        if (${PACKAGE}_FOUND)
@@ -311,8 +328,6 @@ foreach(PACKAGE ${PACKAGELIST})
        endif()
 endforeach()
 
-find_package(YAPP)
-
 #packaging
 include(CPackConfig.txt)
 
@@ -393,17 +408,22 @@ endforeach()
 
 add_subdirectory( codecs )
 add_subdirectory( epan )
-add_subdirectory( gtk )
 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()
 
-find_package(POD)
-
 #Platform specific
 if(UNIX)
        set(WS_VAR_IMPORT "extern")
@@ -419,19 +439,18 @@ endif()
 if(WIN32)
        add_definitions(-D_NEED_VAR_IMPORT_)
        set(WS_VAR_IMPORT "__declspec(dllimport) extern")
+       set(WS_MSVC_NORETURN "__declspec(noreturn)")
 
        # Disable deprecation
        if(MSVC80 OR MSVC90)
                add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
        endif()
+else()
+       set(WS_MSVC_NORETURN " ")
 endif()
 
 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()
@@ -508,6 +527,7 @@ set(WIRESHARK_COMMON_SRC
        cfile.c
        clopts_common.c
        disabled_protos.c
+       frame_data_sequence.c
        packet-range.c
        print.c
        ps.c
@@ -534,6 +554,8 @@ set(TSHARK_TAP_SRC
        tap-h225counter.c
        tap-h225rassrt.c
        tap-httpstat.c
+       tap-icmpstat.c
+       tap-icmpv6stat.c
        tap-iostat.c
        tap-iousers.c
        tap-mgcpstat.c
@@ -556,6 +578,7 @@ set(TSHARK_TAP_SRC
 
 set(INSTALL_DIRS
        diameter
+       docbook
        dtds
        help
        radius
@@ -609,7 +632,7 @@ set(LIBEPAN_LIBS
                ${M_LIBRARIES}
 )
 
-if(BUILD_wireshark)
+if(BUILD_wireshark AND GTK2_FOUND)
        set(wireshark_LIBS
                ui
                ${GTK2_LIBRARIES}
@@ -635,12 +658,13 @@ if(BUILD_wireshark)
                proto_hier_stats.c
                summary.c
                tempfile.c
+               u3.c
                ${SHARK_COMMON_CAPTURE_SRC}
                ${WIRESHARK_COMMON_SRC}
        )
        add_executable(wireshark ${wireshark_FILES})
        add_dependencies(wireshark svnversion)
-       set_target_properties(wireshark PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+       set_target_properties(wireshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
        target_link_libraries(wireshark ${wireshark_LIBS})
        install(TARGETS wireshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -662,7 +686,7 @@ if(BUILD_tshark)
        )
        add_executable(tshark ${tshark_FILES})
        add_dependencies(tshark svnversion)
-       set_target_properties(tshark PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+       set_target_properties(tshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
        target_link_libraries(tshark ${tshark_LIBS})
        install(TARGETS tshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -678,7 +702,7 @@ if(BUILD_rawshark)
        )
        add_executable(rawshark ${rawshark_FILES})
        add_dependencies(rawshark svnversion)
-       set_target_properties(rawshark PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+       set_target_properties(rawshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
        target_link_libraries(rawshark ${rawshark_LIBS})
        install(TARGETS rawshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -692,7 +716,7 @@ if(BUILD_dftest)
                util.c
        )
        add_executable(dftest ${dftest_FILES})
-       set_target_properties(dftest PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+       set_target_properties(dftest PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
        target_link_libraries(dftest ${dftest_LIBS})
        install(TARGETS dftest RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -712,7 +736,7 @@ if(BUILD_randpkt)
                randpkt.c
        )
        add_executable(randpkt ${randpkt_FILES})
-       set_target_properties(randpkt PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+       set_target_properties(randpkt PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
        target_link_libraries(randpkt ${randpkt_LIBS})
        install(TARGETS randpkt RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -734,7 +758,7 @@ if(BUILD_text2pcap)
        )
        add_executable(text2pcap ${text2pcap_FILES})
        add_dependencies(text2pcap svnversion)
-       set_target_properties(text2pcap PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+       set_target_properties(text2pcap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
        target_link_libraries(text2pcap ${text2pcap_LIBS})
        install(TARGETS text2pcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -751,7 +775,7 @@ if(BUILD_mergecap)
        )
        add_executable(mergecap ${mergecap_FILES})
        add_dependencies(mergecap svnversion)
-       set_target_properties(mergecap PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+       set_target_properties(mergecap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
        target_link_libraries(mergecap ${mergecap_LIBS})
        install(TARGETS mergecap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -769,7 +793,7 @@ if(BUILD_capinfos)
        )
        add_executable(capinfos ${capinfos_FILES})
        add_dependencies(capinfos svnversion)
-       set_target_properties(capinfos PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+       set_target_properties(capinfos PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
        target_link_libraries(capinfos ${capinfos_LIBS})
        install(TARGETS capinfos RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -787,19 +811,21 @@ if(BUILD_editcap)
        )
        add_executable(editcap ${editcap_FILES})
        add_dependencies(editcap svnversion)
-       set_target_properties(editcap PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+       set_target_properties(editcap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
        target_link_libraries(editcap ${editcap_LIBS})
        install(TARGETS editcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
 
 if(BUILD_dumpcap)
        set(dumpcap_LIBS
-               wiretap
 #              @INET_NTOP_LO@
+               wsutil
                ${PCAP_LIBRARIES}
                ${CAP_LIBRARIES}
 #              @SOCKET_LIBS@
 #              @NSL_LIBS@
+               ${GLIB2_LIBRARIES}
+               ${GTHREAD2_LIBRARIES}
                ${ZLIB_LIBRARIES}
                ${APPLE_COCOA_LIBRARY}
        )
@@ -820,18 +846,18 @@ if(BUILD_dumpcap)
        )
        add_executable(dumpcap ${dumpcap_FILES})
        add_dependencies(dumpcap svnversion)
-       set_target_properties(dumpcap PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+       set_target_properties(dumpcap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
        target_link_libraries(dumpcap ${dumpcap_LIBS})
        install(TARGETS dumpcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
 
 ADD_CUSTOM_COMMAND(
-       OUTPUT  AUTHORS-SHORT
+       OUTPUT  ${CMAKE_BINARY_DIR}/AUTHORS-SHORT
        COMMAND ${PERL}
                ${CMAKE_SOURCE_DIR}/doc/perlnoutf.pl
                ${CMAKE_SOURCE_DIR}/doc/make-authors-short.pl
                < ${CMAKE_SOURCE_DIR}/AUTHORS
-               > AUTHORS-SHORT
+               > ${CMAKE_BINARY_DIR}/AUTHORS-SHORT
        DEPENDS
                ${CMAKE_SOURCE_DIR}/doc/perlnoutf.pl
                ${CMAKE_SOURCE_DIR}/doc/make-authors-short.pl
@@ -839,21 +865,21 @@ ADD_CUSTOM_COMMAND(
 )
 
 ADD_CUSTOM_COMMAND(
-       OUTPUT  AUTHORS-SHORT-FORMAT
-               wireshark.pod
+       OUTPUT  ${CMAKE_BINARY_DIR}/AUTHORS-SHORT-FORMAT
+               ${CMAKE_BINARY_DIR}/wireshark.pod
        COMMAND ${PERL}
                ${CMAKE_SOURCE_DIR}/doc/perlnoutf.pl
                ${CMAKE_SOURCE_DIR}/doc/make-authors-format.pl
-               < AUTHORS-SHORT
-               > AUTHORS-SHORT-FORMAT
+               < ${CMAKE_BINARY_DIR}/AUTHORS-SHORT
+               > ${CMAKE_BINARY_DIR}/AUTHORS-SHORT-FORMAT
        COMMAND cat
                ${CMAKE_SOURCE_DIR}/doc/wireshark.pod.template
-               AUTHORS-SHORT-FORMAT
-               > wireshark.pod
+               ${CMAKE_BINARY_DIR}/AUTHORS-SHORT-FORMAT
+               > ${CMAKE_BINARY_DIR}/wireshark.pod
        DEPENDS
                ${CMAKE_SOURCE_DIR}/doc/perlnoutf.pl
                ${CMAKE_SOURCE_DIR}/doc/make-authors-format.pl
-               AUTHORS-SHORT
+               ${CMAKE_BINARY_DIR}/AUTHORS-SHORT
                ${CMAKE_SOURCE_DIR}/doc/wireshark.pod.template
 )