From 17651065a57f912ebb11d731d50a2245cbeda494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Sat, 16 Sep 2017 12:47:30 +0200 Subject: cmake: Add option to disable -Wframe-larger-than MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In some editors (like Xcode) it's possible to turn on and off ASAN and UBSAN independent of the settings in CMake. This option will disable the -Wframe-larger-than= flag even if ASAN or UBSAN are not turned on in CMake. Change-Id: I70b1ae544fe87093d0f5ce7ceb191f33399191ea Reviewed-on: https://code.wireshark.org/review/23567 Petri-Dish: Stig Bjørlykke Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke --- CMakeLists.txt | 2 +- CMakeOptions.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8350203bbb..98c095e61c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -479,7 +479,7 @@ else() # # Code that may be worth looking into (coding practices) # - if((NOT ENABLE_ASAN) AND (NOT ENABLE_UBSAN)) + if((NOT ENABLE_ASAN) AND (NOT ENABLE_UBSAN) AND (NOT DISABLE_FRAME_LARGER_THAN_WARNING)) # # Only do this if neither ASan nor UBSan are # enabled; the instrumentation they add increases diff --git a/CMakeOptions.txt b/CMakeOptions.txt index 8427742784..218f3b4b76 100644 --- a/CMakeOptions.txt +++ b/CMakeOptions.txt @@ -25,6 +25,7 @@ option(BUILD_udpdump "Build udpdump" ON) option(BUILD_sharkd "Build sharkd" ON) option(DISABLE_WERROR "Do not treat warnings as errors" OFF) +option(DISABLE_FRAME_LARGER_THAN_WARNING "Disable warning if the size of a function frame is large" 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) -- cgit v1.2.3