diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | CMakeOptions.txt | 3 | ||||
| -rw-r--r-- | cmakeconfig.h.in | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d795c6d181..8c79cc737a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -435,6 +435,10 @@ if(ENABLE_GUIDES) add_subdirectory( docbook ) endif() +if(ENABLE_PCAP_NG_DEFAULT) + set(PCAP_NG_DEFAULT 1) +endif() + #Platform specific if(UNIX) set(WS_VAR_IMPORT "extern") diff --git a/CMakeOptions.txt b/CMakeOptions.txt index 9ee5889ce3..e1e5d300ec 100644 --- a/CMakeOptions.txt +++ b/CMakeOptions.txt @@ -17,12 +17,13 @@ option(AUTOGEN_pidl "Autogenerate pidl dissectors" OFF) 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_GTK3 "Use GTK3 instead of GTK2" OFF) +option(ENABLE_GTK3 "Use GTK3 instead of GTK2 (does not compile yet)" OFF) option(ENABLE_AIRPCAP "Enable Airpcap support" ON) # todo option(ENABLE_STATIC "Build a static version of Wireshark (not yet working)" OFF) option(ENABLE_PLUGINS "Build with plugins" ON) option(ENABLE_GUIDES "Build Guides" OFF) +option(ENABLE_PCAP_NG_DEFAULT "Enable pcap-ng as default file format" ON) option(ENABLE_ADNS "Build with adns support" ON) option(ENABLE_PCRE "Build with pcre support" OFF) diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in index 55ce56eb4a..480d9d2230 100644 --- 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 use pcap-ng as our default file format */ +#cmakedefine PCAP_NG_DEFAULT 1 + /* Define to 1 if we want to enable plugins */ #cmakedefine HAVE_PLUGINS 1 |