Do case insensitive search for lua scripts to load.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e8329825cd8822d3a5caf6092e17dd7fda9c3fa..6b05c78765049327abed847b444ef3a9c074b0b6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,9 +27,11 @@ 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)
+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)
+endif(COMMAND cmake_policy)
 
 # set(PROJECT_VERSION "1.3.4-rc5")
 # set(PROJECT_VERSION "1.3.4rc5")
@@ -158,6 +160,7 @@ endif()
 
 add_definitions(
        -DHAVE_CONFIG_H
+       -DG_DISABLE_DEPRECATED
 )
 
 # Counterhack to work around some cache magic in CHECK_C_SOURCE_COMPILES
@@ -236,7 +239,7 @@ set(PACKAGELIST ${PACKAGELIST} HtmlViewer)
 if(BUILD_wireshark)
        if(ENABLE_GTK3)
                set(PACKAGELIST ${PACKAGELIST} GTK3)
-               set(UI_MANAGER ON)
+               set(ENABLE_UI_MANAGER ON)
        else()
                set(PACKAGELIST ${PACKAGELIST} GTK2)
                set(GTK2_OPTIONS COMPONENTS gtk)
@@ -268,18 +271,13 @@ if(ENABLE_GNUTLS)
        set(PACKAGELIST ${PACKAGELIST} GNUTLS)
 endif()
 
-# Regular expressions lib
-if(ENABLE_PCRE)
-       set(PACKAGELIST ${PACKAGELIST} PCRE)
-endif()
-
 # Kerberos
 if(ENABLE_KERBEROS)
        set(PACKAGELIST ${PACKAGELIST} KERBEROS)
 endif()
 
 # Portable audio
-if(ENABLE_PORTAUDIO)
+if(ENABLE_PORTAUDIO AND NOT ENABLE_GTK3)
        set(PACKAGELIST ${PACKAGELIST} PORTAUDIO)
 endif()
 
@@ -428,6 +426,9 @@ add_subdirectory( wsutil )
 
 if(BUILD_wireshark AND GTK_FOUND)
        add_subdirectory( gtk )
+       if (ENABLE_UI_MANAGER)
+               set(MAIN_MENU_USE_UIMANAGER 1)
+       endif()
 endif()
 
 # Basedir where to install guides
@@ -644,7 +645,6 @@ set(LIBEPAN_LIBS
 #              @SSL_LIBS@      # -lcrypto
                epan
 #              $(plugin_ldadd) # in case of static
-               ${PCRE_LIBRARIES}
                ${PCAP_LIBRARIES}
                ${CARES_LIBRARIES}
                ${ADNS_LIBRARIES}