Merge pull request #16918 from alalek:build_warnings_3.4

pull/16920/head^2
Alexander Alekhin 5 years ago
commit 353273579b
  1. 3
      modules/core/src/parallel.cpp
  2. 1
      modules/dnn/CMakeLists.txt

@ -95,6 +95,9 @@
*/ */
#if defined HAVE_TBB #if defined HAVE_TBB
#ifndef TBB_SUPPRESS_DEPRECATED_MESSAGES // supress warning
#define TBB_SUPPRESS_DEPRECATED_MESSAGES 1
#endif
#include "tbb/tbb.h" #include "tbb/tbb.h"
#include "tbb/task.h" #include "tbb/task.h"
#include "tbb/tbb_stddef.h" #include "tbb/tbb_stddef.h"

@ -100,6 +100,7 @@ endif()
ocv_module_include_directories(${include_dirs}) ocv_module_include_directories(${include_dirs})
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
ocv_append_source_files_cxx_compiler_options(fw_srcs "-Wno-suggest-override") # GCC ocv_append_source_files_cxx_compiler_options(fw_srcs "-Wno-suggest-override") # GCC
ocv_append_source_files_cxx_compiler_options(fw_srcs "-Wno-array-bounds") # GCC 9.3.0 (Ubuntu 20.04)
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
ocv_append_source_files_cxx_compiler_options(fw_srcs "-Wno-inconsistent-missing-override") # Clang ocv_append_source_files_cxx_compiler_options(fw_srcs "-Wno-inconsistent-missing-override") # Clang
endif() endif()

Loading…
Cancel
Save