Changeset 1376 for trunk/FindFFMPEG.cmake

Timestamp:

06/14/08 08:03:18 (5 months ago)

Author:

rexbron

Message:

• Fix CMake build files for Linux.
  
  • Merge patches from http://lists.openlibraries.org/pipermail/developers/2008-June/000006
    

Location:

trunk

Files:

• . (modified) (4 props)
• FindFFMPEG.cmake (modified) (1 diff)

trunk/FindFFMPEG.cmake

@@ -16 +16 @@
               PATHS $ENV{FFMPEGDIR}/lib )
 else( WIN32 )
-   SET( FFMPEG_LIBRARIES avformat.* avcodec.* avutil.* avdevice.* swscale.* )
-   FIND_PATH( FFMPEG_INCLUDE_DIR ${FFMPEG_HEADERS}
-              PATHS /usr/local/include/ffmpeg /usr/include/ffmpeg )
-   FIND_PATH( FFMPEG_LIBRARY_DIR ${FFMPEG_LIBRARIES}
-              PATHS /usr/lib /usr/local/lib )
+   #SET( FFMPEG_LIBRARIES avformat.* avcodec.* avutil.* avdevice.* swscale.* )
+   #FIND_PATH( FFMPEG_INCLUDE_DIR ${FFMPEG_HEADERS}
+   #           PATHS /usr/local/include/ffmpeg /usr/include/ffmpeg )
+   #FIND_PATH( FFMPEG_LIBRARY_DIR ${FFMPEG_LIBRARIES}
+   #           PATHS /usr/lib /usr/local/lib )
+    #FindAvformat
+    FIND_PATH( AVFORMAT_INCLUDE_DIR avformat.h
+               PATHS /usr/include/
+                     /usr/include/libavformat/
+                     /usr/include/ffmpeg/
+                     /usr/include/ffmpeg/libavformat/ )
+
+    FIND_LIBRARY( AVFORMAT_LIBRARY avformat
+                  PATHS /usr/lib/
+                        /usr/lib/ffmpeg/ )
+    #FindAvcodec
+    FIND_PATH( AVCODEC_INCLUDE_DIR avcodec.h
+               PATHS /usr/include/
+                     /usr/include/libavcodec/
+                     /usr/include/ffmpeg/
+                     /usr/include/ffmpeg/libavcodec/ )
+
+    FIND_LIBRARY( AVCODEC_LIBRARY avcodec
+                  PATHS /usr/lib/
+                        /usr/lib/ffmpeg/ )
+    #FindAvutil
+    FIND_PATH( AVUTIL_INCLUDE_DIR avutil.h
+               PATHS /usr/include/
+                     /usr/include/libavutil/
+                     /usr/include/ffmpeg/
+                     /usr/include/ffmpeg/libavutil/ )
+
+    FIND_LIBRARY( AVUTIL_LIBRARY avutil
+                  PATHS /usr/lib/
+                        /usr/lib/ffmpeg/ )
+
+    #FindAvdevice
+    FIND_PATH( AVDEVICE_INCLUDE_DIR avdevice.h
+               PATHS /usr/include/
+                     /usr/include/libavdevice/
+                     /usr/include/ffmpeg/
+                     /usr/include/ffmpeg/libavdevice/ )
+
+    FIND_LIBRARY( AVDEVICE_LIBRARY avdevice
+                  PATHS /usr/lib/
+                        /usr/lib/ffmpeg/ )
+    #FindSwscale
+    FIND_PATH( SWSCALE_INCLUDE_DIR swscale.h
+               PATHS /usr/include/
+                     /usr/include/libswscale/
+                     /usr/include/ffmpeg/
+                     /usr/include/ffmpeg/libswscale/ )
+
+    FIND_LIBRARY( SWSCALE_LIBRARY swscale
+                  PATHS /usr/lib/
+                        /usr/lib/ffmpeg/ )
+
 endif( WIN32 )
 
