Skip to content

build: rework psabi warning #3319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 13, 2022
Merged

build: rework psabi warning #3319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions modules/aruco/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
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_include_directories(${CMAKE_CURRENT_BINARY_DIR})

Expand Down
4 changes: 0 additions & 4 deletions modules/ccalib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
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)
4 changes: 0 additions & 4 deletions modules/datasets/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,3 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS
/wd4267 # flann, Win64
-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()
5 changes: 1 addition & 4 deletions modules/dnn_objdetect/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
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
OPTIONAL opencv_highgui opencv_imgcodecs # samples
)
4 changes: 0 additions & 4 deletions modules/dpm/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,3 @@ set(the_description "Object Detection")
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
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()
4 changes: 0 additions & 4 deletions modules/face/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
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
opencv_imgproc
opencv_objdetect
Expand Down
4 changes: 0 additions & 4 deletions modules/line_descriptor/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
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)
4 changes: 0 additions & 4 deletions modules/optflow/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
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)
4 changes: 0 additions & 4 deletions modules/rgbd/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
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)
4 changes: 0 additions & 4 deletions modules/text/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ set(__extra_deps "")
if(DEBUG_opencv_text)
list(APPEND __extra_deps PRIVATE_REQUIRED opencv_highgui)
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
opencv_ml opencv_imgproc opencv_core opencv_features2d opencv_dnn
Expand Down
4 changes: 0 additions & 4 deletions modules/tracking/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
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_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()
4 changes: 0 additions & 4 deletions modules/xfeatures2d/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ set(the_description "Contributed/Experimental Algorithms for Salient 2D Features
if(HAVE_CUDA)
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef)
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)

if(NOT OPENCV_SKIP_FEATURES2D_DOWNLOADING)
Expand Down
4 changes: 0 additions & 4 deletions modules/ximgproc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
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)
4 changes: 0 additions & 4 deletions modules/xobjdetect/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
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)
if (BUILD_opencv_apps AND NOT APPLE_FRAMEWORK)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tools ${CMAKE_CURRENT_BINARY_DIR}/tools)
Expand Down
4 changes: 0 additions & 4 deletions modules/xphoto/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
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)