Merge branch 'yarp-3.7'

robotology · Oct 8, 2022 · bb7fa68 · bb7fa68
2 parents da9d3a6 + a00b1e6
commit bb7fa68
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/doc/release/yarp_3_7/fixffmpegwin.md b/doc/release/yarp_3_7/fixffmpegwin.md
@@ -0,0 +1,4 @@
+fixffmpegwin {#yarp_3_7}
+-----------
+
+*  ffmpeg_grabber: Fix linking problems on Windows.
diff --git a/src/devices/ffmpeg/CMakeLists.txt b/src/devices/ffmpeg/CMakeLists.txt
@@ -8,14 +8,14 @@ yarp_prepare_plugin(ffmpeg_grabber
   INCLUDE FfmpegGrabber.h
   EXTRA_CONFIG
     WRAPPER=grabberDual
-  DEPENDS "YARP_HAS_FFMPEG;FFMPEG_avformat_FOUND;FFMPEG_avdevice_FOUND;FFMPEG_swscale_FOUND"
+  DEPENDS "YARP_HAS_FFMPEG;FFMPEG_avcodec_FOUND;FFMPEG_avformat_FOUND;FFMPEG_avdevice_FOUND;FFMPEG_avutil_FOUND;FFMPEG_swscale_FOUND"
 )
 
 yarp_prepare_plugin(ffmpeg_writer
   CATEGORY device
   TYPE FfmpegWriter
   INCLUDE FfmpegWriter.h
-  DEPENDS "YARP_HAS_FFMPEG;FFMPEG_avformat_FOUND;FFMPEG_avdevice_FOUND;FFMPEG_swscale_FOUND"
+  DEPENDS "YARP_HAS_FFMPEG;FFMPEG_avcodec_FOUND;FFMPEG_avformat_FOUND;FFMPEG_avdevice_FOUND;FFMPEG_avutil_FOUND;FFMPEG_swscale_FOUND"
 )
 
 if(NOT SKIP_ffmpeg_grabber OR NOT SKIP_ffmpeg_writer)
@@ -48,13 +48,15 @@ if(NOT SKIP_ffmpeg_grabber OR NOT SKIP_ffmpeg_writer)
       ${FFMPEG_avcodec_INCLUDE_DIRS}
       ${FFMPEG_avformat_INCLUDE_DIRS}
       ${FFMPEG_avdevice_INCLUDE_DIRS}
+      ${FFMPEG_avutil_INCLUDE_DIRS}
       ${FFMPEG_swscale_INCLUDE_DIRS}
   )
   target_link_libraries(yarp_ffmpeg
     PRIVATE
       ${FFMPEG_avcodec_LIBRARIES}
       ${FFMPEG_avformat_LIBRARIES}
       ${FFMPEG_avdevice_LIBRARIES}
+      ${FFMPEG_avutil_LIBRARIES}
       ${FFMPEG_swscale_LIBRARIES}
   )
   # list(APPEND YARP_${YARP_PLUGIN_MASTER}_PRIVATE_DEPS FFMPEG) # Not using targets

diff --git a/src/portmonitors/image_compression_ffmpeg/CMakeLists.txt b/src/portmonitors/image_compression_ffmpeg/CMakeLists.txt
@@ -5,7 +5,7 @@ yarp_prepare_plugin(image_compression_ffmpeg
   TYPE FfmpegMonitorObject
   INCLUDE ffmpegPortmonitor.h
   CATEGORY portmonitor
-  DEPENDS "ENABLE_yarpcar_portmonitor;YARP_HAS_FFMPEG;FFMPEG_swscale_FOUND"
+  DEPENDS "ENABLE_yarpcar_portmonitor;YARP_HAS_FFMPEG;FFMPEG_avcodec_FOUND;FFMPEG_avutil_FOUND;FFMPEG_swscale_FOUND"
 )
 
 if(SKIP_image_compression_ffmpeg)
@@ -33,11 +33,13 @@ list(APPEND YARP_${YARP_PLUGIN_MASTER}_PRIVATE_DEPS
 target_include_directories(yarp_pm_image_compression_ffmpeg
   SYSTEM PRIVATE
     ${FFMPEG_avcodec_INCLUDE_DIRS}
+    ${FFMPEG_avutil_INCLUDE_DIRS}
     ${FFMPEG_swscale_INCLUDE_DIRS}
 )
 target_link_libraries(yarp_pm_image_compression_ffmpeg
   PRIVATE
     ${FFMPEG_avcodec_LIBRARIES}
+    ${FFMPEG_avutil_LIBRARIES}
     ${FFMPEG_swscale_LIBRARIES}
 )
 # list(APPEND YARP_${YARP_PLUGIN_MASTER}_PRIVATE_DEPS FFMPEG) # Not using targets