Merge pull request #2252 from srcejon/freq_scanner

Update CMakeLists.txt to allow static libraries to be built
2024-12-22 01:20:56 -05:00 · 2024-09-13 21:07:04 +02:00 · 2024-09-13 21:07:04 +02:00 · f522d88fc5
commit f522d88fc5
parent c03f8dcbac 626a939d3c
135 changed files with 1295 additions and 505 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -30,6 +30,7 @@ option(SANITIZE_MEMORY "Activate detection of leaked memory (LeakSanitizer)" OFF
 option(RX_SAMPLE_24BIT "Internal 24 bit Rx DSP" ON)
 option(BUILD_SERVER "Build Server" ON)
 option(BUILD_GUI "Build GUI" ON)
+option(BUILD_BENCH "Build benchmark" ON)
 option(HIDE_CONSOLE "Hide console when running GUI on Windows" ON)
 option(BUNDLE "Enable distribution bundle" OFF)
 set(ARCH_OPT "native" CACHE STRING "Specify instruction set to use. Will be passed directly as `-march` or `/arch:` argument on supported compilers. \
@ -37,8 +38,10 @@ set(ARCH_OPT "native" CACHE STRING "Specify instruction set to use. Will be pass
 option(ENABLE_QT6 "Build with Qt6 rather than Qt5" OFF)
 option(ENABLE_PROFILER "Enable runtime profiler" OFF)
 set(VKFFT_BACKEND 1 CACHE STRING "vkFFT Backend: 0 - Vulkan, 1 - CUDA")
+option(BUILD_SHARED_LIBS "Build using shared libraries" ON)

 # Sampling devices enablers
+option(ENABLE_AARONIARTSA "Enable AaroniaRTSA support" ON)
 option(ENABLE_AIRSPY "Enable AirSpy support" ON)
 option(ENABLE_AIRSPYHF "Enable AirSpyHF support" ON)
 option(ENABLE_BLADERF "Enable bladeRF support" ON)
@ -46,6 +49,7 @@ option(ENABLE_FUNCUBE "Enable FUNcube support" ON)
 option(ENABLE_HACKRF "Enable HackRF support" ON)
 option(ENABLE_IIO "Enable liniio support like PlutoSDR" ON)
 option(ENABLE_LIMESUITE "Enable limesuite support" ON)
+option(ENABLE_METIS "Enable Metis support" ON)
 option(ENABLE_MIRISDR "Enable LibMiri for old SDRPlay" ON)
 option(ENABLE_PERSEUS "Enable perseus support" ON)
 option(ENABLE_RTLSDR "Enable rtl-sdr support" ON)
@ -182,7 +186,7 @@ if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git/")
 endif()

 find_program(CCACHE "ccache")
-if(CCACHE)
+if(CCACHE AND NOT EMSCRIPTEN)
    message(STATUS "Using ccache ${CCACHE}")
    set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE})
    set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE})
@ -190,7 +194,7 @@ if(CCACHE)
        set(CMAKE_OBJCXX_COMPILER_LAUNCHER ${CCACHE})
    endif()
    set(ENV{CCACHE_SLOPPINESS} pch_defines,time_macros)
-endif(CCACHE)
+endif()

 set(sdrangel_VERSION "${sdrangel_VERSION_MAJOR}.${sdrangel_VERSION_MINOR}.${sdrangel_VERSION_PATCH}${sdrangel_VERSION_SUFFIX}" CACHE INTERNAL "")
 message(STATUS "${APPLICATION_NAME} Version: ${sdrangel_VERSION}")
@ -876,7 +880,9 @@ if (FFTW3F_FOUND)
    set(WDSP_SUPPORT ON CACHE INTERNAL "")
 endif()

+if (BUILD_BENCH)
 add_subdirectory(sdrbench)
+endif()

 if (BUILD_GUI)
    add_subdirectory(sdrgui)
@ -947,6 +953,7 @@ else()
 endif()

 ############ build sdrangel benchmark ################
+if (BUILD_BENCH)
 set(sdrangelbench_SOURCES
  appbench/main.cpp
 )
@ -960,6 +967,7 @@ target_link_libraries(sdrangelbench
  sdrbench
  logging
 )
+endif()

 ############ build sdrangel gui ################
 if (BUILD_GUI)
@ -1053,7 +1061,9 @@ if (BUILD_SERVER)
 endif()

 ############ install ##################
+if (BUILD_BENCH)
 install(TARGETS sdrangelbench DESTINATION ${INSTALL_BIN_DIR})
+endif()
 if (BUILD_GUI)
      install(TARGETS ${CMAKE_PROJECT_NAME} DESTINATION ${INSTALL_BIN_DIR})
 endif()
--- a/ft8/CMakeLists.txt
+++ b/ft8/CMakeLists.txt
@ -39,10 +39,14 @@ include_directories(
    ${CMAKE_SOURCE_DIR}/sdrbase
 )

