diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-04-20 16:54:21 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-04-20 23:54:46 +0000 |
| commit | fde8ef07135c1b057fcf83fab40ebd0a3572a6b6 (patch) | |
| tree | 4c73c91023834b6c889a6c47e0f10923761515f3 | |
| parent | 4fdd528f897d44b522d7d57ed8718e6c388a47cc (diff) | |
Rename ENABLE_EXTRA_COMPILER_CHECKS to ENABLE_EXTRA_COMPILER_WARNINGS.
This matches the current name of the --enable-extra-compiler-warnings
option in autotools.
Fix the documentation of the option to match.
(Note that "compiler" won't necessarily always be GCC or Clang, and
won't necessarily always use -W for warning options, so speaking of them
as "-W checks" isn't future-proof.)
Change-Id: I2e142532e78be3c8051f1e738b3109a83e7d10dc
Reviewed-on: https://code.wireshark.org/review/1231
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | CMakeOptions.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ed244bebc..ccf0b8219c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -304,7 +304,7 @@ else() ) endif() - if(ENABLE_EXTRA_COMPILER_CHECKS) # This overrides -Werror + if(ENABLE_EXTRA_COMPILER_WARNINGS) # This overrides -Werror set(WIRESHARK_C_FLAGS ${WIRESHARK_C_FLAGS} ${WIRESHARK_EXTRA_COMPILER_C_FLAGS}) set(WIRESHARK_C_ONLY_FLAGS ${WIRESHARK_C_ONLY_FLAGS} ${WIRESHARK_EXTRA_COMPILER_C_ONLY_FLAGS}) set(WIRESHARK_CPP_ONLY_FLAGS ${WIRESHARK_CPP_ONLY_FLAGS} ${WIRESHARK_EXTRA_COMPILER_CPP_ONLY_FLAGS}) @@ -323,7 +323,7 @@ set( CPP_FLAG_TESTS ${WIRESHARK_C_FLAGS} ${WIRESHARK_CPP_ONLY_FLAGS} ) include(CheckCCompilerFlag) include(CheckCXXCompilerFlag) -if(NOT DISABLE_WERROR AND NOT ENABLE_EXTRA_COMPILER_CHECKS) +if(NOT DISABLE_WERROR AND NOT ENABLE_EXTRA_COMPILER_WARNINGS) check_c_compiler_flag(-Werror=unknown-warning-option WERR_UNKNOWN) check_c_compiler_flag(-Werror WERROR) else() diff --git a/CMakeOptions.txt b/CMakeOptions.txt index a3bfe8e1d8..893ce0be89 100644 --- a/CMakeOptions.txt +++ b/CMakeOptions.txt @@ -16,8 +16,8 @@ option(BUILD_dftest "Build dftest" ON) option(AUTOGEN_dcerpc "Autogenerate DCE RPC dissectors" OFF) option(AUTOGEN_pidl "Autogenerate pidl dissectors" OFF) -option(DISABLE_WERROR "Do not treat Warnings as errors" OFF) -option(ENABLE_EXTRA_COMPILER_CHECKS "Do additional -W checks (disables -Werror)" OFF) +option(DISABLE_WERROR "Do not treat warnings as errors" OFF) +option(ENABLE_EXTRA_COMPILER_WARNINGS "Do additional compiler warnings (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) |