Merge pull request #11436 from seiko2plus:issue11433

9fa01a7b · Alexander Alekhin · 4ff6a1bc · 788d6a71 · 9fa01a7b
Commit 9fa01a7b authored May 03, 2018 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/cmake/OpenCVCompilerOptions.cmake
+++ b/cmake/OpenCVCompilerOptions.cmake
@@ -104,7 +104,7 @@ if(CV_GCC OR CV_CLANG)
  add_extra_compiler_option(-Wuninitialized)
  add_extra_compiler_option(-Winit-self)
  if(HAVE_CXX11)
-    if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT ENABLE_PRECOMPILED_HEADERS)
      add_extra_compiler_option(-Wsuggest-override)
    elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
      add_extra_compiler_option(-Winconsistent-missing-override)