mirror of
https://github.com/RetroDECK/ES-DE.git
synced 2024-11-21 21:55:38 +00:00
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.
This commit is contained in:
parent
12cc3b05b9
commit
f5f79976d0
|
@ -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")
|
||||
|
|
Loading…
Reference in a new issue