Copy behaviour of

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

svn path=/trunk/; revision=34205

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

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)

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