Show
Ignore:
Timestamp:
03/03/09 17:36:31 (4 years ago)
Author:
shuber
Message:

merging from trunk using

svn merge -r 9837:9843 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk

Location:
OpenSceneGraph/branches/osg-cocoa-dev
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • OpenSceneGraph/branches/osg-cocoa-dev

    • Property svn:mergeinfo set to /OpenSceneGraph/trunk:9838-9843

  • OpenSceneGraph/branches/osg-cocoa-dev/CMakeModules/FindFFmpeg.cmake

    r9817 r9846  
    1 # Locate gdal 
     1# Locate ffmpeg 
    22# This module defines 
    33# FFMPEG_LIBRARIES 
    4 # FFMPEG_FOUND, if false, do not try to link to gdal  
     4# FFMPEG_FOUND, if false, do not try to link to ffmpeg  
    55# FFMPEG_INCLUDE_DIR, where to find the headers 
    66# 
    … …  
    1010# Created by Robert Osfield.  
    1111 
    12 #use pkg-config to find various modues 
     12#use pkg-config to find various modes 
    1313INCLUDE(FindPkgConfig OPTIONAL) 
    1414 
    … …  
    3030 
    3131    SET(FFMPEG_INCLUDE_DIRS ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}) 
    32      
     32 
     33    SET(FFMPEG_LIBRARY_DIRS ${FFMPEG_LIBAVFORMAT_LIBRARY_DIRS}) 
     34 
    3335    SET(FFMPEG_LIBRARIES 
    3436        ${FFMPEG_LIBAVFORMAT_LIBRARIES} 
    … …  
    3638        ${FFMPEG_LIBAVCODEC_LIBRARIES} 
    3739        ${FFMPEG_LIBAVUTIL_LIBRARIES}) 
    38      
     40    
    3941ENDIF(FFMPEG_LIBAVFORMAT_FOUND AND FFMPEG_LIBAVDEVICE_FOUND AND FFMPEG_LIBAVCODEC_FOUND AND FFMPEG_LIBAVUTIL_FOUND) 
    4042