From Pascal Quantin:

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c611d18225c4b0d517d543d97134aebbb274d91..bbbaffa7e944e3982f1cabe90027d6a0135fde35 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -228,7 +228,7 @@ endif()
 # - set HAVE_XXX
 
 #The minimum package list
-set(PACKAGELIST GLIB2 GMODULE2 GTHREAD2 M LEX YACC Perl SH PythonInterp)
+set(PACKAGELIST GLIB2 GMODULE2 GTHREAD2 M LEX YACC Perl SH)
 set(GLIB2_FIND_REQUIRED)
 set(GLIB2_MIN_VERSION 2.14.0)
 set(GTHREAD2_REQUIRED)
@@ -338,7 +338,7 @@ endforeach()
 #packaging
 include(CPackConfig.txt)
 
-if(HAVE_LIBPYTHON)
+if(PYTHON_FOUND)
        set(HAVE_PYTHON 1)
        set(PYTHON_DIR "${CMAKE_INSTALL_PREFIX}/lib/wireshark/python/${CPACK_PACKAGE_VERSION}")
 endif()
@@ -422,7 +422,7 @@ add_subdirectory( wiretap )
 add_subdirectory( wsutil )
 
 if(BUILD_wireshark AND GTK_FOUND)
-       add_subdirectory( gtk )
+       add_subdirectory( ui/gtk )
 endif()
 
 # Basedir where to install guides
@@ -470,7 +470,7 @@ PRINT_ENABLED_FEATURES()
 PRINT_DISABLED_FEATURES()
 
 link_directories(
-       ${CMAKE_BINARY_DIR}/gtk
+       ${CMAKE_BINARY_DIR}/ui/gtk
        ${CMAKE_BINARY_DIR}/codecs
        ${CMAKE_BINARY_DIR}/epan
        ${CMAKE_BINARY_DIR}/wiretap
@@ -671,6 +671,7 @@ if(BUILD_wireshark AND GTK_FOUND)
                g711.c
                merge.c
                proto_hier_stats.c
+               recent.c
                summary.c
                tempfile.c
                u3.c
@@ -824,7 +825,7 @@ if(BUILD_editcap)
        )
        set(editcap_FILES
                editcap.c
-               epan/crypt/crypt-md5.c
+               epan/crypt/md5.c
                epan/nstime.c
                ${WTAP_PLUGIN_SOURCES}
        )