From f5f79976d05a8e2bce089ef5ec0fbffac8f154a4 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Thu, 13 May 2021 13:00:11 +0200 Subject: [PATCH] Fixed an issue where the FFmpeg CMake find module did not save the complete library paths. Also added the full library path as output when running cmake. --- CMake/Packages/FindFFmpeg.cmake | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/CMake/Packages/FindFFmpeg.cmake b/CMake/Packages/FindFFmpeg.cmake index 148c7bd99..01bbf84ca 100644 --- a/CMake/Packages/FindFFmpeg.cmake +++ b/CMake/Packages/FindFFmpeg.cmake @@ -53,6 +53,7 @@ MACRO(FFMPEG_FIND varname shortname headername) IF (FFMPEG_${varname}_LIBRARIES AND FFMPEG_${varname}_INCLUDE_DIRS) SET(FFMPEG_${varname}_FOUND 1) + MESSAGE("-- " ${FFMPEG_${varname}_LINK_LIBRARIES}) ENDIF(FFMPEG_${varname}_LIBRARIES AND FFMPEG_${varname}_INCLUDE_DIRS) ENDMACRO(FFMPEG_FIND) @@ -94,11 +95,11 @@ IF (FFMPEG_LIBAVFORMAT_FOUND AND FFMPEG_LIBAVCODEC_FOUND AND FFMPEG_LIBAVUTIL_FO SET(FFMPEG_LIBRARY_DIRS ${FFMPEG_LIBAVFORMAT_LIBRARY_DIRS}) SET(FFMPEG_LIBRARIES - ${FFMPEG_LIBAVFORMAT_LIBRARIES} - ${FFMPEG_LIBAVCODEC_LIBRARIES} - ${FFMPEG_LIBAVUTIL_LIBRARIES} - ${FFMPEG_LIBSWRESAMPLE_LIBRARIES} - ${FFMPEG_LIBSWSCALE_LIBRARIES}) + ${FFMPEG_LIBAVFORMAT_LINK_LIBRARIES} + ${FFMPEG_LIBAVCODEC_LINK_LIBRARIES} + ${FFMPEG_LIBAVUTIL_LINK_LIBRARIES} + ${FFMPEG_LIBSWRESAMPLE_LINK_LIBRARIES} + ${FFMPEG_LIBSWSCALE_LINK_LIBRARIES}) ELSE () # MESSAGE(STATUS "Could not find FFMPEG")