-add_library(ft8 SHARED
+add_library(ft8
    ${ft8_SOURCES}
 )

+if(DEFINED FFTW3F_DEPENDS)
+    add_dependencies(ft8 "${FFTW3F_DEPENDS}")
+endif()
+
 target_link_libraries(ft8
    Boost::disable_autolinking
    ${FFTW3F_LIBRARIES}
--- a/httpserver/CMakeLists.txt
+++ b/httpserver/CMakeLists.txt
@ -35,7 +35,7 @@ include_directories(
    ${CMAKE_SOURCE_DIR}/exports
 )

-add_library(httpserver SHARED
+add_library(httpserver
 	${httpserver_SOURCES}
 )

--- a/logging/CMakeLists.txt
+++ b/logging/CMakeLists.txt
@ -21,7 +21,7 @@ include_directories(
    ${CMAKE_SOURCE_DIR}/exports
 )

-add_library(logging SHARED
+add_library(logging
    ${logging_SOURCES}
 )

--- a/modemm17/CMakeLists.txt
+++ b/modemm17/CMakeLists.txt
@ -47,7 +47,7 @@ include_directories(
    ${CMAKE_SOURCE_DIR}/exports
 )

-add_library(modemm17 SHARED
+add_library(modemm17
 	${modemm17_SOURCES}
 )

--- a/plugins/channelmimo/beamsteeringcwmod/CMakeLists.txt
+++ b/plugins/channelmimo/beamsteeringcwmod/CMakeLists.txt
@ -45,11 +45,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${beamsteeringcwmod_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${beamsteeringcwmod_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME BeamSteeringCWModPlugin ${beamsteeringcwmod_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/channelmimo/doa2/CMakeLists.txt
+++ b/plugins/channelmimo/doa2/CMakeLists.txt
@ -49,11 +49,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${doa2_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${doa2_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME DOA2Plugin ${doa2_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/channelmimo/interferometer/CMakeLists.txt
+++ b/plugins/channelmimo/interferometer/CMakeLists.txt
@ -47,11 +47,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${interferometer_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${interferometer_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME InterferometerPlugin ${interferometer_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/channelrx/chanalyzer/CMakeLists.txt
+++ b/plugins/channelrx/chanalyzer/CMakeLists.txt
@ -29,11 +29,17 @@ include_directories(
 set(TARGET_NAME ${PLUGINS_PREFIX}chanalyzer)
 set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})

-add_library(${TARGET_NAME} SHARED
-	${chanalyzer_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${chanalyzer_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME ChannelAnalyzerPlugin ${chanalyzer_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    Qt::Widgets
 	sdrbase
--- a/plugins/channelrx/channelpower/CMakeLists.txt
+++ b/plugins/channelrx/channelpower/CMakeLists.txt
@ -44,11 +44,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${channelpower_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${channelpower_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME ChannelPowerPlugin ${channelpower_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/channelrx/demodais/CMakeLists.txt
+++ b/plugins/channelrx/demodais/CMakeLists.txt
@ -44,11 +44,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${demodais_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${demodais_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME AISDemodPlugin ${demodais_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/channelrx/demodam/CMakeLists.txt
+++ b/plugins/channelrx/demodam/CMakeLists.txt
@ -48,11 +48,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${am_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${am_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME AMDemodPlugin ${am_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/channelrx/demodatv/CMakeLists.txt
+++ b/plugins/channelrx/demodatv/CMakeLists.txt
@ -29,11 +29,17 @@ include_directories(
 set(TARGET_NAME ${PLUGINS_PREFIX}demodatv)
 set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})

-add_library(${TARGET_NAME} SHARED
-	${atv_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${atv_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME ATVDemodPlugin ${atv_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    Qt::Widgets
 	sdrbase
--- a/plugins/channelrx/demodbfm/CMakeLists.txt
+++ b/plugins/channelrx/demodbfm/CMakeLists.txt
@ -55,11 +55,18 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${bfm_SOURCES}
-)

-target_link_libraries(${TARGET_NAME}
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${bfm_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME BFMPlugin ${bfm_SOURCES})
+endif()
+
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/channelrx/demodchirpchat/CMakeLists.txt
+++ b/plugins/channelrx/demodchirpchat/CMakeLists.txt
@ -59,11 +59,18 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${chirpchat_SOURCES}
-)

-target_link_libraries(${TARGET_NAME}
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${chirpchat_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME ChirpChatDemodPlugin ${chirpchat_SOURCES})
+endif()
+
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/channelrx/demoddab/CMakeLists.txt
+++ b/plugins/channelrx/demoddab/CMakeLists.txt
@ -49,11 +49,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${demoddab_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${demoddab_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME DABDemodPlugin ${demoddab_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/channelrx/demoddatv/CMakeLists.txt
+++ b/plugins/channelrx/demoddatv/CMakeLists.txt
@ -71,12 +71,18 @@ include_directories(
 set(TARGET_NAME ${PLUGINS_PREFIX}demoddatv)
 set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})

-add_library(${TARGET_NAME} SHARED
-    ${datv_SOURCES}
-    ${ldpc_SOURCES}
-)

-target_link_libraries(${TARGET_NAME}
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${datv_SOURCES} ${ldpc_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME DATVDemodPlugin ${datv_SOURCES} ${ldpc_SOURCES})
+endif()
+
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    Qt::Widgets
    Qt::Multimedia
--- a/plugins/channelrx/demoddsc/CMakeLists.txt
+++ b/plugins/channelrx/demoddsc/CMakeLists.txt
@ -44,11 +44,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${demoddsc_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${demoddsc_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME DSCDemodPlugin ${demoddsc_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/channelrx/demoddsd/CMakeLists.txt
+++ b/plugins/channelrx/demoddsd/CMakeLists.txt
@ -53,15 +53,21 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${dsddemod_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${dsddemod_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME DSDDemodPlugin ${dsddemod_SOURCES})
+endif()
+
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()

 if(LIBDSDCC_EXTERNAL)
    add_dependencies(${TARGET_NAME} dsdcc mbelib)
 endif()

-target_link_libraries(${TARGET_NAME}
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/channelrx/demodendoftrain/CMakeLists.txt
+++ b/plugins/channelrx/demodendoftrain/CMakeLists.txt
@ -46,11 +46,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${demodendoftrain_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${demodendoftrain_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME EndOfTrainDemodPlugin ${demodendoftrain_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/channelrx/demodfreedv/CMakeLists.txt
+++ b/plugins/channelrx/demodfreedv/CMakeLists.txt
@ -44,15 +44,21 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${freedv_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${freedv_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME FreeDVDemodPlugin ${freedv_SOURCES})
+endif()
+
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()

 if(CODEC2_EXTERNAL)
    add_dependencies(${TARGET_NAME} codec2)
 endif()

-target_link_libraries(${TARGET_NAME}
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/channelrx/demodft8/CMakeLists.txt
+++ b/plugins/channelrx/demodft8/CMakeLists.txt
@ -54,11 +54,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${demodft8_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${demodft8_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME FT8Plugin ${demodft8_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/channelrx/demodils/CMakeLists.txt
+++ b/plugins/channelrx/demodils/CMakeLists.txt
@ -44,11 +44,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${demodils_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${demodils_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME ILSDemodPlugin ${demodils_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/channelrx/demodm17/CMakeLists.txt
+++ b/plugins/channelrx/demodm17/CMakeLists.txt
@ -54,15 +54,21 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${m17_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${m17_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME M17DemodPlugin ${m17_SOURCES})
+endif()
+
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()

 if(CODEC2_EXTERNAL)
    add_dependencies(${TARGET_NAME} codec2)
 endif()

-target_link_libraries(${TARGET_NAME}
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/channelrx/demodnavtex/CMakeLists.txt
+++ b/plugins/channelrx/demodnavtex/CMakeLists.txt
@ -44,11 +44,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${demodnavtex_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${demodnavtex_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME NavtexDemodPlugin ${demodnavtex_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/channelrx/demodnfm/CMakeLists.txt
+++ b/plugins/channelrx/demodnfm/CMakeLists.txt
@ -49,11 +49,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${nfm_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${nfm_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME NFMPlugin ${nfm_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
        Qt::Core
        ${TARGET_LIB}
 	sdrbase
--- a/plugins/channelrx/demodpacket/CMakeLists.txt
+++ b/plugins/channelrx/demodpacket/CMakeLists.txt
@ -44,11 +44,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${demodpacket_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${demodpacket_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME PacketDemodPlugin ${demodpacket_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/channelrx/demodpager/CMakeLists.txt
+++ b/plugins/channelrx/demodpager/CMakeLists.txt
@ -47,11 +47,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${demodpager_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${demodpager_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME PagerDemodPlugin ${demodpager_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/channelrx/demodradiosonde/CMakeLists.txt
+++ b/plugins/channelrx/demodradiosonde/CMakeLists.txt
@ -44,11 +44,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${demodradiosonde_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${demodradiosonde_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME RadiosondeDemodPlugin ${demodradiosonde_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/channelrx/demodrtty/CMakeLists.txt
+++ b/plugins/channelrx/demodrtty/CMakeLists.txt
@ -44,11 +44,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${demodrtty_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${demodrtty_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME RttyDemodPlugin ${demodrtty_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/channelrx/demodssb/CMakeLists.txt
+++ b/plugins/channelrx/demodssb/CMakeLists.txt
@ -43,11 +43,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${ssb_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${ssb_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME SSBPlugin ${ssb_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/channelrx/demodvor/CMakeLists.txt
+++ b/plugins/channelrx/demodvor/CMakeLists.txt
@ -46,11 +46,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${vor_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${vor_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME VORDemodPlugin ${vor_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/channelrx/demodwfm/CMakeLists.txt
+++ b/plugins/channelrx/demodwfm/CMakeLists.txt
@ -44,11 +44,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${wfm_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${wfm_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME WFMPlugin ${wfm_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/channelrx/filesink/CMakeLists.txt
+++ b/plugins/channelrx/filesink/CMakeLists.txt
@ -46,11 +46,18 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${filesink_SOURCES}
-)

-target_link_libraries(${TARGET_NAME}
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${filesink_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME FileSinkPlugin ${filesink_SOURCES})
+endif()
+
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/channelrx/freqscanner/CMakeLists.txt
+++ b/plugins/channelrx/freqscanner/CMakeLists.txt
@ -47,11 +47,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${freqscanner_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${freqscanner_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME FreqScannerPlugin ${freqscanner_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/channelrx/freqtracker/CMakeLists.txt
+++ b/plugins/channelrx/freqtracker/CMakeLists.txt
@ -47,11 +47,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${freqtracker_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${freqtracker_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME FreqTrackerPlugin ${freqtracker_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
        Qt::Core
        ${TARGET_LIB}
 	sdrbase
--- a/plugins/channelrx/heatmap/CMakeLists.txt
+++ b/plugins/channelrx/heatmap/CMakeLists.txt
@ -44,11 +44,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${heatmap_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${heatmap_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME HeatMapPlugin ${heatmap_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/channelrx/localsink/CMakeLists.txt
+++ b/plugins/channelrx/localsink/CMakeLists.txt
@ -46,11 +46,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${localsink_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${localsink_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME LocalSinkPlugin ${localsink_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/channelrx/noisefigure/CMakeLists.txt
+++ b/plugins/channelrx/noisefigure/CMakeLists.txt
@ -51,11 +51,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${noisefigure_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${noisefigure_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME NoiseFigurePlugin ${noisefigure_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/channelrx/radioclock/CMakeLists.txt
+++ b/plugins/channelrx/radioclock/CMakeLists.txt
@ -44,11 +44,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${radioclock_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${radioclock_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME RadioClockPlugin ${radioclock_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/channelrx/remotesink/CMakeLists.txt
+++ b/plugins/channelrx/remotesink/CMakeLists.txt
@ -50,15 +50,21 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${remotesink_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${remotesink_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME RemoteSinkPlugin ${remotesink_SOURCES})
+endif()
+
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()

 if(CM256CC_EXTERNAL)
    add_dependencies(${TARGET_NAME} cm256cc)
 endif()

-target_link_libraries(${TARGET_NAME}
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/channelrx/sigmffilesink/CMakeLists.txt
+++ b/plugins/channelrx/sigmffilesink/CMakeLists.txt
@ -46,11 +46,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${sigmffilesink_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${sigmffilesink_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME SigMFSinkPlugin ${sigmffilesink_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/channelrx/udpsink/CMakeLists.txt
+++ b/plugins/channelrx/udpsink/CMakeLists.txt
@ -45,11 +45,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${udpsink_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${udpsink_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME UDPSinkPlugin ${udpsink_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
        Qt::Core
        ${TARGET_LIB}
        Qt::Network
--- a/plugins/channelrx/wdsprx/CMakeLists.txt
+++ b/plugins/channelrx/wdsprx/CMakeLists.txt
@ -72,11 +72,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${wdsprx_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${wdsprx_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME WDSPRxPlugin ${wdsprx_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/channeltx/filesource/CMakeLists.txt
+++ b/plugins/channeltx/filesource/CMakeLists.txt
@ -46,11 +46,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${filesource_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${filesource_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME FileSourcePlugin ${filesource_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    Qt::Network
--- a/plugins/channeltx/localsource/CMakeLists.txt
+++ b/plugins/channeltx/localsource/CMakeLists.txt
@ -48,11 +48,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${localsource_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${localsource_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME LocalSourcePlugin ${localsource_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
        Qt::Core
        ${TARGET_LIB}
 	sdrbase
--- a/plugins/channeltx/mod802.15.4/CMakeLists.txt
+++ b/plugins/channeltx/mod802.15.4/CMakeLists.txt
@ -51,11 +51,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${mod_ieee_802_15_4_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${mod_ieee_802_15_4_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME IEEE_802_15_4_ModPlugin ${mod_ieee_802_15_4_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/channeltx/modais/CMakeLists.txt
+++ b/plugins/channeltx/modais/CMakeLists.txt
@ -49,11 +49,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${modais_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${modais_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME AISModPlugin ${modais_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/channeltx/modam/CMakeLists.txt
+++ b/plugins/channeltx/modam/CMakeLists.txt
@ -45,11 +45,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${modam_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${modam_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME AMModPlugin ${modam_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
        Qt::Core
        ${TARGET_LIB}
 	sdrbase
--- a/plugins/channeltx/modatv/CMakeLists.txt
+++ b/plugins/channeltx/modatv/CMakeLists.txt
@ -48,11 +48,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${modatv_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${modatv_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME ATVModPlugin ${modatv_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
        Qt::Core
        ${TARGET_LIB}
 	sdrbase
--- a/plugins/channeltx/modchirpchat/CMakeLists.txt
+++ b/plugins/channeltx/modchirpchat/CMakeLists.txt
@ -60,11 +60,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${modchirpchat_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${modchirpchat_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME ChirpChatModPlugin ${modchirpchat_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/channeltx/moddatv/CMakeLists.txt
+++ b/plugins/channeltx/moddatv/CMakeLists.txt
@ -69,11 +69,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${moddatv_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${moddatv_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME DATVModPlugin ${moddatv_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Boost::disable_autolinking
    Qt::Core
    ${TARGET_LIB}
--- a/plugins/channeltx/modfreedv/CMakeLists.txt
+++ b/plugins/channeltx/modfreedv/CMakeLists.txt
@ -44,15 +44,21 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${modfreedv_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${modfreedv_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME FreeDVModPlugin ${modfreedv_SOURCES})
+endif()
+
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()

 if(CODEC2_EXTERNAL)
    add_dependencies(${TARGET_NAME} codec2)
 endif()

-target_link_libraries(${TARGET_NAME}
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/channeltx/modm17/CMakeLists.txt
+++ b/plugins/channeltx/modm17/CMakeLists.txt
@ -54,15 +54,21 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${modm17_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${modm17_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME M17ModPlugin ${modm17_SOURCES})
+endif()
+
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()

 if(CODEC2_EXTERNAL)
    add_dependencies(${TARGET_NAME} codec2)
 endif()

-target_link_libraries(${TARGET_NAME}
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/channeltx/modnfm/CMakeLists.txt
+++ b/plugins/channeltx/modnfm/CMakeLists.txt
@ -47,11 +47,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${modnfm_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${modnfm_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME NFMModPlugin ${modnfm_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
        Qt::Core
        ${TARGET_LIB}
 	sdrbase
--- a/plugins/channeltx/modpacket/CMakeLists.txt
+++ b/plugins/channeltx/modpacket/CMakeLists.txt
@ -52,11 +52,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${modpacket_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${modpacket_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME PacketModPlugin ${modpacket_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/channeltx/modpsk31/CMakeLists.txt
+++ b/plugins/channeltx/modpsk31/CMakeLists.txt
@ -49,11 +49,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${modpsk31_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${modpsk31_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME PSK31Plugin ${modpsk31_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/channeltx/modrtty/CMakeLists.txt
+++ b/plugins/channeltx/modrtty/CMakeLists.txt
@ -49,11 +49,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${modrtty_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${modrtty_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME RttyModPlugin ${modrtty_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/channeltx/modssb/CMakeLists.txt
+++ b/plugins/channeltx/modssb/CMakeLists.txt
@ -45,11 +45,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${modssb_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${modssb_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME SSBModPlugin ${modssb_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
        Qt::Core
        ${TARGET_LIB}
 	sdrbase
--- a/plugins/channeltx/modwfm/CMakeLists.txt
+++ b/plugins/channeltx/modwfm/CMakeLists.txt
@ -45,11 +45,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${modwfm_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${modwfm_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME WFMModPlugin ${modwfm_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
        Qt::Core
        ${TARGET_LIB}
 	sdrbase
--- a/plugins/channeltx/remotesource/CMakeLists.txt
+++ b/plugins/channeltx/remotesource/CMakeLists.txt
@ -49,15 +49,21 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${remotesource_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${remotesource_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME RemoteSourcePlugin ${remotesource_SOURCES})
+endif()

 if(CM256CC_EXTERNAL)
    add_dependencies(${TARGET_NAME} cm256cc)
 endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    Qt::Network
--- a/plugins/channeltx/udpsource/CMakeLists.txt
+++ b/plugins/channeltx/udpsource/CMakeLists.txt
@ -49,11 +49,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${udpsource_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${udpsource_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME UDPSourcePlugin ${udpsource_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
        Qt::Core
        ${TARGET_LIB}
        Qt::Network
--- a/plugins/feature/afc/CMakeLists.txt
+++ b/plugins/feature/afc/CMakeLists.txt
@ -44,11 +44,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${afc_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${afc_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME AFCPlugin ${afc_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/feature/ais/CMakeLists.txt
+++ b/plugins/feature/ais/CMakeLists.txt
@ -41,11 +41,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${ais_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${ais_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME AISPlugin ${ais_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/feature/ambe/CMakeLists.txt
+++ b/plugins/feature/ambe/CMakeLists.txt
@ -45,11 +45,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${ambe_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${ambe_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME AMBEPlugin ${ambe_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/feature/aprs/CMakeLists.txt
+++ b/plugins/feature/aprs/CMakeLists.txt
@ -47,11 +47,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${aprs_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${aprs_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME APRSPlugin ${aprs_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/feature/demodanalyzer/CMakeLists.txt
+++ b/plugins/feature/demodanalyzer/CMakeLists.txt
@ -42,11 +42,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${demodanalyzer_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${demodanalyzer_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME DemodAnalyzerPlugin ${demodanalyzer_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/feature/gs232controller/CMakeLists.txt
+++ b/plugins/feature/gs232controller/CMakeLists.txt
@ -74,11 +74,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${gs232controller_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${gs232controller_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME GS232ControllerPlugin ${gs232controller_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    Qt::SerialPort
    ${TARGET_LIB}
--- a/plugins/feature/jogdialcontroller/CMakeLists.txt
+++ b/plugins/feature/jogdialcontroller/CMakeLists.txt
@ -40,11 +40,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${jogdialcontroller_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${jogdialcontroller_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME JogDialControllerPlugin ${jogdialcontroller_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/feature/limerfe/CMakeLists.txt
+++ b/plugins/feature/limerfe/CMakeLists.txt
@ -43,11 +43,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${limerfe_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${limerfe_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME LimeRFEPlugin ${limerfe_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/feature/morsedecoder/CMakeLists.txt
+++ b/plugins/feature/morsedecoder/CMakeLists.txt
@ -43,11 +43,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${morsedecoder_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${morsedecoder_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME MorseDecoderPlugin ${morsedecoder_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/feature/pertester/CMakeLists.txt
+++ b/plugins/feature/pertester/CMakeLists.txt
@ -43,11 +43,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${pertester_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${pertester_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME PERTesterPlugin ${pertester_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/feature/radiosonde/CMakeLists.txt
+++ b/plugins/feature/radiosonde/CMakeLists.txt
@ -44,11 +44,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${radiosonde_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${radiosonde_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME RadiosondePlugin ${radiosonde_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/feature/remotecontrol/CMakeLists.txt
+++ b/plugins/feature/remotecontrol/CMakeLists.txt
@ -52,11 +52,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${remotecontrol_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${remotecontrol_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME RemoteControlPlugin ${remotecontrol_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/feature/rigctlserver/CMakeLists.txt
+++ b/plugins/feature/rigctlserver/CMakeLists.txt
@ -42,11 +42,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${rigctlserver_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${rigctlserver_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME RigCtlServerPlugin ${rigctlserver_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/feature/satellitetracker/CMakeLists.txt
+++ b/plugins/feature/satellitetracker/CMakeLists.txt
@ -49,6 +49,9 @@ if(NOT SERVER_MODE)

    set(TARGET_NAME ${PLUGINS_PREFIX}featuresatellitetracker)
    set(TARGET_LIB Qt::Widgets Qt::Positioning Qt::Charts Qt::TextToSpeech)
+    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()
@ -58,15 +61,21 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${satellitetracker_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${satellitetracker_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME SatelliteTrackerPlugin ${satellitetracker_SOURCES})
+endif()
+
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()

 if(SGP4_EXTERNAL)
    add_dependencies(${TARGET_NAME} sgp4)
 endif()

-target_link_libraries(${TARGET_NAME}
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
@ -74,9 +83,7 @@ target_link_libraries(${TARGET_NAME}
    ${SGP4_LIBRARIES}
 )
 if (Qt6_FOUND)
-    target_link_libraries(${TARGET_NAME}
-        Qt::Core5Compat
-    )
+    target_link_libraries(${TARGET_NAME} PRIVATE Qt::Core5Compat)
 endif()

 install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER})
--- a/plugins/feature/simpleptt/CMakeLists.txt
+++ b/plugins/feature/simpleptt/CMakeLists.txt
@ -51,11 +51,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${simpleptt_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${simpleptt_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME SimplePTTPlugin ${simpleptt_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/feature/skymap/CMakeLists.txt
+++ b/plugins/feature/skymap/CMakeLists.txt
@ -67,11 +67,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${skymap_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${skymap_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME SkyMapPlugin ${skymap_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/feature/startracker/CMakeLists.txt
+++ b/plugins/feature/startracker/CMakeLists.txt
@ -54,11 +54,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${startracker_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${startracker_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME StarTrackerPlugin ${startracker_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/samplemimo/CMakeLists.txt
+++ b/plugins/samplemimo/CMakeLists.txt
@ -31,6 +31,11 @@ else()
    message(STATUS "Not building audiocatsiso (hamlib_FOUND=${hamlib_FOUND})")
 endif()

-add_subdirectory(metismiso)
+if(ENABLE_METIS)
+    add_subdirectory(metismiso)
+else()
+    message(STATUS "Not building metis (ENABLE_METIS=${ENABLE_METIS}")
+endif()
+
 add_subdirectory(testmi)
 add_subdirectory(testmosync)
--- a/plugins/samplemimo/audiocatsiso/CMakeLists.txt
+++ b/plugins/samplemimo/audiocatsiso/CMakeLists.txt
@ -52,11 +52,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${audiocatsiso_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${audiocatsiso_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME AudioCATSISOPlugin ${audiocatsiso_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/samplemimo/bladerf2mimo/CMakeLists.txt
+++ b/plugins/samplemimo/bladerf2mimo/CMakeLists.txt
@ -45,15 +45,21 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${bladerf2mimo_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${bladerf2mimo_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME BladeRF2MIMOPlugin ${bladerf2mimo_SOURCES})
+endif()
+
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()

 if(LIBBLADERF_EXTERNAL)
    add_dependencies(${TARGET_NAME} bladerf)
 endif()

-target_link_libraries(${TARGET_NAME}
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/samplemimo/limesdrmimo/CMakeLists.txt
+++ b/plugins/samplemimo/limesdrmimo/CMakeLists.txt
@ -45,15 +45,21 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${limesdrmimo_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${limesdrmimo_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME LimeSDRMIMOPlugin ${limesdrmimo_SOURCES})
+endif()
+
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()

 if(LIMESUITE_EXTERNAL)
    add_dependencies(${TARGET_NAME} limesuite)
 endif()

-target_link_libraries(${TARGET_NAME}
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/samplemimo/metismiso/CMakeLists.txt
+++ b/plugins/samplemimo/metismiso/CMakeLists.txt
@ -44,11 +44,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${metismiso_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${metismiso_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME MetisMISOPlugin ${metismiso_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/samplemimo/plutosdrmimo/CMakeLists.txt
+++ b/plugins/samplemimo/plutosdrmimo/CMakeLists.txt
@ -45,15 +45,21 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${plutosdrmimo_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${plutosdrmimo_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME PlutoSDRMIMOPlugin ${plutosdrmimo_SOURCES})
+endif()
+
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()

 if(LIBIIO_EXTERNAL)
    add_dependencies(${TARGET_NAME} libiio)
 endif()

-target_link_libraries(${TARGET_NAME}
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/samplemimo/testmi/CMakeLists.txt
+++ b/plugins/samplemimo/testmi/CMakeLists.txt
@ -41,11 +41,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${testmi_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${testmi_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME TestMIPlugin ${testmi_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/samplemimo/testmosync/CMakeLists.txt
+++ b/plugins/samplemimo/testmosync/CMakeLists.txt
@ -40,11 +40,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${testmosync_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${testmosync_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME TestMOSyncPlugin ${testmosync_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/samplesink/CMakeLists.txt
+++ b/plugins/samplesink/CMakeLists.txt
@ -4,7 +4,12 @@ add_subdirectory(testsink)
 add_subdirectory(fileoutput)
 add_subdirectory(localoutput)
 add_subdirectory(audiooutput)
-add_subdirectory(aaroniartsaoutput)
+
+if(ENABLE_AARONIARTSA)
+    add_subdirectory(aaroniartsaoutput)
+else()
+    message(STATUS "Not building aaroniartsaoutput (ENABLE_AARONIARTSA=${ENABLE_AARONIARTSA})")
+endif()

 if (CM256CC_FOUND AND (HAS_SSE3 OR HAS_NEON))
    add_subdirectory(remoteoutput)
--- a/plugins/samplesink/aaroniartsaoutput/CMakeLists.txt
+++ b/plugins/samplesink/aaroniartsaoutput/CMakeLists.txt
@ -42,11 +42,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${aaroniartsaoutput_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${aaroniartsaoutput_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME AaroniaRTSAOutputPlugin ${aaroniartsaoutput_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/samplesink/audiooutput/CMakeLists.txt
+++ b/plugins/samplesink/audiooutput/CMakeLists.txt
@ -42,11 +42,21 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-    ${audiooutput_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${audiooutput_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME AudioOutputPlugin ${audiooutput_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+if (EMSCRIPTEN AND BUILD_SHARED_LIBS)
+    target_link_options(${TARGET_NAME} PUBLIC -sEXPORT_NAME=${TARGET_NAME} -sSIDE_MODULE)
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
    sdrbase
--- a/plugins/samplesink/bladerf1output/CMakeLists.txt
+++ b/plugins/samplesink/bladerf1output/CMakeLists.txt
@ -45,15 +45,21 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${bladerf1output_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${bladerf1output_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME Bladerf1OutputPlugin ${bladerf1output_SOURCES})
+endif()
+
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()

 if(LIBBLADERF_EXTERNAL)
    add_dependencies(${TARGET_NAME} bladerf)
 endif()

-target_link_libraries(${TARGET_NAME}
+target_link_libraries(${TARGET_NAME} PRIVATE
        Qt::Core
        ${TARGET_LIB}
 	sdrbase
--- a/plugins/samplesink/bladerf2output/CMakeLists.txt
+++ b/plugins/samplesink/bladerf2output/CMakeLists.txt
@ -45,15 +45,21 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${bladerf2output_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${bladerf2output_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME BladeRF2OutputPlugin ${bladerf2output_SOURCES})
+endif()
+
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()

 if(LIBBLADERF_EXTERNAL)
    add_dependencies(${TARGET_NAME} bladerf)
 endif()

-target_link_libraries(${TARGET_NAME}
+target_link_libraries(${TARGET_NAME} PRIVATE
        Qt::Core
        ${TARGET_LIB}
 	sdrbase
--- a/plugins/samplesink/fileoutput/CMakeLists.txt
+++ b/plugins/samplesink/fileoutput/CMakeLists.txt
@ -42,11 +42,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${fileoutput_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${fileoutput_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME FileOutputPlugin ${fileoutput_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/samplesink/hackrfoutput/CMakeLists.txt
+++ b/plugins/samplesink/hackrfoutput/CMakeLists.txt
@ -45,11 +45,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${hackrfoutput_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${hackrfoutput_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME HackRFOutputPlugin ${hackrfoutput_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
        Qt::Core
        ${TARGET_LIB}
 	sdrbase
--- a/plugins/samplesink/limesdroutput/CMakeLists.txt
+++ b/plugins/samplesink/limesdroutput/CMakeLists.txt
@ -45,15 +45,21 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${limesdroutput_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${limesdroutput_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME LimeSDROutputPlugin ${limesdroutput_SOURCES})
+endif()
+
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()

 if(LIMESUITE_EXTERNAL)
    add_dependencies(${TARGET_NAME} limesuite)
 endif()

-target_link_libraries(${TARGET_NAME}
+target_link_libraries(${TARGET_NAME} PRIVATE
        Qt::Core
        ${TARGET_LIB}
 	sdrbase
--- a/plugins/samplesink/localoutput/CMakeLists.txt
+++ b/plugins/samplesink/localoutput/CMakeLists.txt
@ -41,11 +41,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${localoutput_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${localoutput_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME LocalOutputPlugin ${localoutput_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
        Qt::Core
        ${TARGET_LIB}
 	sdrbase
--- a/plugins/samplesink/plutosdroutput/CMakeLists.txt
+++ b/plugins/samplesink/plutosdroutput/CMakeLists.txt
@ -45,15 +45,21 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${plutosdroutput_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${plutosdroutput_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME PlutoSDROutputPlugin ${plutosdroutput_SOURCES})
+endif()
+
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()

 if(LIBIIO_EXTERNAL)
    add_dependencies(${TARGET_NAME} libiio)
 endif()

-target_link_libraries(${TARGET_NAME}
+target_link_libraries(${TARGET_NAME} PRIVATE
        Qt::Core
        ${TARGET_LIB}
 	sdrbase
--- a/plugins/samplesink/remoteoutput/CMakeLists.txt
+++ b/plugins/samplesink/remoteoutput/CMakeLists.txt
@ -50,15 +50,21 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${remoteoutput_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${remoteoutput_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME RemoteOutputPlugin ${remoteoutput_SOURCES})
+endif()
+
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()

 if(CM256CC_EXTERNAL)
    add_dependencies(${TARGET_NAME} cm256cc)
 endif()

-target_link_libraries(${TARGET_NAME}
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/plugins/samplesink/soapysdroutput/CMakeLists.txt
+++ b/plugins/samplesink/soapysdroutput/CMakeLists.txt
@ -45,11 +45,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${soapysdroutput_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${soapysdroutput_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME SoapySDROutputPlugin ${soapysdroutput_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
        Qt::Core
        ${TARGET_LIB}
 	sdrbase
--- a/plugins/samplesink/testsink/CMakeLists.txt
+++ b/plugins/samplesink/testsink/CMakeLists.txt
@ -40,11 +40,17 @@ else()
    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
 endif()

-add_library(${TARGET_NAME} SHARED
-	${testsink_SOURCES}
-)
+if(NOT Qt6_FOUND)
+    add_library(${TARGET_NAME} ${testsink_SOURCES})
+else()
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME TestSinkPlugin ${testsink_SOURCES})
+endif()

-target_link_libraries(${TARGET_NAME}
+if(NOT BUILD_SHARED_LIBS)
+    set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
+endif()
+
+target_link_libraries(${TARGET_NAME} PRIVATE
    Qt::Core
    ${TARGET_LIB}
 	sdrbase
--- a/Show More
+++ b/Show More