OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-07 03:53:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake: Add FFmpeg/x264 include header path suffix

Browse source 
This allows people to use the base directory of cross-compiled
dependencies (typically our dependencies.zip file), rather than always
having to specify the actual include directory.
This commit is contained in:
jp9000 2015-08-12 04:21:26 -07:00
parent a56109b6e6
commit 81649eab0d
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/Modules/FindFFmpeg.cmake
View file

@ -49,7 +49,7 @@ function(find_ffmpeg_library component header)
${DepsPath${_lib_suffix}}
${DepsPath}
${PC_FFMPEG_${component}_INCLUDE_DIRS}
PATH_SUFFIXES ffmpeg libav)
PATH_SUFFIXES ffmpeg libav include)
find_library(FFMPEG_${component}_LIBRARY
NAMES

4
cmake/Modules/FindLibx264.cmake
View file

@ -32,7 +32,9 @@ find_path(X264_INCLUDE_DIR
${DepsPath}
${_X264_INCLUDE_DIRS}
PATHS
/usr/include /usr/local/include /opt/local/include /sw/include)
/usr/include /usr/local/include /opt/local/include /sw/include
PATH_SUFFIXES
include)
find_library(X264_LIB
NAMES ${_X264_LIBRARIES} x264 libx264