-IF (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARY_DIR)
-   SET(FFMPEG_FOUND TRUE)
-   FOREACH( l ${FFMPEG_LIBRARIES} )
-        SET( TMP ${TMP} ${FFMPEG_LIBRARY_DIR}/${l} )
-   ENDFOREACH( l )
-   SET( FFMPEG_LIBRARIES ${TMP} )
-ELSE (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARY_DIR)
-   SET( FFMPEG_FOUND FALSE )
-   SET( FFMPEG_LIBRARY_DIR )
-ENDIF (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARY_DIR)
+SET( FFMPEG_FOUND FALSE )
+
+IF ( AVFORMAT_INCLUDE_DIR AND AVFORMAT_LIBRARY )
+    SET ( AVFORMAT_FOUND TRUE )
+ENDIF ( AVFORMAT_INCLUDE_DIR AND AVFORMAT_LIBRARY )
+
+IF ( AVCODEC_INCLUDE_DIR AND AVCODEC_LIBRARY ) 
+    SET ( AVCODEC_FOUND TRUE)
+ENDIF ( AVCODEC_INCLUDE_DIR AND AVCODEC_LIBRARY )
+
+IF ( AVUTIL_INCLUDE_DIR AND AVUTIL_LIBRARY )
+    SET ( AVUTIL_FOUND TRUE )
+ENDIF ( AVUTIL_INCLUDE_DIR AND AVUTIL_LIBRARY )
+
+IF ( AVDEVICE_INCLUDE_DIR AND AVDEVICE_LIBRARY ) 
+    SET ( AVDEVICE_FOUND TRUE )
+ENDIF ( AVDEVICE_INCLUDE_DIR AND AVDEVICE_LIBRARY )
+
+IF ( SWSCALE_INCLUDE_DIR AND SWSCALE_LIBRARY )
+    SET ( SWSCALE_FOUND TRUE )
+ENDIF ( SWSCALE_INCLUDE_DIR AND SWSCALE_LIBRARY )
+
+
+IF ( WIN32 )
+    IF (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARY_DIR)
+       SET(FFMPEG_FOUND TRUE)
+       FOREACH( l ${FFMPEG_LIBRARIES} )
+            SET( TMP ${TMP} ${FFMPEG_LIBRARY_DIR}/${l} )
+       ENDFOREACH( l )
+       SET( FFMPEG_LIBRARIES ${TMP} )
+    ELSE (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARY_DIR)
+       SET( FFMPEG_FOUND FALSE )
+       SET( FFMPEG_LIBRARY_DIR )
+    ENDIF (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARY_DIR)
+ELSE ( WIN32 )
+
+    IF ( AVFORMAT_INCLUDE_DIR OR AVCODEC_INCLUDE_DIR OR AVUTIL_INCLUDE_DIR OR AVDEVICE_FOUND OR SWSCALE_FOUND )
+
+        SET ( FFMPEG_FOUND TRUE )
+
+        SET ( FFMPEG_INCLUDE_DIR
+              ${AVFORMAT_INCLUDE_DIR}
+              ${AVCODEC_INCLUDE_DIR}
+              ${AVUTIL_INCLUDE_DIR}
+              ${AVDEVICE_INCLUDE_DIR}
+              ${SWSCALE_INCLUDE_DIR} )
+        
+        SET ( FFMPEG_LIBRARIES 
+              ${AVFORMAT_LIBRARY}
+              ${AVCODEC_LIBRARY}
+              ${AVUTIL_LIBRARY}
+              ${AVDEVICE_LIBRARY}
+              ${SWSCALE_LIBRARY} )
+    
+    ENDIF ( AVFORMAT_INCLUDE_DIR OR AVCODEC_INCLUDE_DIR OR AVUTIL_INCLUDE_DIR OR AVDEVICE_FOUND OR SWSCALE_FOUND )
+
+ENDIF ( WIN32 )
 
 MARK_AS_ADVANCED(