suppress warning on GCC 7 and later

pull/3298/head
Tomoaki Teshima 3 years ago
parent 79122d67f4
commit a96a930f12
  1. 4
      modules/aruco/CMakeLists.txt
  2. 4
      modules/ccalib/CMakeLists.txt
  3. 4
      modules/datasets/CMakeLists.txt
  4. 5
      modules/dnn_objdetect/CMakeLists.txt
  5. 4
      modules/dpm/CMakeLists.txt
  6. 4
      modules/face/CMakeLists.txt
  7. 4
      modules/line_descriptor/CMakeLists.txt
  8. 4
      modules/optflow/CMakeLists.txt
  9. 4
      modules/rgbd/CMakeLists.txt
  10. 4
      modules/text/CMakeLists.txt
  11. 4
      modules/tracking/CMakeLists.txt
  12. 4
      modules/xfeatures2d/CMakeLists.txt
  13. 4
      modules/ximgproc/CMakeLists.txt
  14. 4
      modules/xobjdetect/CMakeLists.txt
  15. 4
      modules/xphoto/CMakeLists.txt

@ -1,4 +1,8 @@
set(the_description "ArUco Marker Detection") set(the_description "ArUco Marker Detection")
if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
# suppress warnings from GCC only on 7.1 and later
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
endif()
ocv_define_module(aruco opencv_core opencv_imgproc opencv_calib3d WRAP python java) ocv_define_module(aruco opencv_core opencv_imgproc opencv_calib3d WRAP python java)
ocv_include_directories(${CMAKE_CURRENT_BINARY_DIR}) ocv_include_directories(${CMAKE_CURRENT_BINARY_DIR})

@ -1,2 +1,6 @@
set(the_description "Custom Calibration Pattern") set(the_description "Custom Calibration Pattern")
if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
# suppress warnings from GCC only on 7.1 and later
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
endif()
ocv_define_module(ccalib opencv_core opencv_imgproc opencv_calib3d opencv_features2d opencv_highgui WRAP python) ocv_define_module(ccalib opencv_core opencv_imgproc opencv_calib3d opencv_features2d opencv_highgui WRAP python)

@ -13,3 +13,7 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS
/wd4267 # flann, Win64 /wd4267 # flann, Win64
-Wimplicit-fallthrough # tinyxml2.cpp -Wimplicit-fallthrough # tinyxml2.cpp
) )
if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
# suppress warnings from GCC only on 7.1 and later
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
endif()

@ -1,5 +1,8 @@
set(the_description "Object Detection using CNNs") set(the_description "Object Detection using CNNs")
if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
# suppress warnings from GCC only on 7.1 and later
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
endif()
ocv_define_module(dnn_objdetect opencv_core opencv_imgproc opencv_dnn ocv_define_module(dnn_objdetect opencv_core opencv_imgproc opencv_dnn
OPTIONAL opencv_highgui opencv_imgcodecs # samples OPTIONAL opencv_highgui opencv_imgcodecs # samples
) )

@ -3,3 +3,7 @@ set(the_description "Object Detection")
ocv_define_module(dpm opencv_core opencv_imgproc opencv_objdetect OPTIONAL opencv_highgui WRAP python) ocv_define_module(dpm opencv_core opencv_imgproc opencv_objdetect OPTIONAL opencv_highgui WRAP python)
ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4512) # disable warning on Win64 ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4512) # disable warning on Win64
if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
# suppress warnings from GCC only on 7.1 and later
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
endif()

