Merge pull request f4exb#2254 from srcejon/freq_scanner

Allow plugins to be compiled as static libs, part 2.

CMakeLists.txt

@@ -728,8 +728,27 @@ if (BUILD_GUI)
     endif()
 endif()
 
+# List of static plugins to link with - This is appended to by each pluging CMakeLists.txt
+set_property(GLOBAL PROPERTY STATIC_PLUGINS_PROPERTY "")
+
+if(Qt${QT_DEFAULT_MAJOR_VERSION}Positioning_FOUND)
+    add_compile_definitions(QT_POSITIONING_FOUND)
+endif()
+if(Qt${QT_DEFAULT_MAJOR_VERSION}Location_FOUND)
+    add_compile_definitions(QT_LOCATION_FOUND)
+endif()
+if(Qt${QT_DEFAULT_MAJOR_VERSION}Charts_FOUND)
+    add_compile_definitions(QT_CHARTS_FOUND)
+endif()
+if(Qt${QT_DEFAULT_MAJOR_VERSION}TextToSpeech_FOUND)
+    add_compile_definitions(QT_TEXTTOSPEECH_FOUND)
+endif()
+if(BUILD_SHARED_LIBS)
+    add_compile_definitions(BUILD_SHARED_LIBS)
+endif()
+
 # other requirements
-if(NOT ANDROID)
+if(NOT ANDROID AND NOT EMSCRIPTEN)
   find_package(PkgConfig REQUIRED)
 endif()
 

plugins/channelrx/demodadsb/CMakeLists.txt

@@ -43,10 +43,10 @@ if(NOT SERVER_MODE)
         adsbdemodnotificationdialog.cpp
         adsbdemodnotificationdialog.ui
         adsbosmtemplateserver.cpp
+        adsbdemodmap.qrc
+        adsbdemodicons.qrc
         airlinelogos.qrc
         flags.qrc
-        map.qrc
-        icons.qrc
     )
     set(adsb_HEADERS
         ${adsb_HEADERS}
@@ -60,7 +60,13 @@ if(NOT SERVER_MODE)
     )
 
     set(TARGET_NAME ${PLUGINS_PREFIX}demodadsb)
-    set(TARGET_LIB Qt::Widgets Qt::Quick Qt::QuickWidgets Qt::Positioning Qt::Location Qt::TextToSpeech)
+    set(TARGET_LIB Qt::Widgets Qt::Quick Qt::QuickWidgets Qt::Positioning)
+    if(Qt${QT_DEFAULT_MAJOR_VERSION}Location_FOUND)
+        list(APPEND TARGET_LIB Qt::Location)
+    endif()
+    if(Qt${QT_DEFAULT_MAJOR_VERSION}TextToSpeech_FOUND)
+        list(APPEND TARGET_LIB Qt::TextToSpeech)
+    endif()
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
@@ -70,15 +76,21 @@ else()
     set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()
 
-add_library(${TARGET_NAME} SHARED
-    ${adsb_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${adsb_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME ADSBPlugin ${adsb_SOURCES})
+endif()
+
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
 
 if (NOT WIN32)
     link_directories(${Boost_LIBRARY_DIRS})
 endif()
 
-target_link_libraries(${TARGET_NAME}
+target_link_libraries(${TARGET_NAME} PRIVATE
     Boost::disable_autolinking
     Qt::Core
     ${TARGET_LIB}

plugins/channelrx/demodadsb/adsbdemod.cpp

@@ -157,7 +157,9 @@ void ADSBDemod::stop()
     m_basebandSink->stopWork();
     m_worker->stopWork();
     m_thread->exit();
+#ifndef __EMSCRIPTEN__
     m_thread->wait();
+#endif
 }
 
 bool ADSBDemod::handleMessage(const Message& cmd)

plugins/channelrx/demodadsb/adsbdemoddisplaydialog.cpp

@@ -16,7 +16,9 @@
 ///////////////////////////////////////////////////////////////////////////////////
 
 #include <QFontDialog>
+#ifdef QT_LOCATION_FOUND
 #include <QGeoServiceProvider>
+#endif
 #include <QDebug>
 
 #include "adsbdemoddisplaydialog.h"
@@ -30,13 +32,17 @@ ADSBDemodDisplayDialog::ADSBDemodDisplayDialog(ADSBDemodSettings *settings, QWid
 {
     ui->setupUi(this);
 
+#ifdef QT_LOCATION_FOUND
     QStringList mapProviders = QGeoServiceProvider::availableServiceProviders();
     if (!mapProviders.contains("osm")) {
         ui->mapProvider->removeItem(ui->mapProvider->findText("osm"));
     }
     if (!mapProviders.contains("mapboxgl")) {
         ui->mapProvider->removeItem(ui->mapProvider->findText("mapboxgl"));
     }
+#else
+    QStringList mapProviders;
+#endif
 
     ui->timeout->setValue(settings->m_removeTimeout);
     ui->aircraftMinZoom->setValue(settings->m_aircraftMinZoom);