1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-07 16:34:45 -04:00

fixes for ubuntu 16.04

- probably libfreedv/freedv_api.cpp needs more work to avoid crash if
  the user select 700C or 800XA
This commit is contained in:
Davide Gerhard
2019-05-09 14:18:27 +02:00
parent 44668ad425
commit 5ff197bc35
14 changed files with 92 additions and 61 deletions
+12 -4
View File
@@ -26,13 +26,21 @@ if(NOT SERVER_MODE)
add_subdirectory(chanalyzer)
add_subdirectory(demodatv)
# At ffmpeg 3.1 !! TODO check more !!
# need ffmpeg 3.1 that correstonds to
# libavutil 55.27.100
# libavcodec 57.48.101
# libavformat 57.40.101
find_package(FFmpeg 57.48.101)
# TODO use libavcodec/version.h
find_package(FFmpeg)
if (FFMPEG_FOUND)
message(STATUS "Include demoddatv")
add_subdirectory(demoddatv)
# You can only get FFmpeg version from the command line
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")
add_subdirectory(demoddatv)
else()
message(STATUS "FFmpeg too old to compile demoddatv; needs at least ffmpeg 3.1")
endif()
endif()
endif()
@@ -18,7 +18,7 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
${CMAKE_SOURCE_DIR}/devices
${LIBBLADERF_INCLUDE_DIR}
${LIBBLADERF_INCLUDE_DIRS}
)
if(NOT SERVER_MODE)
@@ -18,7 +18,7 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
${CMAKE_SOURCE_DIR}/devices
${LIBBLADERF_INCLUDE_DIR}
${LIBBLADERF_INCLUDE_DIRS}
)
if(NOT SERVER_MODE)
@@ -18,7 +18,7 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
${CMAKE_SOURCE_DIR}/devices
${LIBBLADERF_INCLUDE_DIR}
${LIBBLADERF_INCLUDE_DIRS}
)
if(NOT SERVER_MODE)
@@ -18,7 +18,7 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
${CMAKE_SOURCE_DIR}/devices
${LIBBLADERF_INCLUDE_DIR}
${LIBBLADERF_INCLUDE_DIRS}
)
if(NOT SERVER_MODE)