Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[build] Suppress enum-enum deprecation warning in OpenCV (#4365)

Browse Source
This commit is contained in:
Tyler Veness
2022-08-19 23:51:43 -07:00
committed by GitHub
parent 8d28851263
commit be5270697a
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/modules/CompileWarnings.cmake
View File

@@ -4,4 +4,12 @@ macro(wpilib_target_warnings target)
else()
target_compile_options(${target} PRIVATE /wd4146 /wd4244 /wd4251 /wd4267 /WX /D_CRT_SECURE_NO_WARNINGS ${WPILIB_TARGET_WARNINGS})
endif()
# Suppress C++-specific OpenCV warning; C compiler rejects it with an error
# https://github.com/opencv/opencv/issues/20269
if(UNIX AND NOT APPLE)
target_compile_options(${target} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-Wno-deprecated-enum-enum-conversion>)
elseif(UNIX AND APPLE)
target_compile_options(${target} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-Wno-deprecated-anon-enum-enum-conversion>)
endif()
endmacro()

10
shared/config.gradle
View File

@@ -43,6 +43,16 @@ nativeUtils.platformConfigs.each {
}
}
// Suppress OpenCV warning
// https://github.com/opencv/opencv/issues/20269
nativeUtils.platformConfigs.each {
if (it.name == 'linuxx86-64') {
it.cppCompiler.args.add("-Wno-deprecated-enum-enum-conversion")
} else if (it.name == 'osxx86-64' || it.name == 'osxarm64') {
it.cppCompiler.args.add("-Wno-deprecated-anon-enum-enum-conversion")
}
}
nativeUtils.platformConfigs.linuxathena.linker.args.add("-Wl,--fatal-warnings")
model {