@ -1,4 +1,8 @@
set(the_description "Face recognition etc") set(the_description "Face recognition etc")
if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
# suppress warnings from GCC only on 7.1 and later
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
endif()
ocv_define_module(face opencv_core ocv_define_module(face opencv_core
opencv_imgproc opencv_imgproc
opencv_objdetect opencv_objdetect

@ -1,2 +1,6 @@
set(the_description "Line descriptor") set(the_description "Line descriptor")
if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
# suppress warnings from GCC only on 7.1 and later
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
endif()
ocv_define_module(line_descriptor opencv_imgproc OPTIONAL opencv_features2d WRAP python) ocv_define_module(line_descriptor opencv_imgproc OPTIONAL opencv_features2d WRAP python)

@ -1,2 +1,6 @@
set(the_description "Optical Flow Algorithms") set(the_description "Optical Flow Algorithms")
if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
# suppress warnings from GCC only on 7.1 and later
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
endif()
ocv_define_module(optflow opencv_core opencv_imgproc opencv_video opencv_ximgproc opencv_imgcodecs opencv_flann WRAP python) ocv_define_module(optflow opencv_core opencv_imgproc opencv_video opencv_ximgproc opencv_imgcodecs opencv_flann WRAP python)

@ -1,2 +1,6 @@
set(the_description "RGBD algorithms") set(the_description "RGBD algorithms")
if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
# suppress warnings from GCC only on 7.1 and later
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
endif()
ocv_define_module(rgbd opencv_core opencv_calib3d opencv_imgproc WRAP python) ocv_define_module(rgbd opencv_core opencv_calib3d opencv_imgproc WRAP python)

@ -3,6 +3,10 @@ set(__extra_deps "")
if(DEBUG_opencv_text) if(DEBUG_opencv_text)
list(APPEND __extra_deps PRIVATE_REQUIRED opencv_highgui) list(APPEND __extra_deps PRIVATE_REQUIRED opencv_highgui)
endif() endif()
if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
# suppress warnings from GCC only on 7.1 and later
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
endif()
ocv_define_module(text ocv_define_module(text
opencv_ml opencv_imgproc opencv_core opencv_features2d opencv_dnn opencv_ml opencv_imgproc opencv_core opencv_features2d opencv_dnn

@ -1,3 +1,7 @@
set(the_description "Tracking API") set(the_description "Tracking API")
ocv_define_module(tracking opencv_imgproc opencv_core opencv_video opencv_plot OPTIONAL opencv_dnn opencv_datasets WRAP java python) ocv_define_module(tracking opencv_imgproc opencv_core opencv_video opencv_plot OPTIONAL opencv_dnn opencv_datasets WRAP java python)
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-shadow /wd4458) ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-shadow /wd4458)
if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
# suppress warnings from GCC only on 7.1 and later
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
endif()

@ -3,6 +3,10 @@ set(the_description "Contributed/Experimental Algorithms for Salient 2D Features
if(HAVE_CUDA) if(HAVE_CUDA)
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef) ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef)
endif() endif()
if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
# suppress warnings from GCC only on 7.1 and later
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
endif()
ocv_define_module(xfeatures2d opencv_core opencv_imgproc opencv_features2d opencv_calib3d OPTIONAL opencv_shape opencv_ml opencv_cudaarithm WRAP python java) ocv_define_module(xfeatures2d opencv_core opencv_imgproc opencv_features2d opencv_calib3d OPTIONAL opencv_shape opencv_ml opencv_cudaarithm WRAP python java)
if(NOT OPENCV_SKIP_FEATURES2D_DOWNLOADING) if(NOT OPENCV_SKIP_FEATURES2D_DOWNLOADING)

@ -1,2 +1,6 @@
set(the_description "Extended image processing module. It includes edge-aware filters and etc.") set(the_description "Extended image processing module. It includes edge-aware filters and etc.")
if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
# suppress warnings from GCC only on 7.1 and later
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
endif()
ocv_define_module(ximgproc opencv_core opencv_imgproc opencv_calib3d opencv_imgcodecs WRAP python java) ocv_define_module(ximgproc opencv_core opencv_imgproc opencv_calib3d opencv_imgcodecs WRAP python java)

@ -1,4 +1,8 @@
set(the_description "Object detection algorithms") set(the_description "Object detection algorithms")
if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
# suppress warnings from GCC only on 7.1 and later
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
endif()
ocv_define_module(xobjdetect opencv_core opencv_imgproc opencv_objdetect opencv_imgcodecs WRAP python) ocv_define_module(xobjdetect opencv_core opencv_imgproc opencv_objdetect opencv_imgcodecs WRAP python)
if (BUILD_opencv_apps AND NOT APPLE_FRAMEWORK) if (BUILD_opencv_apps AND NOT APPLE_FRAMEWORK)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tools ${CMAKE_CURRENT_BINARY_DIR}/tools) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tools ${CMAKE_CURRENT_BINARY_DIR}/tools)

@ -1,2 +1,6 @@
set(the_description "Addon to basic photo module") set(the_description "Addon to basic photo module")
if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
# suppress warnings from GCC only on 7.1 and later
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
endif()
ocv_define_module(xphoto opencv_core opencv_imgproc opencv_photo WRAP python java) ocv_define_module(xphoto opencv_core opencv_imgproc opencv_photo WRAP python java)

Loading…
Cancel
Save