X-Git-Url: https://git.ao2.it/libam7xxx.git/blobdiff_plain/24924e4869890878be88a1c6c324d2fe9ee8f087..refs/heads/debian/master:/cmake_modules/FindFFmpeg.cmake diff --git a/cmake_modules/FindFFmpeg.cmake b/cmake_modules/FindFFmpeg.cmake index eabe5a0..c88d694 100644 --- a/cmake_modules/FindFFmpeg.cmake +++ b/cmake_modules/FindFFmpeg.cmake @@ -17,7 +17,7 @@ #and search the path which contain the libname/header.h (usefull for new version) #Then we need to include ${FFMPEG_libname_INCLUDE_DIRS} (in old version case, use by ffmpeg header and osg plugin code) -# (in new version case, use by ffmpeg header) +# (in new version case, use by ffmpeg header) #and ${FFMPEG_libname_INCLUDE_DIRS/libname} (in new version case, use by osg plugin code) @@ -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