[Automatic update for 2016-08-28]

[metze/wireshark/wip.git] / CMakeOptions.txt

diff --git a/CMakeOptions.txt b/CMakeOptions.txt
index c3c5983feff0e4bddded94cd1c7423f8d8919958..8140b642e75b25a483f84510433cc65c48e26c2a 100644 (file)
--- a/CMakeOptions.txt
+++ b/CMakeOptions.txt
@@ -14,12 +14,17 @@ option(BUILD_capinfos      "Build capinfos" ON)
 option(BUILD_captype       "Build captype" ON)
 option(BUILD_randpkt       "Build randpkt" ON)
 option(BUILD_dftest        "Build dftest" ON)
-option(AUTOGEN_dcerpc      "Autogenerate DCE RPC dissectors" OFF)
-option(AUTOGEN_pidl        "Autogenerate pidl dissectors" OFF)
+option(BUILD_androiddump   "Build androiddump" ON)
+option(BUILD_sshdump       "Build sshdump" ON)
+option(BUILD_ciscodump     "Build ciscodump" ON)
+option(BUILD_randpktdump   "Build randpktdump" ON)
 
 option(DISABLE_WERROR    "Do not treat warnings as errors" OFF)
+option(EXTCAP_ANDROIDDUMP_LIBPCAP    "Build androiddump using libpcap" OFF)
 option(ENABLE_EXTRA_COMPILER_WARNINGS "Do additional compiler warnings (disables -Werror)" OFF)
 option(ENABLE_CODE_ANALYSIS "Enable the compiler's static analyzer if possible" OFF)
+option(ENABLE_ASAN "Enable AddressSanitizer (ASAN) for debugging (degrades performance)" OFF)
+option(ENABLE_CHECKHF_CONFLICT "Enable hf conflict check for debugging (start-up may be slower)" OFF)
 
 #
 # Leave GTK2 the default on Windows, looks better than GTK3
@@ -53,7 +58,6 @@ option(ENABLE_PDF_GUIDES        "Build PDF User & Developer Guides" OFF)
 option(ENABLE_CHM_GUIDES        "Build HTML Help User & Developer 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_PORTAUDIO  "Build with PortAudio support" ON)
 option(ENABLE_ZLIB       "Build with zlib compression support" ON)
 option(ENABLE_LUA        "Build with Lua dissector support" ON)
@@ -84,7 +88,7 @@ set(DUMPCAP_INSTALL_OPTION   "normal" CACHE STRING "Permissions to install")
 set(DUMPCAP_INST_VALS "normal" "suid" "capabilities")
 set_property(CACHE DUMPCAP_INSTALL_OPTION PROPERTY STRINGS ${DUMPCAP_INST_VALS})
 if(APPLE)
-       option(ENABLE_APPLICATION_BUNDLE "Build a Mac OS X application bundle (Wireshark.app)" ON)
+       option(ENABLE_APPLICATION_BUNDLE "Build an OS X application bundle (Wireshark.app)" ON)
 else()
-       option(ENABLE_APPLICATION_BUNDLE "Build a Mac OS X application bundle (Wireshark.app)" OFF)
+       option(ENABLE_APPLICATION_BUNDLE "Build an OS X application bundle (Wireshark.app)" OFF)
 endif()