blip: fix memory safety issues and a build failure without zlib

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

diff --git a/CMakeOptions.txt b/CMakeOptions.txt
index 7afc4089970dca7abfe0e84e50b2152516fd1cca..2cfe6419d47bd25ed3328b5b630d74048f03ebf5 100644 (file)
--- a/CMakeOptions.txt
+++ b/CMakeOptions.txt
@@ -16,11 +16,19 @@ option(BUILD_dftest        "Build dftest" ON)
 option(BUILD_corbaidl2wrs  "Build corbaidl2wrs" OFF)
 option(BUILD_dcerpcidl2wrs "Build dcerpcidl2wrs" ON)
 option(BUILD_xxx2deb       "Build xxx2deb" OFF)
+
 option(BUILD_androiddump   "Build androiddump" ON)
 option(BUILD_sshdump       "Build sshdump" ON)
 option(BUILD_ciscodump     "Build ciscodump" ON)
+option(BUILD_dpauxmon      "Build dpauxmon" ON)
 option(BUILD_randpktdump   "Build randpktdump" ON)
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+       option(BUILD_sdjournal   "Build sdjournal" ON)
+else()
+       option(BUILD_sdjournal   "Build sdjournal" OFF)
+endif()
 option(BUILD_udpdump       "Build udpdump" ON)
+
 option(BUILD_sharkd        "Build sharkd" ON)
 if(WIN32)
        option(BUILD_fuzzshark     "Build fuzzshark" OFF)
@@ -37,10 +45,10 @@ option(ENABLE_CODE_ANALYSIS "Enable the compiler's static analyzer if possible"
 option(ENABLE_ASAN "Enable AddressSanitizer (ASAN) for debugging (degrades performance)" OFF)
 option(ENABLE_TSAN "Enable ThreadSanitizer (TSan) for debugging" OFF)
 option(ENABLE_UBSAN "Enable UndefinedBehaviorSanitizer (UBSan) for debugging" OFF)
+option(ENABLE_FUZZER "Enable libFuzzer instrumentation for use with fuzzshark" OFF)
 option(ENABLE_CHECKHF_CONFLICT "Enable hf conflict check for debugging (start-up may be slower)" OFF)
 option(ENABLE_CCACHE "Speed up compiling and linking using ccache if possible" OFF)
 
-option(ENABLE_QT5        "Use Qt5 instead of Qt4 to build wireshark" ON)
 option(ENABLE_PCAP       "Enable libpcap support (required for capturing)" ON)
 #
 # AirPcap support is available only on Windows.  It might be nice to have it
@@ -81,10 +89,16 @@ option(ENABLE_SBC        "Build with SBC Codec support in RTP Player" ON)
 option(ENABLE_SPANDSP    "Build with G.722/G.726 codecs support in RTP Player" ON)
 option(ENABLE_BCG729     "Build with G.729 codec support in RTP Player" ON)
 option(ENABLE_LIBXML2    "Build with libxml2 support" ON)
+
 # How to install
 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})
+set_property(CACHE DUMPCAP_INSTALL_OPTION PROPERTY STRINGS "normal" "suid" "capabilities")
+
+if(UNIX)
+       option(ENABLE_DUMPCAP_GROUP "Install dumpcap with group ownership and permissions (default \"wireshark\")" OFF)
+       set(DUMPCAP_INSTALL_GROUP "wireshark" CACHE STRING "Group name for dumpcap (must exist)")
+endif()
+
 if(APPLE)
        option(ENABLE_APPLICATION_BUNDLE "Build a macOS application bundle (Wireshark.app)" ON)
 endif()