diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
| commit | 9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9 (patch) | |
| tree | 2784370cda9bbf2da9114d70f05399c0b229d28c /CMakeOptions.txt | |
| parent | Adding debian version 4.2.6-1. (diff) | |
| download | wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.tar.xz wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'CMakeOptions.txt')
| -rw-r--r-- | CMakeOptions.txt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/CMakeOptions.txt b/CMakeOptions.txt index d97b1161..ebd2d2af 100644 --- a/CMakeOptions.txt +++ b/CMakeOptions.txt @@ -3,11 +3,7 @@ option(BUILD_wireshark "Build Wireshark" ON) option(BUILD_logray "Build Logray" OFF) if(BUILD_wireshark OR BUILD_logray) - if(NOT DEFINED ENV{WIRESHARK_BUILD_WITH_QT5}) - option(USE_qt6 "Use Qt6 instead of Qt5" ON) - else() - option(USE_qt6 "Use Qt6 instead of Qt5" OFF) - endif() + option(USE_qt6 "Use Qt6 (preferred) instead of Qt5" ON) endif() option(BUILD_tshark "Build tshark" ON) option(BUILD_tfshark "Build tfshark" OFF) @@ -64,6 +60,7 @@ option(ENABLE_TODO_WARNINGS "Enable compiler warnings that are yet to be fixed" option(ENABLE_PEDANTIC_WARNINGS "Enable pedantic or unfixable compiler warnings (noisy)" 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_LSAN "Enable LeakSanitizer (LSAN) for debugging (less overhead than ASAN)" 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) @@ -102,7 +99,9 @@ option(ENABLE_PLUGINS "Build with plugins" ON) option(ENABLE_PLUGIN_IFDEMO "Build with plugin interface demo" OFF) option(ENABLE_ZLIB "Build with zlib compression support" ON) +option(ENABLE_ZLIBNG "Build with zlib-ng compression support" ON) option(ENABLE_MINIZIP "Build with zip file compression support" ON) +option(ENABLE_MINIZIPNG "Build with zip file compression support" ON) option(ENABLE_LZ4 "Build with LZ4 compression support" ON) option(ENABLE_BROTLI "Build with brotli compression support" ON) option(ENABLE_SNAPPY "Build with Snappy compression support" ON) |