Skip to content
Snippets Groups Projects
Commit 5d012926 authored by Aline Gondim Santos's avatar Aline Gondim Santos
Browse files

misc: bump opencv to 4.6.0

Change-Id: I35944fe798a7bc44ee8be6c89627048677a2a88c
parent a909602e
No related branches found
No related tags found
No related merge requests found
......@@ -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(
......
......@@ -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}
......
......@@ -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
......
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment