Changeset 10391

Show
Ignore:
Timestamp:
06/23/09 12:53:55 (5 years ago)
Author:
robert
Message:

Added explict search for stdint.h

Location:
OpenSceneGraph/trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/CMakeModules/FindFFmpeg.cmake

    r10226 r10391  
    9191SET(FFMPEG_ROOT "$ENV{FFMPEG_DIR}" CACHE PATH "Location of FFMPEG") 
    9292 
     93# find stdint.h 
     94FIND_PATH(FFMPEG_STDINT_INCLUDE_DIR stdint.h 
     95    PATHS 
     96    ${FFMPEG_ROOT}/include 
     97    $ENV{FFMPEG_DIR}/include 
     98    ~/Library/Frameworks 
     99    /Library/Frameworks 
     100    /usr/local/include 
     101    /usr/include 
     102    /sw/include # Fink 
     103    /opt/local/include # DarwinPorts 
     104    /opt/csw/include # Blastwave 
     105    /opt/include 
     106    /usr/freeware/include 
     107    PATH_SUFFIXES ffmpeg 
     108    DOC "Location of FFMPEG stdint.h Header" 
     109) 
     110 
    93111FFMPEG_FIND(LIBAVFORMAT avformat avformat.h) 
    94112FFMPEG_FIND(LIBAVDEVICE avdevice avdevice.h) 
     
    99117SET(FFMPEG_FOUND "NO") 
    100118# Note we don't check FFMPEG_LIBSWSCALE_FOUND here, it's optional. 
    101 IF   (FFMPEG_LIBAVFORMAT_FOUND AND FFMPEG_LIBAVDEVICE_FOUND AND FFMPEG_LIBAVCODEC_FOUND AND FFMPEG_LIBAVUTIL_FOUND) 
     119IF   (FFMPEG_LIBAVFORMAT_FOUND AND FFMPEG_LIBAVDEVICE_FOUND AND FFMPEG_LIBAVCODEC_FOUND AND FFMPEG_LIBAVUTIL_FOUND AND FFMPEG_STDINT_INCLUDE_DIR) 
    102120 
    103121    SET(FFMPEG_FOUND "YES") 
     
    114132        ${FFMPEG_LIBAVUTIL_LIBRARIES}) 
    115133 
    116 ELSE (FFMPEG_LIBAVFORMAT_FOUND AND FFMPEG_LIBAVDEVICE_FOUND AND FFMPEG_LIBAVCODEC_FOUND AND FFMPEG_LIBAVUTIL_FOUND) 
     134ELSE () 
    117135 
    118136#    MESSAGE(STATUS "Could not find FFMPEG") 
    119137 
    120 ENDIF(FFMPEG_LIBAVFORMAT_FOUND AND FFMPEG_LIBAVDEVICE_FOUND AND FFMPEG_LIBAVCODEC_FOUND AND FFMPEG_LIBAVUTIL_FOUND) 
     138ENDIF() 
  • OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/CMakeLists.txt

    r10082 r10391  
    77    ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS} ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS}/libavcodec 
    88    ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS} ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS}/libavcodec 
     9    ${FFMPEG_STDINT_INCLUDE_DIR} 
    910) 
    1011