From: Reto Schneider Date: Sun, 8 Apr 2012 12:24:43 +0000 (+0200) Subject: Fix usage of FIND_PATH, allow $FFMPEG_DIR to be used. X-Git-Tag: v0.1.3~37^2~12^2 X-Git-Url: https://git.ao2.it/libam7xxx.git/commitdiff_plain/eebd277e4483ec40903a4f078bf12634078aab6f?hp=-c Fix usage of FIND_PATH, allow $FFMPEG_DIR to be used. --- eebd277e4483ec40903a4f078bf12634078aab6f diff --git a/cmake_modules/FindFFmpeg.cmake b/cmake_modules/FindFFmpeg.cmake index 1dc76d5..c88d694 100644 --- a/cmake_modules/FindFFmpeg.cmake +++ b/cmake_modules/FindFFmpeg.cmake @@ -27,11 +27,12 @@ MACRO(FFMPEG_FIND varname shortname headername) # old version of ffmpeg put header in $prefix/include/[ffmpeg] # so try to find header in include directory FIND_PATH(FFMPEG_${varname}_INCLUDE_DIRS ${headername} - PATHS + HINTS ${FFMPEG_ROOT}/include $ENV{FFMPEG_DIR}/include $ENV{OSGDIR}/include $ENV{OSG_ROOT}/include + PATHS ~/Library/Frameworks /Library/Frameworks /usr/local/include @@ -49,10 +50,12 @@ MACRO(FFMPEG_FIND varname shortname headername) # so try to find lib${shortname}/header in include directory IF(NOT FFMPEG_${varname}_INCLUDE_DIRS) FIND_PATH(FFMPEG_${varname}_INCLUDE_DIRS lib${shortname}/${headername} + HINTS ${FFMPEG_ROOT}/include $ENV{FFMPEG_DIR}/include $ENV{OSGDIR}/include $ENV{OSG_ROOT}/include + PATHS ~/Library/Frameworks /Library/Frameworks /usr/local/include @@ -69,11 +72,12 @@ MACRO(FFMPEG_FIND varname shortname headername) FIND_LIBRARY(FFMPEG_${varname}_LIBRARIES NAMES ${shortname} - PATHS + HINTS ${FFMPEG_ROOT}/lib $ENV{FFMPEG_DIR}/lib $ENV{OSGDIR}/lib $ENV{OSG_ROOT}/lib + PATHS ~/Library/Frameworks /Library/Frameworks /usr/local/lib