From a2b1e5207f9b6507c931b03796a59561fdc2aeb5 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 28 Feb 2021 05:40:15 +0100 Subject: [PATCH] Added missing dependency to libqt5texttospeech5-dev. Fix libapt and libsgp4s external library install for Ubuntu build --- CMakeLists.txt | 14 +++++++------- debian/control | 5 +++-- external/CMakeLists.txt | 12 ++++++++++-- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d315509b3..66d1263a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -307,13 +307,13 @@ if (BUILD_GUI) find_package(OpenGL REQUIRED) find_package(Qt5 REQUIRED COMPONENTS - OpenGL - Quick - QuickWidgets - Positioning - Location - Charts - TextToSpeech) + OpenGL + Quick + QuickWidgets + Positioning + Location + Charts + TextToSpeech) endif() # other requirements diff --git a/debian/control b/debian/control index 403317b13..803d4f468 100644 --- a/debian/control +++ b/debian/control @@ -14,11 +14,12 @@ Build-Depends: debhelper (>= 9), libqt5multimedia5-plugins, libqt5websockets5-dev, libqt5quick5, + libqt5texttospeech5-dev, qml-module-qtlocation, qml-module-qtpositioning, qml-module-qtquick-window2, - qml-module-qtquick-dialogs, - qml-module-qtquick-controls, + qml-module-qtquick-dialogs, + qml-module-qtquick-controls, qml-module-qtquick-layouts, libqt5serialport5-dev, libqt5charts5-dev, diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index fbe613f39..a64b0237b 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -360,7 +360,11 @@ if ((NOT LIBDSDCC_FOUND OR LIBDSDCC_EXTERNAL) AND LIBMBE_FOUND) endif ((NOT LIBDSDCC_FOUND OR LIBDSDCC_EXTERNAL) AND LIBMBE_FOUND) # 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 GIT_REPOSITORY https://github.com/srcejon/aptdec.git GIT_TAG libaptdec @@ -386,7 +390,11 @@ endif () # For Satellite Tracker feature # No tags for this in github - but doesn't change often # 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 GIT_REPOSITORY https://github.com/dnwrnr/sgp4.git PREFIX "${EXTERNAL_BUILD_LIBRARIES}/sgp4"