Qt: About dialog updates.

[metze/wireshark/wip.git] / ui / CMakeLists.txt

diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index f611c7da164238d683b7b5561eb266c114dc1b52..9c2bb03584faafdd4abd511d545b2e3c68425fcf 100644 (file)
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@@ -19,39 +19,42 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-
 set(COMMON_UI_SRC
        alert_box.c
        capture.c
        capture_ui_utils.c
+       commandline.c
        console.c
        decode_as_utils.c
-       export_object.c
-       export_object_dicom.c
-       export_object_http.c
-       export_object_smb.c
-       export_object_tftp.c
-       filters.c
-       follow.c
+       dissect_opts.c
+       export_object_ui.c
+       export_pdu_ui_utils.c
        help_url.c
+       failure_message.c
+       filter_files.c
+       firewall_rules.c
+       iface_toolbar.c
        iface_lists.c
        io_graph_item.c
        language.c
        mcast_stream.c
        packet_list_utils.c
+       packet_range.c
        persfilepath_opt.c
        preference_utils.c
        profile.c
        proto_hier_stats.c
        recent.c
+       rtp_media.c
        rtp_stream.c
        service_response_time.c
        software_update.c
        ssl_key_export.c
        tap_export_pdu.c
+       tap-iax2-analysis.c
        tap-rtp-common.c
        tap-sctp-analysis.c
-       tap-sequence-analysis.c
+       tap-rlc-graph.c
        tap-tcp-stream.c
        text_import.c
        time_shift.c
@@ -62,13 +65,13 @@ set(COMMON_UI_SRC
 
 # Enables visibility in IDEs
 file(GLOB EXTRA_UI_HEADERS
-       rtp_analysis.h
+       rtp_media.h
        rtp_stream.h
+       tap-iax2-analysis.h
+       tap-rtp-analysis.h
 )
 
-set(DIRTY_UI_SRC)
-
-add_lex_files(DIRTY_UI_SRC
+add_lex_files(LEX_FILES GENERATED_FILES
        text_import_scanner.l
 )
 
@@ -76,19 +79,62 @@ set(CLEAN_FILES
        ${COMMON_UI_SRC}
 )
 
-if (WERROR)
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS -Werror
-       )
-endif()
+set_source_files_properties(
+       ${CLEAN_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 
 add_library(ui STATIC
        ${COMMON_UI_SRC}
-       ${DIRTY_UI_SRC}
+       ${GENERATED_FILES}
+)
+
+set_target_properties(ui PROPERTIES
+       LINK_FLAGS "${WS_LINK_FLAGS}"
+       FOLDER "UI"
+)
+
+add_executable(make-taps make-taps.c)
+# wsutil is only required for glib-compat.c
+target_link_libraries(make-taps ${GLIB2_LIBRARIES} wsutil)
+
+if (HTML_HELP_COMPILER)
+       add_definitions(-DHHC_DIR)
+       target_link_libraries(ui Htmlhelp.lib)
+endif()
+
+CHECKAPI(
+       NAME
+         ui-base
+       SWITCHES
+         -g deprecated-gtk
+       SOURCES
+         ${COMMON_UI_SRC}
+# LEX files commented out due to use of malloc, free etc.
+#        ${LEX_FILES}
+)
+CHECKAPI(
+       NAME
+         ui-todo
+       SWITCHES
+         -M -g deprecated-gtk-todo
+       SOURCES
+         ${COMMON_UI_SRC}
+# LEX files commented out due to use of malloc, free etc.
+#        ${LEX_FILES}
 )
 
-set_target_properties(ui PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
-set_target_properties(ui PROPERTIES FOLDER "UI")
+#
+# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+#
+# Local variables:
+# c-basic-offset: 8
+# tab-width: 8
+# indent-tabs-mode: t
+# End:
+#
+# vi: set shiftwidth=8 tabstop=8 noexpandtab:
+# :indentSize=8:tabSize=8:noTabs=false:
+#