From 81649eab0ddd61891ff0eda2111a171f98a1554c Mon Sep 17 00:00:00 2001 From: jp9000 Date: Wed, 12 Aug 2015 04:21:26 -0700 Subject: [PATCH] cmake: Add FFmpeg/x264 include header path suffix 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. --- cmake/Modules/FindFFmpeg.cmake | 2 +- cmake/Modules/FindLibx264.cmake | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cmake/Modules/FindFFmpeg.cmake b/cmake/Modules/FindFFmpeg.cmake index 438b58168..aca205ed7 100644 --- a/cmake/Modules/FindFFmpeg.cmake +++ b/cmake/Modules/FindFFmpeg.cmake @@ -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 diff --git a/cmake/Modules/FindLibx264.cmake b/cmake/Modules/FindLibx264.cmake index 7c5ffa26e..a968b3452 100644 --- a/cmake/Modules/FindLibx264.cmake +++ b/cmake/Modules/FindLibx264.cmake @@ -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