For the Windows Open dialog for capture files, get rid of the "(*.*)" in

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 50ade08fb74b5df21c2ec40cf9f083fdc40d1bf3..2991099b1f0fc75915d910d01e95f4789d510599 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -215,6 +215,7 @@ foreach(THIS_FLAG ${WIRESHARK_C_FLAGS})
        set(F WS_C_FLAG_${C})
        set(${F} ${THIS_FLAG})
        set(V WS_C_FLAG_VALID${C})
+       message(STATUS "Checking for flag: ${${F}}")
        check_c_compiler_flag(${${F}} ${V})
        if (${${V}})
                set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${${F}}")
@@ -227,6 +228,7 @@ foreach(THIS_FLAG ${WIRESHARK_C_ONLY_FLAGS})
        set(F WS_C_FLAG_${C})
        set(${F} ${THIS_FLAG})
        set(V WS_C_FLAG_VALID${C})
+       message(STATUS "Checking for flag: ${${F}}")
        check_c_compiler_flag(${${F}} ${V})
        if (${${V}})
                set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${${F}}")
@@ -293,6 +295,7 @@ set(GTHREAD2_REQUIRED)
 set(PCAP_REQUIRED)
 set(M_REQUIRED)
 set(PythonInterp_FIND_VERSION 2)
+set(Python_ADDITIONAL_VERSIONS 3)
 
 set(PACKAGELIST ${PACKAGELIST} HtmlViewer)
 
@@ -528,6 +531,7 @@ add_subdirectory( asn1 EXCLUDE_FROM_ALL )
 add_subdirectory( codecs )
 add_subdirectory( epan )
 add_subdirectory( tools/lemon )
+add_subdirectory( ui )
 add_subdirectory( wiretap )
 add_subdirectory( wsutil )
 
@@ -537,10 +541,6 @@ if(ENABLE_ECHLD)
        add_subdirectory( echld )
 endif()
 
-if((BUILD_wireshark AND GTK_FOUND) OR (BUILD_qtshark AND QT_FOUND))
-       add_subdirectory( ui )
-endif()
-
 if(BUILD_wireshark AND GTK_FOUND)
        add_subdirectory( ui/gtk )
 endif()
@@ -943,6 +943,7 @@ if(BUILD_mergecap)
        set(mergecap_LIBS
                wiretap
                ${ZLIB_LIBRARIES}
+               ${CMAKE_DL_LIBS}
        )
        set(mergecap_FILES
                mergecap.c
@@ -960,6 +961,7 @@ if(BUILD_reordercap)
        set(reordercap_LIBS
                wiretap
                ${ZLIB_LIBRARIES}
+               ${CMAKE_DL_LIBS}
        )
        set(reordercap_FILES
                reordercap.c
@@ -979,6 +981,7 @@ if(BUILD_capinfos)
                wsutil
                ${ZLIB_LIBRARIES}
                ${GCRYPT_LIBRARIES}
+               ${CMAKE_DL_LIBS}
        )
        set(capinfos_FILES
                capinfos.c
@@ -995,10 +998,10 @@ if(BUILD_editcap)
        set(editcap_LIBS
                wiretap
                ${ZLIB_LIBRARIES}
+               ${CMAKE_DL_LIBS}
        )
        set(editcap_FILES
                editcap.c
-               epan/crypt/md5.c
                ${WTAP_PLUGIN_SOURCES}
        )
        add_executable(editcap ${editcap_FILES})