|
Revision 10414, 1.4 kB
(checked in by robert, 4 years ago)
|
|
Fixed warnings and refactored FindFFmpeg.cmake and ffmpeg plugin CMakeLists.txt scripts to better handle different instation combinations
|
| Rev | Line | |
|---|
| [10414] | 1 | INCLUDE_DIRECTORIES( ${FFMPEG_INCLUDE_DIRS} ) |
|---|
| [9948] | 2 | LINK_DIRECTORIES(${FFMPEG_LIBRARY_DIRS}) |
|---|
| 3 | SET(TARGET_EXTERNAL_LIBRARIES ${FFMPEG_LIBRARIES} ) |
|---|
| [9854] | 4 | |
|---|
| 5 | |
|---|
| [9998] | 6 | IF(FFMPEG_LIBSWSCALE_FOUND) |
|---|
| [9854] | 7 | |
|---|
| [9948] | 8 | INCLUDE_DIRECTORIES( ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS} ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS}/libswscale ) |
|---|
| [9854] | 9 | |
|---|
| [9948] | 10 | ADD_DEFINITIONS(-DUSE_SWSCALE) |
|---|
| [9854] | 11 | |
|---|
| [9948] | 12 | SET(TARGET_EXTERNAL_LIBRARIES ${FFMPEG_LIBRARIES} ${FFMPEG_LIBSWSCALE_LIBRARIES}) |
|---|
| 13 | |
|---|
| [9854] | 14 | ENDIF() |
|---|
| 15 | |
|---|
| [9839] | 16 | # MESSAGE("FFMPEG_LIBAVFORMAT_INCLUDE_DIRS = " ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS} ) |
|---|
| 17 | # MESSAGE("FFMPEG_LIBAVDEVICE_INCLUDE_DIRS = " ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS} ) |
|---|
| 18 | # MESSAGE("FFMPEG_LIBAVCODEC_INCLUDE_DIRS = " ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS} ) |
|---|
| 19 | # MESSAGE("FFMPEG_LIBAVUTIL_INCLUDE_DIRS = " ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS} ) |
|---|
| 20 | # MESSAGE("FFMPEG_LIBRARIES = " ${FFMPEG_LIBRARIES} ) |
|---|
| [9818] | 21 | |
|---|
| [9816] | 22 | SET(TARGET_SRC |
|---|
| 23 | FFmpegClocks.cpp |
|---|
| 24 | FFmpegDecoderAudio.cpp |
|---|
| 25 | FFmpegDecoder.cpp |
|---|
| 26 | FFmpegDecoderVideo.cpp |
|---|
| 27 | FFmpegImageStream.cpp |
|---|
| [9847] | 28 | FFmpegAudioStream.cpp |
|---|
| [9816] | 29 | ReaderWriterFFmpeg.cpp |
|---|
| 30 | ) |
|---|
| 31 | |
|---|
| 32 | SET(TARGET_H |
|---|
| 33 | BoundedMessageQueue.hpp |
|---|
| 34 | FFmpegClocks.hpp |
|---|
| 35 | FFmpegDecoderAudio.hpp |
|---|
| 36 | FFmpegDecoder.hpp |
|---|
| 37 | FFmpegDecoderVideo.hpp |
|---|
| 38 | FFmpegHeaders.hpp |
|---|
| 39 | FFmpegPacket.hpp |
|---|
| [9847] | 40 | FFmpegImageStream.hpp |
|---|
| 41 | FFmpegAudioStream.hpp |
|---|
| [9816] | 42 | MessageQueue.hpp |
|---|
| 43 | ) |
|---|
| 44 | |
|---|
| [10082] | 45 | IF(CMAKE_COMPILER_IS_GNUCXX) |
|---|
| 46 | # Remove -pedantic flag as it barfs on ffmoeg headers |
|---|
| 47 | STRING(REGEX REPLACE "-pedantic" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") |
|---|
| [9842] | 48 | |
|---|
| [10082] | 49 | ENDIF() |
|---|
| [9816] | 50 | |
|---|
| [10082] | 51 | |
|---|
| [9816] | 52 | #### end var setup ### |
|---|
| [9839] | 53 | SETUP_PLUGIN(ffmpeg ffmpeg) |
|---|