Merge pull request #12863 from alalek:disable_wshadow_gcc_4.x

2180a676 · Alexander Alekhin · 1188c6fe · a2e754c1 · 2180a676
Commit 2180a676 authored Oct 17, 2018 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

OpenCVCompilerOptions.cmake cmake/OpenCVCompilerOptions.cmake +3 -1

No files found.
--- a/cmake/OpenCVCompilerOptions.cmake
+++ b/cmake/OpenCVCompilerOptions.cmake
@@ -103,7 +103,9 @@ if(CV_GCC OR CV_CLANG)
  add_extra_compiler_option(-Wundef)
  add_extra_compiler_option(-Winit-self)
  add_extra_compiler_option(-Wpointer-arith)
-  add_extra_compiler_option(-Wshadow)
+  if(NOT (CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0"))
+    add_extra_compiler_option(-Wshadow)  # old GCC emits warnings for variables + methods combination
+  endif()
  add_extra_compiler_option(-Wsign-promo)
  add_extra_compiler_option(-Wuninitialized)
  add_extra_compiler_option(-Winit-self)