- Timestamp:
- 03/03/09 17:36:31 (4 years ago)
- Location:
- OpenSceneGraph/branches/osg-cocoa-dev
- Files:
-
- 2 modified
-
. (modified) (1 prop)
-
src/osgPlugins/ffmpeg/CMakeLists.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
OpenSceneGraph/branches/osg-cocoa-dev
- Property svn:mergeinfo set to /OpenSceneGraph/trunk:9838-9843
-
OpenSceneGraph/branches/osg-cocoa-dev/src/osgPlugins/ffmpeg/CMakeLists.txt
r9827 r9846 2 2 3 3 INCLUDE_DIRECTORIES( 4 ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS} ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}/libavformat 5 ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS} ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS}/libavdevice 6 ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS} ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS}/libavcodec 7 ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS} ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS}/libavcodec 4 ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS} ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}/libavformat ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}/ffmpeg 5 ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS} ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS}/libavdevice ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS}/ffmpeg 6 ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS} ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS}/libavcodec ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS}/ffmpeg 7 ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS} ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS}/libavcodec ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS}/ffmpeg 8 8 ) 9 9 10 MESSAGE("FFMPEG_INCLUDE_DIRS = " ${FFMPEG_INCLUDE_DIRS} ) 11 MESSAGE("FFMPEG_LIBRARIES = " ${FFMPEG_LIBRARIES} ) 10 # MESSAGE("FFMPEG_LIBAVFORMAT_INCLUDE_DIRS = " ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS} ) 11 # MESSAGE("FFMPEG_LIBAVDEVICE_INCLUDE_DIRS = " ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS} ) 12 # MESSAGE("FFMPEG_LIBAVCODEC_INCLUDE_DIRS = " ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS} ) 13 # MESSAGE("FFMPEG_LIBAVUTIL_INCLUDE_DIRS = " ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS} ) 14 # MESSAGE("FFMPEG_LIBRARIES = " ${FFMPEG_LIBRARIES} ) 12 15 13 16 SET(TARGET_SRC … … 31 34 ) 32 35 36 LINK_DIRECTORIES(${FFMPEG_LIBRARY_DIRS}) 37 33 38 SET(TARGET_EXTERNAL_LIBRARIES ${FFMPEG_LIBRARIES} ) 34 39 35 40 36 41 #### end var setup ### 37 SETUP_PLUGIN(ffmpeg )42 SETUP_PLUGIN(ffmpeg ffmpeg)
