From 5d0129265069a1368f84674b8f1e34cadf61cc5b Mon Sep 17 00:00:00 2001
From: Aline Gondim Santos <aline.gondimsantos@savoirfairelinux.com>
Date: Mon, 1 Aug 2022 11:55:05 -0300
Subject: [PATCH] misc: bump opencv to 4.6.0
Change-Id: I35944fe798a7bc44ee8be6c89627048677a2a88c
---
GreenScreen/CMakeLists.txt | 2 +-
HelloWorld/CMakeLists.txt | 2 +-
README_ASSEMBLE.md | 4 ++--
TensorflowSegmentation/CMakeLists.txt | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/GreenScreen/CMakeLists.txt b/GreenScreen/CMakeLists.txt
index 15f1802..264ec74 100644
--- a/GreenScreen/CMakeLists.txt
+++ b/GreenScreen/CMakeLists.txt
@@ -93,7 +93,7 @@ target_link_directories(${ProjectName} PUBLIC ${CONTRIB_PATH}
)
target_link_libraries(${ProjectName} PUBLIC libavfilter libswscale libavformat libavcodec libavutil libvpx libx264 libopus libmfx
- libzlib ws2_32 Bcrypt Crypt32 Secur32 Dnsapi opencv_imgproc411 opencv_core411 onnxruntime msvcrt)
+ libzlib ws2_32 Bcrypt Crypt32 Secur32 Dnsapi opencv_imgproc460 opencv_core460 onnxruntime msvcrt)
endif()
add_custom_command(
diff --git a/HelloWorld/CMakeLists.txt b/HelloWorld/CMakeLists.txt
index 1a77e94..0721beb 100644
--- a/HelloWorld/CMakeLists.txt
+++ b/HelloWorld/CMakeLists.txt
@@ -74,7 +74,7 @@ target_link_directories(${ProjectName} PUBLIC ${CONTRIB_PATH}
${CONTRIB_PATH}/build/opencv/build/3rdparty/lib/Release
)
-target_link_libraries(${ProjectName} PUBLIC swscale avutil opencv_imgproc411 opencv_core411 zlib)
+target_link_libraries(${ProjectName} PUBLIC swscale avutil opencv_imgproc460 opencv_core460 zlib)
add_custom_command(
TARGET ${ProjectName}
diff --git a/README_ASSEMBLE.md b/README_ASSEMBLE.md
index 39b590f..a1c96b2 100644
--- a/README_ASSEMBLE.md
+++ b/README_ASSEMBLE.md
@@ -2,8 +2,8 @@ $ export DAEMON="<ring-project>/daemon"
OPENCV AND OPENCV_CONTRIB BUILD INSTRUCTIONS
-OPENCV VERSION 4.1.1
-OPENCV_CONTRIB VERSION 4.1.1
+OPENCV VERSION 4.6.0
+OPENCV_CONTRIB VERSION 4.6.0
For Android:
1) Download and install Android NDK
diff --git a/TensorflowSegmentation/CMakeLists.txt b/TensorflowSegmentation/CMakeLists.txt
index f451bbc..f8c40bc 100644
--- a/TensorflowSegmentation/CMakeLists.txt
+++ b/TensorflowSegmentation/CMakeLists.txt
@@ -120,7 +120,7 @@ target_link_directories(${ProjectName} PUBLIC ${CONTRIB_PATH}
${FFMPEG}/bin
)
-target_link_libraries(${ProjectName} PUBLIC swscale avutil libpng opencv_imgcodecs411 opencv_imgproc411 opencv_core411 ${TFLIB} zlib)
+target_link_libraries(${ProjectName} PUBLIC swscale avutil libpng opencv_imgcodecs411 opencv_imgproc460 opencv_core460 ${TFLIB} zlib)
endif()
if (UNIX)
--
GitLab