Changeset 1412

Timestamp:

08/01/08 11:30:36 (4 months ago)

Author:

timdewhirst

Message:

libs
- use pkg_config for ffmpeg if possible

Files:

• trunk/FindFFMPEG.cmake (modified) (1 diff)

trunk/FindFFMPEG.cmake

@@ -16 +16 @@
               PATHS $ENV{FFMPEGDIR}/lib )
 else( WIN32 )
+    INCLUDE(FindPkgConfig)
+
     #FindAvformat
+    if ( PKG_CONFIG_FOUND )
+       pkg_check_modules( AVFORMAT libavformat )
+    endif ( PKG_CONFIG_FOUND )
+  
     FIND_PATH( AVFORMAT_INCLUDE_DIR avformat.h
-               PATHS /usr/include/
-                     /usr/include/libavformat/
+               PATHS ${AVFORMAT_INCLUDE_DIRS}
+                     /usr/include/
                      /usr/include/ffmpeg/
-                     /usr/include/ffmpeg/libavformat/ )
+               PATH_SUFFIXES libavformat )
 
     FIND_LIBRARY( AVFORMAT_LIBRARY avformat
-                  PATHS /usr/lib/
+                  PATHS ${AVFORMAT_LIBRARY_DIRS}
+                        /usr/lib/
                         /usr/lib/ffmpeg/ )
     #FindAvcodec
+    if ( PKG_CONFIG_FOUND )
+       pkg_check_modules( AVCODEC libavcodec )
+    endif ( PKG_CONFIG_FOUND )
+  
     FIND_PATH( AVCODEC_INCLUDE_DIR avcodec.h
-               PATHS /usr/include/
-                     /usr/include/libavcodec/
+               PATHS ${AVCODEC_INCLUDE_DIRS}
+                     /usr/include/
                      /usr/include/ffmpeg/
-                     /usr/include/ffmpeg/libavcodec/ )
+               PATH_SUFFIXES libavcodec )
 
     FIND_LIBRARY( AVCODEC_LIBRARY avcodec
-                  PATHS /usr/lib/
+                  PATHS ${AVCODEC_LIBRARY_DIRS}
+                        /usr/lib/
                         /usr/lib/ffmpeg/ )
     #FindAvutil
+    if ( PKG_CONFIG_FOUND )
+       pkg_check_modules( AVUTIL libavutil )
+    endif ( PKG_CONFIG_FOUND )
+
     FIND_PATH( AVUTIL_INCLUDE_DIR avutil.h
-               PATHS /usr/include/
-                     /usr/include/libavutil/
+               PATHS ${AVUTIL_INCLUDE_DIRS}
+                     /usr/include/
                      /usr/include/ffmpeg/
-                     /usr/include/ffmpeg/libavutil/ )
+               PATH_SUFFIXES libavutil )
 
     FIND_LIBRARY( AVUTIL_LIBRARY avutil
-                  PATHS /usr/lib/
+                  PATHS ${AVUTIL_LIBRARY_DIRS}
+                        /usr/lib/
                         /usr/lib/ffmpeg/ )
 
     #FindAvdevice
+    if ( PKG_CONFIG_FOUND )
+       pkg_check_modules( AVDEVICE libavdevice )
+    endif ( PKG_CONFIG_FOUND )
+
     FIND_PATH( AVDEVICE_INCLUDE_DIR avdevice.h
-               PATHS /usr/include/
-                     /usr/include/libavdevice/
+               PATHS ${AVDEVICE_INCLUDE_DIRS}
+                     /usr/include/
                      /usr/include/ffmpeg/
-                     /usr/include/ffmpeg/libavdevice/ )
+               PATH_SUFFIXES libavdevice )
 
     FIND_LIBRARY( AVDEVICE_LIBRARY avdevice
-                  PATHS /usr/lib/
+                  PATHS ${AVDEVICE_LIBRARY_DIRS}        
+                        /usr/lib/
                         /usr/lib/ffmpeg/ )
     #FindSwscale
+    if ( PKG_CONFIG_FOUND )
+       pkg_check_modules( SWSCALE libswscale )
+    endif ( PKG_CONFIG_FOUND )
+
     FIND_PATH( SWSCALE_INCLUDE_DIR swscale.h
-               PATHS /usr/include/
-                     /usr/include/libswscale/
+               PATHS ${SWSCALE_INCLUDE_DIRS}
+                     /usr/include/
                      /usr/include/ffmpeg/
-                     /usr/include/ffmpeg/libswscale/ )
+               PATH_SUFFIXES libswscale )
 
     FIND_LIBRARY( SWSCALE_LIBRARY swscale
-                  PATHS /usr/lib/
+                  PATHS ${SWSCALE_LIBRARY_DIRS}
+                        /usr/lib/
                         /usr/lib/ffmpeg/ )