Changeset 1369

Timestamp:

03/20/08 03:37:34 (8 months ago)

Author:

timdewhirst

Message:

openlibraries
- ensure all ffmpeg libs are linked

Location:

trunk

Files:

• FindFFMPEG.cmake (modified) (1 diff)
• src/openmedialib/plugins/avformat/CMakeLists.txt (modified) (1 diff)

trunk/FindFFMPEG.cmake

@@ -4 +4 @@
 #  FFMPEG_FOUND        - system has FFMPEG
 #  FFMPEG_INCLUDE_DIR  - the include directory
+#  FFMPEG_LIBRARY_DIR  - the directory containing the libraries
 #  FFMPEG_LIBRARIES    - Link these to use FFMPEG
 #   
 
-SET( FFMPEG_NAMES avformat avcodec avutil avdevice swscale )
 SET( FFMPEG_HEADERS avformat.h avcodec.h avutil.h avdevice.h swscale.h )
 if( WIN32 )
+   SET( FFMPEG_LIBRARIES avformat.lib avcodec.lib avutil.lib avdevice.lib swscale.lib )
    FIND_PATH( FFMPEG_INCLUDE_DIR ${FFMPEG_HEADERS}
               PATHS $ENV{FFMPEGDIR}/include/ffmpeg )
-   FIND_LIBRARY( FFMPEG_LIBRARIES
-                 NAMES ${FFMPEG_NAMES}
-                 PATHS $ENV{FFMPEGDIR}/lib )
+   FIND_PATH( FFMPEG_LIBRARY_DIR ${FFMPEG_LIBRARIES}
+              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_LIBRARY( FFMPEG_LIBRARIES
-                 NAMES ${FFMPEG_NAMES}
-                 PATHS /usr/lib /usr/local/lib )
+   FIND_PATH( FFMPEG_LIBRARY_DIR ${FFMPEG_LIBRARIES}
+              PATHS /usr/lib /usr/local/lib )
 endif( WIN32 )
 
-IF (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARIES)
+IF (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARY_DIR)
    SET(FFMPEG_FOUND TRUE)
-ELSE (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARIES)
+   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_LIBRARIES)
+ENDIF (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARY_DIR)
 
 MARK_AS_ADVANCED(
-  FFMPEG_LIBRARIES
+  FFMPEG_LIBRARY_DIR
   FFMPEG_INCLUDE_DIR
 )

trunk/src/openmedialib/plugins/avformat/CMakeLists.txt

@@ -24 +24 @@
 find_package( FFMPEG )
 if( FFMPEG_FOUND )
-   message( "found FFMPEG: ${FFMPEG_INCLUDE_DIR}" )
+   message( "found FFMPEG: ${FFMPEG_INCLUDE_DIR} ${FFMPEG_LIBRARY_DIR}" )
    include_directories( ${FFMPEG_INCLUDE_DIR} )
    target_link_libraries( ${NAME} ${FFMPEG_LIBRARIES} )
 endif( FFMPEG_FOUND )
+
+# kill some warnings
+if ( WIN32 )
+   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244" )
+endif( WIN32 )
 
 # required links