Properly check the return value of color_filters_set_tmp().

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

diff --git a/CMakeOptions.txt b/CMakeOptions.txt
index 47637f5a6a5724c9767fa2fca66360e9dda51334..ac6565bcc67a59065d342e55bb929dade74606f0 100644 (file)
--- a/CMakeOptions.txt
+++ b/CMakeOptions.txt
@@ -14,11 +14,18 @@ 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(BUILD_androiddump   "Build androiddump" ON)
+option(BUILD_sshdump       "Build sshdump" ON)
+option(BUILD_randpktdump   "Build randpktdump" ON)
 option(AUTOGEN_dcerpc      "Autogenerate DCE RPC dissectors" OFF)
 option(AUTOGEN_pidl        "Autogenerate pidl dissectors" OFF)
 
 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 (May be slow down)" OFF)
+
 #
 # Leave GTK2 the default on Windows, looks better than GTK3
 #
@@ -48,6 +55,7 @@ option(ENABLE_PLUGINS    "Build with plugins" ON)
 option(ENABLE_EXTCAP     "Build with extcap hooks" ON)
 option(ENABLE_HTML_GUIDES       "Build HTML User & Developer Guides" OFF)
 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)
@@ -65,6 +73,9 @@ else()
 endif()
 option(ENABLE_CAP        "Build with Posix capabilities support" ON)
 option(ENABLE_CARES      "Build with c-ares support" ON)
+#
+# Libnl is Linux-specific.
+#
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
        option(ENABLE_NETLINK    "Build with libnl support" ON)
 else()
@@ -78,7 +89,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()