VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-30 03:38:55 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #575 from StefanBruens/fix_ffmpeg_detection

Browse Source 
Use CMake varialbles instead of depending on FFmpeg binary
This commit is contained in:
f4exb 2020-07-19 09:40:56 +02:00 committed by GitHub
commit 24ca0f0d56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/channelrx/CMakeLists.txt
View File

@ -30,20 +30,16 @@ if(NOT SERVER_MODE)
# libavutil 55.27.100 # libavutil 55.27.100
# libavcodec 57.48.101 # libavcodec 57.48.101
# libavformat 57.40.101 # libavformat 57.40.101
# TODO use libavcodec/version.h find_package(FFmpeg COMPONENTS AVCODEC AVFORMAT AVUTIL SWSCALE)
find_package(FFmpeg)
if (FFMPEG_FOUND) if (FFMPEG_FOUND)
if(WIN32) if(WIN32)
add_subdirectory(demoddatv) add_subdirectory(demoddatv)
else() else()
# You can only get FFmpeg version from the command line if((AVUTIL_VERSION VERSION_GREATER "55.27.99") AND (AVCODEC_VERSION VERSION_GREATER "57.48.101"))
EXECUTE_PROCESS(COMMAND ffmpeg -version COMMAND grep ffmpeg COMMAND cut -d\ -f3 COMMAND tr -d '\n' OUTPUT_VARIABLE FFMPEG_VERSION)
message(STATUS "FFmpeg version ${FFMPEG_VERSION} found")
if(FFMPEG_VERSION VERSION_GREATER "3.1")
message(STATUS "Include demoddatv") message(STATUS "Include demoddatv")
add_subdirectory(demoddatv) add_subdirectory(demoddatv)
else() else()
message(STATUS "FFmpeg too old to compile demoddatv; needs at least ffmpeg 3.1") message(STATUS "FFmpeg too old to compile demoddatv; needs at least avutil: 55.27.100, avcodec/avformat: 57.48.101")
endif() endif()
endif() endif()
endif() endif()