mirror of
https://github.com/opencv/opencv.git
synced 2025-06-08 01:53:19 +08:00
Supressed tones of Wdeprecated-copy that jump out of GTes after XCode update to 13.1 on Mac M1.
This commit is contained in:
parent
a6b178a3d9
commit
c855dcc52f
@ -24,6 +24,12 @@ add_library(ade STATIC ${OPENCV_3RDPARTY_EXCLUDE_FROM_ALL}
|
|||||||
${ADE_include}
|
${ADE_include}
|
||||||
${ADE_sources}
|
${ADE_sources}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# https://github.com/opencv/ade/issues/32
|
||||||
|
if(CV_CLANG AND CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13.1)
|
||||||
|
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wdeprecated-copy)
|
||||||
|
endif()
|
||||||
|
|
||||||
target_include_directories(ade PUBLIC $<BUILD_INTERFACE:${ADE_root}/include>)
|
target_include_directories(ade PUBLIC $<BUILD_INTERFACE:${ADE_root}/include>)
|
||||||
set_target_properties(ade PROPERTIES
|
set_target_properties(ade PROPERTIES
|
||||||
POSITION_INDEPENDENT_CODE True
|
POSITION_INDEPENDENT_CODE True
|
||||||
|
@ -123,6 +123,9 @@
|
|||||||
//#pragma GCC diagnostic push
|
//#pragma GCC diagnostic push
|
||||||
#pragma GCC diagnostic ignored "-Wsuggest-override"
|
#pragma GCC diagnostic ignored "-Wsuggest-override"
|
||||||
#endif
|
#endif
|
||||||
|
#if defined(__OPENCV_BUILD) && defined(__APPLE__) && defined(__clang__) && ((__clang_major__*100 + __clang_minor__) >= 1301)
|
||||||
|
#pragma clang diagnostic ignored "-Wdeprecated-copy"
|
||||||
|
#endif
|
||||||
#include "opencv2/ts/ts_gtest.h"
|
#include "opencv2/ts/ts_gtest.h"
|
||||||
#if defined(__OPENCV_BUILD) && defined(__GNUC__) && __GNUC__ >= 5
|
#if defined(__OPENCV_BUILD) && defined(__GNUC__) && __GNUC__ >= 5
|
||||||
//#pragma GCC diagnostic pop
|
//#pragma GCC diagnostic pop
|
||||||
|
Loading…
Reference in New Issue
Block a user