am7xxx: use hex notation for USB endpoints

[libam7xxx.git] / cmake_modules / FindFFmpeg.cmake

diff --git a/cmake_modules/FindFFmpeg.cmake b/cmake_modules/FindFFmpeg.cmake
index eabe5a0..c88d694 100644 (file)
--- 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)
 #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)
 
 
 #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}
     # 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
         ${FFMPEG_ROOT}/include
         $ENV{FFMPEG_DIR}/include
         $ENV{OSGDIR}/include
         $ENV{OSG_ROOT}/include

+        PATHS

         ~/Library/Frameworks
         /Library/Frameworks
         /usr/local/include
         ~/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}
     # 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
             ${FFMPEG_ROOT}/include
             $ENV{FFMPEG_DIR}/include
             $ENV{OSGDIR}/include
             $ENV{OSG_ROOT}/include

+            PATHS

             ~/Library/Frameworks
             /Library/Frameworks
             /usr/local/include
             ~/Library/Frameworks
             /Library/Frameworks
             /usr/local/include


@@ -69,11 +72,12 @@ MACRO(FFMPEG_FIND varname shortname headername)
 
     FIND_LIBRARY(FFMPEG_${varname}_LIBRARIES
         NAMES ${shortname}
 
     FIND_LIBRARY(FFMPEG_${varname}_LIBRARIES
         NAMES ${shortname}

-        PATHS
+        HINTS

         ${FFMPEG_ROOT}/lib
         $ENV{FFMPEG_DIR}/lib
         $ENV{OSGDIR}/lib
         $ENV{OSG_ROOT}/lib
         ${FFMPEG_ROOT}/lib
         $ENV{FFMPEG_DIR}/lib
         $ENV{OSGDIR}/lib
         $ENV{OSG_ROOT}/lib

+        PATHS

         ~/Library/Frameworks
         /Library/Frameworks
         /usr/local/lib
         ~/Library/Frameworks
         /Library/Frameworks
         /usr/local/lib