OK, does it matter in which order "extern" and "declspec" appear?

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f4aed29ad2b0645d4d49597dedd49718e75a31a..afbcbf2efd1603e8f8a5edd1833fd1e6c8835865 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,11 +27,29 @@ cmake_minimum_required(VERSION 2.6)
 set(CMAKE_BACKWARDS_COMPATIBILITY 2.6)
 
 # Needs to be set after cmake_minimum_required or cmake_policy(VERSION)
-if(COMMAND cmake_policy)
-       # Backward compatibility for versions < 2.6.3
-       cmake_policy(SET CMP0011 OLD)
-#      cmake_policy(SET CMP0015 NEW)
-endif(COMMAND cmake_policy)
+# Policy since 2.6.1
+cmake_policy(SET CMP0008 NEW)
+# Policy since 2.6.3
+# Backward compatibility for versions < 2.6.3
+cmake_policy(SET CMP0011 OLD)
+# Policy since 2.8.1
+#cmake_policy(SET CMP0015 NEW)
+# Policy since 2.8.11
+if( ${CMAKE_MAJOR_VERSION} GREATER 2 OR
+    ${CMAKE_MINOR_VERSION} GREATER 8 OR
+    (${CMAKE_MINOR_VERSION} EQUAL 8 AND ${CMAKE_PATCH_VERSION} GREATER 10) )
+       # Don't: Automatically link Qt executable to qtmain target on Windows
+       cmake_policy(SET CMP0020 OLD)
+endif()
+
+# This cannot be implemented via option(...)
+if( NOT CMAKE_BUILD_TYPE )
+  set( CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
+      "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
+      FORCE)
+endif()
+message(STATUS "Configuration types: ${CMAKE_CONFIGURATION_TYPES}")
+message(STATUS "${CMAKE_BUILD_TYPE}: ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
 
 # set(PROJECT_MAJOR_VERSION 1)
 # set(PROJECT_MINOR_VERSION 9)
@@ -146,8 +164,7 @@ if( CMAKE_C_COMPILER_ID MATCHES "MSVC")
     )
 else()
     set(WIRESHARK_C_FLAGS
-        -O2
-        -g
+       # -O<X> and -g get set by the CMAKE_BUILD_TYPE
         -Wall
         -W
         -Wextra
@@ -204,8 +221,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,6 +305,7 @@ endif()
 
 
 if( CMAKE_C_COMPILER_ID MATCHES "MSVC")
+       # Set in Makefile.nmake
        set(WIRESHARK_LD_FLAGS
                /LARGEADDRESSAWARE
        )
@@ -333,7 +355,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 SED SH PythonInterp)
 set(GLIB2_FIND_REQUIRED)
 set(GLIB2_MIN_VERSION 2.14.0)
 set(GTHREAD2_REQUIRED)
@@ -451,7 +473,6 @@ set(PACKAGELIST ${PACKAGELIST} YAPP)
 
 set(PACKAGELIST ${PACKAGELIST} POD)
 
-
 set(PROGLIST text2pcap mergecap capinfos editcap reordercap dumpcap)
 
 #Sort the package list
@@ -561,6 +582,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}")
@@ -634,6 +657,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
@@ -690,6 +715,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
@@ -884,6 +910,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()
@@ -906,11 +933,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}
 )
 
@@ -933,6 +962,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()
@@ -951,6 +981,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()
@@ -965,6 +996,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()
@@ -972,6 +1004,7 @@ endif()
 if(BUILD_randpkt)
        set(randpkt_LIBS
                wiretap
+               wsutil
                ${M_LIBRARIES}
                ${PCAP_LIBRARIES}
 #              @SOCKET_LIBS@
@@ -985,6 +1018,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()
@@ -1008,6 +1042,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()
@@ -1026,6 +1061,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()
@@ -1044,6 +1080,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()
@@ -1063,6 +1100,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()
@@ -1080,6 +1118,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()
@@ -1117,6 +1156,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()
@@ -1189,6 +1229,7 @@ add_custom_target(
                wireshark.html
                wireshark-filter.html
 )
+set_target_properties(auxiliary PROPERTIES FOLDER "Docs")
 
 set(MAN1_FILES
        ${CMAKE_BINARY_DIR}/capinfos.1