Copy behaviour of

http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=34145
to cmake.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34205 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3516a508216d785a31babb5e3a2db001451c7c4e..6bc3ae7cd2a243a90fbe57f7612a464c22f047d2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -155,7 +155,6 @@ endif()
 add_definitions(
        -DHAVE_CONFIG_H
        -DPACKAGE=\"wireshark\"
-       -DNEW_PACKET_LIST
 )
 
 # Counterhack to work around some cache magic in CHECK_C_SOURCE_COMPILES

diff --git a/CMakeOptions.txt b/CMakeOptions.txt
index e26e2510c76c42b707390de68119346353a0b6c2..910dc470434573a8fa6a0fc1915e6c40a6dbeff2 100644 (file)
--- a/CMakeOptions.txt
+++ b/CMakeOptions.txt
@@ -15,6 +15,7 @@ option(BUILD_dftest      "Build dftest" ON)
 option(AUTOGEN_dcerpc    "Autogenerate dcerpc dissectors" OFF)
 option(AUTOGEN_pidl      "Autogenerate pidl dissectors" OFF)
 
+option(NEW_PACKET_LIST   "Compile with new packet list code" ON)
 option(DISABLE_WERROR   "Do not treat Warnings as errors" OFF)
 option(ENABLE_EXTRA_GCC_CHECKS "Do additional -W checks in GCC (disables -Werror)" OFF)
 option(ENABLE_AIRPCAP   "Enable Airpcap support" ON)

diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index 77c562b06189bd040cfa6140487d13a273d16cb2..d739c4217436b866d544c3620da60ffd88a1107f 100644 (file)
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -15,6 +15,9 @@
 /* Directory where plugins reside */
 #define PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION}"
 
+/* Define to 1 if we want to enable plugins */
+#cmakedefine NEW_PACKET_LIST 1
+
 /* Define to 1 if we want to enable plugins */
 #cmakedefine HAVE_PLUGINS 1