Skip to content

V
vlc-2-2
Commit ac2e4b77 authored by Faustino Osuna's avatar Faustino Osuna
Browse files
Options

cmake/FindFFmpeg.cmake: Add sub library's CFLAGS to FFmpeg_CFLAGS.

parent d68d15e5
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
extras/buildsystem/cmake/include/FindFFmpeg.cmake
View file @ ac2e4b77
...@@ -19,6 +19,8 @@ if (NOT FFmpeg_SEARCHED) ...@@ -19,6 +19,8 @@ if (NOT FFmpeg_SEARCHED)
foreach (library ffmpeg avcodec avformat avutil postproc swscale) foreach (library ffmpeg avcodec avformat avutil postproc swscale)
find_library( ${library}_LIBRARY ${library} ) find_library( ${library}_LIBRARY ${library} )
if (${library}_LIBRARY) if (${library}_LIBRARY)
pkg_check_modules(${library}_LIBRARY lib${library})
set(FFmpeg_CFLAGS "${FFmpeg_CFLAGS} ${${library}_LIBRARY_CFLAGS}")
set(FFmpeg_LIBRARIES "${library};${FFmpeg_LIBRARIES}") set(FFmpeg_LIBRARIES "${library};${FFmpeg_LIBRARIES}")
set(FFmpeg_FOUND TRUE CACHE INTERNAL "") set(FFmpeg_FOUND TRUE CACHE INTERNAL "")
endif (${library}_LIBRARY) endif (${library}_LIBRARY)
...@@ -26,6 +28,8 @@ if (NOT FFmpeg_SEARCHED) ...@@ -26,6 +28,8 @@ if (NOT FFmpeg_SEARCHED)
foreach (library a52 faac lame z png mp3lame twolame) foreach (library a52 faac lame z png mp3lame twolame)
find_library( ${library}_LIBRARY ${library} ) find_library( ${library}_LIBRARY ${library} )
if (${library}_LIBRARY) if (${library}_LIBRARY)
pkg_check_modules(${library}_LIBRARY lib${library})
set(FFmpeg_CFLAGS "${FFmpeg_CFLAGS} ${${library}_LIBRARY_CFLAGS}")
set(FFmpeg_LIBRARIES "${library};${FFmpeg_LIBRARIES}") set(FFmpeg_LIBRARIES "${library};${FFmpeg_LIBRARIES}")
endif (${library}_LIBRARY) endif (${library}_LIBRARY)
endforeach (library) endforeach (library)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment