Skip to content

Commit 0da7255

Browse files
alalekalalek
committed
Merge pull request #3319 from alalek:rework_psabi_warning
2 parents 9ffa7ac + 839db44 commit 0da7255

File tree

15 files changed

+1
-60
lines changed

15 files changed

+1
-60
lines changed

‎modules/aruco/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
set(the_description "ArUco Marker Detection")
2-
if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
3-
# suppress warnings from GCC only on 7.1 and later
4-
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
5-
endif()
62
ocv_define_module(aruco opencv_core opencv_imgproc opencv_calib3d WRAP python java)
73
ocv_include_directories(${CMAKE_CURRENT_BINARY_DIR})
84

‎modules/ccalib/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
11
set(the_description "Custom Calibration Pattern")
2-
if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
3-
# suppress warnings from GCC only on 7.1 and later
4-
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
5-
endif()
62
ocv_define_module(ccalib opencv_core opencv_imgproc opencv_calib3d opencv_features2d opencv_highgui WRAP python)

‎modules/datasets/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,3 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS
1313
/wd4267 # flann, Win64
1414
-Wimplicit-fallthrough # tinyxml2.cpp
1515
)
16-
if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
17-
# suppress warnings from GCC only on 7.1 and later
18-
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
19-
endif()

‎modules/dnn_objdetect/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
set(the_description "Object Detection using CNNs")
2-
if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
3-
# suppress warnings from GCC only on 7.1 and later
4-
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
5-
endif()
2+
63
ocv_define_module(dnn_objdetect opencv_core opencv_imgproc opencv_dnn
74
OPTIONAL opencv_highgui opencv_imgcodecs # samples
85
)

‎modules/dpm/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,3 @@ set(the_description "Object Detection")
33
ocv_define_module(dpm opencv_core opencv_imgproc opencv_objdetect OPTIONAL opencv_highgui WRAP python)
44

55
ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4512) # disable warning on Win64
6-
if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
7-
# suppress warnings from GCC only on 7.1 and later
8-
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
9-
endif()

‎modules/face/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
set(the_description "Face recognition etc")
2-
if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
3-
# suppress warnings from GCC only on 7.1 and later
4-
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
5-
endif()
62
ocv_define_module(face opencv_core
73
opencv_imgproc
84
opencv_objdetect

‎modules/line_descriptor/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
11
set(the_description "Line descriptor")
2-
if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
3-
# suppress warnings from GCC only on 7.1 and later
4-
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
5-
endif()
62
ocv_define_module(line_descriptor opencv_imgproc OPTIONAL opencv_features2d WRAP python)

‎modules/optflow/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
11
set(the_description "Optical Flow Algorithms")
2-
if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
3-
# suppress warnings from GCC only on 7.1 and later
4-
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
5-
endif()
62
ocv_define_module(optflow opencv_core opencv_imgproc opencv_video opencv_ximgproc opencv_imgcodecs opencv_flann WRAP python)

‎modules/rgbd/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
11
set(the_description "RGBD algorithms")
2-
if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
3-
# suppress warnings from GCC only on 7.1 and later
4-
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
5-
endif()
62
ocv_define_module(rgbd opencv_core opencv_calib3d opencv_imgproc WRAP python)

‎modules/text/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ set(__extra_deps "")
33
if(DEBUG_opencv_text)
44
list(APPEND __extra_deps PRIVATE_REQUIRED opencv_highgui)
55
endif()
6-
if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
7-
# suppress warnings from GCC only on 7.1 and later
8-
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
9-
endif()
106

117
ocv_define_module(text
128
opencv_ml opencv_imgproc opencv_core opencv_features2d opencv_dnn

0 commit comments

Comments
 (0)