git.samba.org / metze / wireshark / wip.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
BAT has a Bouquet ID, no Service ID
[metze/wireshark/wip.git] / CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0a9b3945a1295624c9f6516377187f0915a646f..eed6201f1b7dd1a6d5ed5ad8a970766f0eaf1757 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -204,8 +204,12 @@ else()
     # With clang some tests don't fail properly during testing but only
     # during real compiles
 
-    if(NOT CMAKE_C_COMPILER_ID MATCHES "Clang")
-
+    if(CMAKE_C_COMPILER_ID MATCHES "Clang")
+        set(WIRESHARK_C_FLAGS ${WIRESHARK_C_FLAGS}
+            -Qunused-arguments
+            #-fcolor-diagnostics
+        )
+    else()
         set(WIRESHARK_C_FLAGS ${WIRESHARK_C_FLAGS}
             -fexcess-precision=fast
         )
@@ -284,9 +288,10 @@ endif()
 
 
 if( CMAKE_C_COMPILER_ID MATCHES "MSVC")
-       set(WIRESHARK_LD_FLAGS
-               /LARGEADDRESSAWARE
-       )
+       # Set in Makefile.nmake but doesn't seem to have any effect
+       # set(WIRESHARK_LD_FLAGS
+       #       /LARGEADDRESSAWARE
+       # )
 else()
        set(WIRESHARK_LD_FLAGS
                -Wl,--as-needed
@@ -333,7 +338,7 @@ endif()
 # - set HAVE_XXX
 
 #The minimum package list
-set(PACKAGELIST GLIB2 GMODULE2 GTHREAD2 M LEX YACC Perl SH PythonInterp)
+set(PACKAGELIST Gettext GLIB2 GMODULE2 GTHREAD2 M LEX YACC Perl SH PythonInterp)
 set(GLIB2_FIND_REQUIRED)
 set(GLIB2_MIN_VERSION 2.14.0)
 set(GTHREAD2_REQUIRED)
@@ -374,7 +379,7 @@ if(BUILD_qtshark)
                # Untested, may not work if CMAKE_PREFIX_PATH gets overwritten
                # somewhere. The if WIN32 in this place is annoying as well.
                if( WIN32 )
-                       set( QT5_BASE_PATH "$ENV{QT5_BASE_PATH}" )
+                       set( QT5_BASE_PATH "$ENV{QT5_BASE_DIR}" )
                        set( CMAKE_PREFIX_PATH "${QT5_BASE_PATH}\\msvc2010" )
                        set( QT5_DLL_PATH "${CMAKE_PREFIX_PATH}/bin/dummy" )
                        set( WS_ALL_LIBS ${WS_ALL_LIBS} ${QT5_DLL_PATH} )
@@ -384,16 +389,6 @@ if(BUILD_qtshark)
                # set(Qt4_OPTIONS 4.7.1 REQUIRED QtCore QtGui)
                set(QT_VERSION 4)
        endif()
-
-       # We need GTK includes to compile Qt version thanks to
-       # ui/win32/file_dlg_win32.c
-       if (WIN32)
-               if(ENABLE_GTK3)
-                       set(PACKAGELIST ${PACKAGELIST} GTK3)
-               else()
-                       set(PACKAGELIST ${PACKAGELIST} GTK2)
-               endif()
-       endif()
 endif()
 
 # SMI SNMP
@@ -571,6 +566,8 @@ test_big_endian(WORDS_BIGENDIAN)
 
 set(DATAFILE_DIR "${CMAKE_INSTALL_PREFIX}/share/${CPACK_PACKAGE_NAME}")
 
+SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
+
 if(ENABLE_PLUGINS)
        set(HAVE_PLUGINS 1)
        set(PLUGIN_DIR="${DATAFILE_DIR}/plugins/${CPACK_PACKAGE_VERSION}")
@@ -644,6 +641,8 @@ endif()
 include(gmxTestLargeFiles)
 gmx_test_large_files(GMX_LARGEFILES)
 
+add_definitions( -DTOP_SRCDIR=\"${CMAKE_SOURCE_DIR}\" )
+
 if(APPLE)
        #
        # We assume that APPLE means OS X so that we have the OS X
@@ -700,6 +699,7 @@ ADD_CUSTOM_TARGET(
        DEPENDS
                ${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl
 )
+set_target_properties(svnversion PROPERTIES FOLDER "Auxiliary")
 
 ADD_CUSTOM_COMMAND(
        OUTPUT  svnversion.h
@@ -894,6 +894,7 @@ if(BUILD_wireshark AND GTK_FOUND)
        add_executable(wireshark ${wireshark_FILES})
        add_dependencies(wireshark svnversion)
        set_target_properties(wireshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
+       set_target_properties(wireshark PROPERTIES FOLDER "Executables")
        target_link_libraries(wireshark ${wireshark_LIBS})
        install(TARGETS wireshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -916,11 +917,13 @@ if(BUILD_qtshark AND QT_FOUND)
        add_executable(qtshark ${wireshark_FILES})
        add_dependencies(qtshark svnversion)
        set_target_properties(qtshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
+       set_target_properties(qtshark PROPERTIES FOLDER "Executables")
        target_link_libraries(qtshark ${qtshark_LIBS})
        install(TARGETS qtshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
 
 register_tap_files(tshark-tap-register.c
+        tshark-taps
        ${TSHARK_TAP_SRC}
 )
 
@@ -943,6 +946,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 FOLDER "Executables")
        target_link_libraries(tshark ${tshark_LIBS})
        install(TARGETS tshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -961,6 +965,7 @@ if(BUILD_rawshark AND PCAP_FOUND)
        add_executable(rawshark ${rawshark_FILES})
        add_dependencies(rawshark svnversion)
        set_target_properties(rawshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
+       set_target_properties(rawshark PROPERTIES FOLDER "Executables")
        target_link_libraries(rawshark ${rawshark_LIBS})
        install(TARGETS rawshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -975,6 +980,7 @@ if(BUILD_dftest)
        )
        add_executable(dftest ${dftest_FILES})
        set_target_properties(dftest PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
+       set_target_properties(dftest PROPERTIES FOLDER "Executables")
        target_link_libraries(dftest ${dftest_LIBS})
        install(TARGETS dftest RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -982,6 +988,7 @@ endif()
 if(BUILD_randpkt)
        set(randpkt_LIBS
                wiretap
+               wsutil
                ${M_LIBRARIES}
                ${PCAP_LIBRARIES}
 #              @SOCKET_LIBS@
@@ -995,6 +1002,7 @@ if(BUILD_randpkt)
        )
        add_executable(randpkt ${randpkt_FILES})
        set_target_properties(randpkt PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
+       set_target_properties(randpkt PROPERTIES FOLDER "Executables")
        target_link_libraries(randpkt ${randpkt_LIBS})
        install(TARGETS randpkt RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -1018,6 +1026,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 FOLDER "Executables")
        target_link_libraries(text2pcap ${text2pcap_LIBS})
        install(TARGETS text2pcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -1036,6 +1045,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 FOLDER "Executables")
        target_link_libraries(mergecap ${mergecap_LIBS})
        install(TARGETS mergecap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -1054,6 +1064,7 @@ if(BUILD_reordercap)
        add_executable(reordercap ${reordercap_FILES})
        add_dependencies(reordercap svnversion)
        set_target_properties(reordercap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
+       set_target_properties(reordercap PROPERTIES FOLDER "Executables")
        target_link_libraries(reordercap ${reordercap_LIBS})
        install(TARGETS reordercap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -1073,6 +1084,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 FOLDER "Executables")
        target_link_libraries(capinfos ${capinfos_LIBS})
        install(TARGETS capinfos RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -1090,6 +1102,7 @@ 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 FOLDER "Executables")
        target_link_libraries(editcap ${editcap_LIBS})
        install(TARGETS editcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -1127,6 +1140,7 @@ if(BUILD_dumpcap AND PCAP_FOUND)
        add_executable(dumpcap ${dumpcap_FILES})
        add_dependencies(dumpcap svnversion)
        set_target_properties(dumpcap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
+       set_target_properties(dumpcap PROPERTIES FOLDER "Executables")
        target_link_libraries(dumpcap ${dumpcap_LIBS})
        install(TARGETS dumpcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -1199,6 +1213,7 @@ add_custom_target(
                wireshark.html
                wireshark-filter.html
 )
+set_target_properties(auxiliary PROPERTIES FOLDER "Docs")
 
 set(MAN1_FILES
        ${CMAKE_BINARY_DIR}/capinfos.1
Unnamed repository; edit this file to name it for gitweb.