diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-08-06 15:49:13 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-08-06 22:49:42 +0000 |
| commit | cd7c47e6389d7641e65bef8215f2c101a9977465 (patch) | |
| tree | 892d4f59572a85fc8cf3a2a6c959cd105d85914f | |
| parent | b0b874815d7c31057a13c062ea7e973e18bde9a7 (diff) | |
Fix setting COMMON_WARN_FLAGS.
If we want to add -Wframe-larger-than=16384, *append* it, don't
*overwrite* it.
Indent that code properly while we're at it.
Change-Id: Iae8894e6663500620a07589fd6ba3d00f9eac7ba
Reviewed-on: https://code.wireshark.org/review/22977
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | CMakeLists.txt | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 76c5a23c25..602193fd59 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -451,14 +451,15 @@ else() -Wno-long-long -Wheader-guard ) -if((NOT ENABLE_ASAN) AND (NOT ENABLE_UBSAN)) - # - # Code that may be worth looking into (coding practices) - # - set(COMMON_WARN_FLAGS - -Wframe-larger-than=16384 - ) -endif() + + if((NOT ENABLE_ASAN) AND (NOT ENABLE_UBSAN)) + # + # Code that may be worth looking into (coding practices) + # + set(COMMON_WARN_FLAGS ${COMMON_WARN_FLAGS} + -Wframe-larger-than=16384 + ) + endif() set(C_WARN_FLAGS # The following are C only, not C++ |