Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 06:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed an issue where the FFmpeg CMake find module did not save the complete library paths.

Browse source 
Also added the full library path as output when running cmake.
This commit is contained in:
Leon Styhre 2021-05-13 13:00:11 +02:00
parent 12cc3b05b9
commit f5f79976d0
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
CMake/Packages/FindFFmpeg.cmake
View file

@ -53,6 +53,7 @@ MACRO(FFMPEG_FIND varname shortname headername)
IF (FFMPEG_${varname}_LIBRARIES AND FFMPEG_${varname}_INCLUDE_DIRS) IF (FFMPEG_${varname}_LIBRARIES AND FFMPEG_${varname}_INCLUDE_DIRS)
SET(FFMPEG_${varname}_FOUND 1) SET(FFMPEG_${varname}_FOUND 1)
MESSAGE("-- " ${FFMPEG_${varname}_LINK_LIBRARIES})
ENDIF(FFMPEG_${varname}_LIBRARIES AND FFMPEG_${varname}_INCLUDE_DIRS) ENDIF(FFMPEG_${varname}_LIBRARIES AND FFMPEG_${varname}_INCLUDE_DIRS)
ENDMACRO(FFMPEG_FIND) 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_LIBRARY_DIRS ${FFMPEG_LIBAVFORMAT_LIBRARY_DIRS})
SET(FFMPEG_LIBRARIES SET(FFMPEG_LIBRARIES
${FFMPEG_LIBAVFORMAT_LIBRARIES} ${FFMPEG_LIBAVFORMAT_LINK_LIBRARIES}
${FFMPEG_LIBAVCODEC_LIBRARIES} ${FFMPEG_LIBAVCODEC_LINK_LIBRARIES}
${FFMPEG_LIBAVUTIL_LIBRARIES} ${FFMPEG_LIBAVUTIL_LINK_LIBRARIES}
${FFMPEG_LIBSWRESAMPLE_LIBRARIES} ${FFMPEG_LIBSWRESAMPLE_LINK_LIBRARIES}
${FFMPEG_LIBSWSCALE_LIBRARIES}) ${FFMPEG_LIBSWSCALE_LINK_LIBRARIES})
ELSE () ELSE ()
# MESSAGE(STATUS "Could not find FFMPEG") # MESSAGE(STATUS "Could not find FFMPEG")