VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added missing dependency to libqt5texttospeech5-dev. Fix libapt and libsgp4s external library install for Ubuntu build

This commit is contained in:
f4exb 2021-02-28 05:40:15 +01:00
parent e2ddaeba1a
commit a2b1e5207f
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -307,13 +307,13 @@ if (BUILD_GUI)
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
find_package(Qt5 find_package(Qt5
REQUIRED COMPONENTS REQUIRED COMPONENTS
OpenGL OpenGL
Quick Quick
QuickWidgets QuickWidgets
Positioning Positioning
Location Location
Charts Charts
TextToSpeech) TextToSpeech)
endif() endif()
# other requirements # other requirements

1
debian/control vendored
View File

@ -14,6 +14,7 @@ Build-Depends: debhelper (>= 9),
libqt5multimedia5-plugins, libqt5multimedia5-plugins,
libqt5websockets5-dev, libqt5websockets5-dev,
libqt5quick5, libqt5quick5,
libqt5texttospeech5-dev,
qml-module-qtlocation, qml-module-qtlocation,
qml-module-qtpositioning, qml-module-qtpositioning,
qml-module-qtquick-window2, qml-module-qtquick-window2,

12
external/CMakeLists.txt vendored
View File

@ -360,7 +360,11 @@ if ((NOT LIBDSDCC_FOUND OR LIBDSDCC_EXTERNAL) AND LIBMBE_FOUND)
endif ((NOT LIBDSDCC_FOUND OR LIBDSDCC_EXTERNAL) AND LIBMBE_FOUND) endif ((NOT LIBDSDCC_FOUND OR LIBDSDCC_EXTERNAL) AND LIBMBE_FOUND)
# For APT demodulator # For APT demodulator
set(APT_LIBRARIES "${SDRANGEL_BINARY_LIB_DIR}/apt.lib" CACHE INTERNAL "") if (WIN32)
set(APT_LIBRARIES "${SDRANGEL_BINARY_LIB_DIR}/apt.lib" CACHE INTERNAL "")
elseif (LINUX)
set(LIBDSDCC_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/lib/libapt${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "")
endif()
ExternalProject_Add(apt ExternalProject_Add(apt
GIT_REPOSITORY https://github.com/srcejon/aptdec.git GIT_REPOSITORY https://github.com/srcejon/aptdec.git
GIT_TAG libaptdec GIT_TAG libaptdec
@ -386,7 +390,11 @@ endif ()
# For Satellite Tracker feature # For Satellite Tracker feature
# No tags for this in github - but doesn't change often # No tags for this in github - but doesn't change often
# Fails to build with CMAKE_INTERPROCEDURAL_OPTIMIZATION=ON on Windows # Fails to build with CMAKE_INTERPROCEDURAL_OPTIMIZATION=ON on Windows
set(SGP4_LIBRARIES "${SDRANGEL_BINARY_LIB_DIR}/sgp4s.lib" CACHE INTERNAL "") if (WIN32)
set(SGP4_LIBRARIES "${SDRANGEL_BINARY_LIB_DIR}/sgp4s.lib" CACHE INTERNAL "")
elseif (LINUX)
set(LIBDSDCC_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/lib/libsgp4s${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "")
endif()
ExternalProject_Add(sgp4 ExternalProject_Add(sgp4
GIT_REPOSITORY https://github.com/dnwrnr/sgp4.git GIT_REPOSITORY https://github.com/dnwrnr/sgp4.git
PREFIX "${EXTERNAL_BUILD_LIBRARIES}/sgp4" PREFIX "${EXTERNAL_BUILD_LIBRARIES}/sgp4"