diff options
author | Guy Harris <guy@alum.mit.edu> | 2014-04-20 16:22:10 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2014-04-20 23:22:33 +0000 |
commit | f456a6e0a5956722cf6f45af57b177470d7e7f7a (patch) | |
tree | f61518845c92e7d56c940320e0b72b358431c43f | |
parent | 0bdd9a7d7a1a8ce218dc82f22a0a886e0f8bed34 (diff) | |
download | wireshark-f456a6e0a5956722cf6f45af57b177470d7e7f7a.tar.gz |
Get rid of ENABLE_EXTRA_CLANG_CHECKS.
It no longer does anything, and it refers to variables that no longer
exist, as we're not distinguishing between extra GCC warning flags and
extra CLang warning flags any more.
Change-Id: If0b346f669f2573e46261e6da4dc78e96ef79a8f
Reviewed-on: https://code.wireshark.org/review/1228
Reviewed-by: Guy Harris <guy@alum.mit.edu>
-rw-r--r-- | CMakeLists.txt | 6 | ||||
-rw-r--r-- | CMakeOptions.txt | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c1c2e43a5..9ed244bebc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -310,12 +310,6 @@ else() set(WIRESHARK_CPP_ONLY_FLAGS ${WIRESHARK_CPP_ONLY_FLAGS} ${WIRESHARK_EXTRA_COMPILER_CPP_ONLY_FLAGS}) endif() - if(ENABLE_EXTRA_CLANG_CHECKS) # This overrides -Werror - set(WIRESHARK_C_FLAGS ${WIRESHARK_C_FLAGS} ${WIRESHARK_EXTRA_CLANG_C_FLAGS}) - set(WIRESHARK_C_ONLY_FLAGS ${WIRESHARK_C_ONLY_FLAGS} ${WIRESHARK_EXTRA_CLANG_C_ONLY_FLAGS}) - set(WIRESHARK_CPP_ONLY_FLAGS ${WIRESHARK_CPP_ONLY_FLAGS} ${WIRESHARK_EXTRA_CLANG_CPP_ONLY_FLAGS}) - endif() - add_definitions( -DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES diff --git a/CMakeOptions.txt b/CMakeOptions.txt index d1cf4d926c..5d6cb809d6 100644 --- a/CMakeOptions.txt +++ b/CMakeOptions.txt @@ -18,7 +18,6 @@ option(AUTOGEN_pidl "Autogenerate pidl dissectors" OFF) option(DISABLE_WERROR "Do not treat Warnings as errors" OFF) option(ENABLE_EXTRA_GCC_CHECKS "Do additional -W checks in GCC (disables -Werror)" OFF) -option(ENABLE_EXTRA_CLANG_CHECKS "Do additional -W checks in Clang (disables -Werror)" OFF) option(ENABLE_GTK3 "Use GTK3 instead of GTK2 to build wireshark" ON) option(ENABLE_QT5 "Use Qt5 instead of Qt4 to build qtshark" ON) option(ENABLE_PCAP "Enable libpcap support (required for capturing)" ON) |