Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22350 from alalek:rework_psabi_warning

Browse Source
pull/22378/head^2
Alexander Alekhin 3 years ago
parent 48afe1586a 75bb6aa9a1
commit d0d115321d
15 changed files with 1 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      3rdparty/openexr/CMakeLists.txt
  2. 4
      3rdparty/protobuf/CMakeLists.txt
  3. 2
      cmake/OpenCVCompilerOptions.cmake
  4. 4
      modules/calib3d/CMakeLists.txt
  5. 4
      modules/core/CMakeLists.txt
  6. 4
      modules/dnn/CMakeLists.txt
  7. 4
      modules/features2d/CMakeLists.txt
  8. 4
      modules/flann/CMakeLists.txt
  9. 4
      modules/imgproc/CMakeLists.txt
  10. 4
      modules/ml/CMakeLists.txt
  11. 4
      modules/objdetect/CMakeLists.txt
  12. 4
      modules/shape/CMakeLists.txt
  13. 4
      modules/stitching/CMakeLists.txt
  14. 4
      modules/ts/CMakeLists.txt
  15. 4
      samples/cpp/CMakeLists.txt

4
3rdparty/openexr/CMakeLists.txt vendored
Unescape View File

@ -110,10 +110,6 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshadow -Wunused -Wsign-compare -Wundef -W
-Wreorder
-Wunused-result
)
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()
if(CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 8.0)
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wclass-memaccess)
endif()

4
3rdparty/protobuf/CMakeLists.txt vendored
Unescape View File

@ -25,10 +25,6 @@ else()
-Warray-bounds # GCC 9+
)
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()
if(CV_ICC)
ocv_warnings_disable(CMAKE_CXX_FLAGS
-wd265 -wd858 -wd873 -wd2196

2
cmake/OpenCVCompilerOptions.cmake
Unescape View File

@ -134,7 +134,7 @@ if(CV_GCC OR CV_CLANG)
add_extra_compiler_option(-Wshadow)
add_extra_compiler_option(-Wsign-promo)
add_extra_compiler_option(-Wuninitialized)
if(CV_GCC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0) AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0))
if(CV_GCC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0) AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0 OR ARM))
add_extra_compiler_option(-Wno-psabi)
endif()
if(HAVE_CXX11)

4
modules/calib3d/CMakeLists.txt
Unescape View File

@ -3,10 +3,6 @@ set(debug_modules "")
if(DEBUG_opencv_calib3d)
list(APPEND debug_modules 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(calib3d opencv_imgproc opencv_features2d ${debug_modules}
WRAP java python js
)

4
modules/core/CMakeLists.txt
Unescape View File

@ -38,10 +38,6 @@ endif()
if(HAVE_CUDA)
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wenum-compare -Wunused-function -Wshadow)
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()
if(CV_TRACE AND HAVE_ITT)
add_definitions(-DOPENCV_WITH_ITT=1)

4
modules/dnn/CMakeLists.txt
Unescape View File

@ -35,10 +35,6 @@ else()
-Wunused-parameter -Wsign-compare
)
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()
if(HAVE_CUDA)
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef)
endif()

4
modules/features2d/CMakeLists.txt
Unescape View File

@ -1,10 +1,6 @@
set(the_description "2D Features Framework")
ocv_add_dispatched_file(sift SSE4_1 AVX2 AVX512_SKX)
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()
set(debug_modules "")
if(DEBUG_opencv_features2d)

4
modules/flann/CMakeLists.txt
Unescape View File

@ -1,6 +1,2 @@
set(the_description "Clustering and Search in Multi-Dimensional Spaces")
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(flann opencv_core WRAP python)

4
modules/imgproc/CMakeLists.txt
Unescape View File

@ -12,10 +12,6 @@ ocv_add_dispatched_file(smooth SSE2 SSE4_1 AVX2)
ocv_add_dispatched_file(sumpixels SSE2 AVX2 AVX512_SKX)
ocv_add_dispatched_file(undistort SSE2 AVX2)
ocv_define_module(imgproc opencv_core WRAP java python js)
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_check_environment_variables(OPENCV_IPP_GAUSSIAN_BLUR)
option(OPENCV_IPP_GAUSSIAN_BLUR "Enable IPP optimizations for GaussianBlur (+8Mb in binary size)" OFF)

4
modules/ml/CMakeLists.txt
Unescape View File

@ -1,6 +1,2 @@
set(the_description "Machine Learning")
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(ml opencv_core WRAP java python)

4
modules/objdetect/CMakeLists.txt
Unescape View File

@ -1,8 +1,4 @@
set(the_description "Object 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(objdetect opencv_core opencv_imgproc opencv_calib3d WRAP java python js)
if(HAVE_QUIRC)

4
modules/shape/CMakeLists.txt
Unescape View File

@ -1,6 +1,2 @@
set(the_description "Shape descriptors and matchers")
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(shape opencv_core opencv_imgproc opencv_video WRAP python)

4
modules/stitching/CMakeLists.txt
Unescape View File

@ -3,10 +3,6 @@ set(the_description "Images stitching")
if(HAVE_CUDA)
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wmissing-declarations -Wshadow -Wstrict-aliasing)
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()
set(STITCHING_CONTRIB_DEPS "opencv_xfeatures2d")
if(BUILD_SHARED_LIBS AND BUILD_opencv_world AND OPENCV_WORLD_EXCLUDE_EXTRA_MODULES)

4
modules/ts/CMakeLists.txt
Unescape View File

@ -15,10 +15,6 @@ if(WINRT)
endif()
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef)
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_add_module(ts INTERNAL opencv_core opencv_imgproc opencv_imgcodecs opencv_videoio opencv_highgui)

4
samples/cpp/CMakeLists.txt
Unescape View File

@ -41,10 +41,6 @@ foreach(sample_filename ${cpp_samples})
ocv_warnings_disable(CMAKE_CXX_FLAGS -Winconsistent-missing-override -Wsuggest-override)
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()
set(package "cpp")
if(sample_filename MATCHES "tutorial_code")
set(package "tutorial")

Write Preview
Loading…
Cancel
Save