Allow cmake variables to be used to specify include directories, and allow DepsPath or DepsPath32/64 to be used to specify dependency locations.
@@ -42,6 +42,12 @@ function(find_ffmpeg_library component header)
HINTS
ENV FFmpegPath${_lib_suffix}
ENV FFmpegPath
+ ENV DepsPath${_lib_suffix}
+ ENV DepsPath
+ ${FFmpegPath${lib_suffix}}
+ ${FFmpegPath}
+ ${DepsPath${lib_suffix}}
+ ${DepsPath}
${PC_FFMPEG_${component}_INCLUDE_DIRS}
PATH_SUFFIXES ffmpeg libav)
@@ -22,6 +22,12 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build
ENV FreetypePath${_lib_suffix}
ENV FreetypePath
ENV FREETYPE_DIR
+ ${FreetypePath${lib_suffix}}
+ ${FreetypePath}
${_FREETYPE_INCLUDE_DIRS}
PATHS
/usr/include /usr/local/include /opt/local/include /sw/include
@@ -21,6 +21,12 @@ find_path(Jansson_INCLUDE_DIR
ENV JanssonPath${_lib_suffix}
ENV JanssonPath
+ ${JanssonPath${lib_suffix}}
+ ${JanssonPath}
${_JANSSON_INCLUDE_DIRS}
/usr/include /usr/local/include /opt/local/include /sw/include)
@@ -24,6 +24,12 @@ find_path(CURL_INCLUDE_DIR
ENV curlPath${_lib_suffix}
ENV curlPath
+ ${curlPath${lib_suffix}}
+ ${curlPath}
${_CURL_INCLUDE_DIRS}
@@ -24,6 +24,12 @@ find_path(X264_INCLUDE_DIR
ENV x264Path${_lib_suffix}
ENV x264Path
+ ${x264Path${lib_suffix}}
+ ${x264Path}
${_X264_INCLUDE_DIRS}