From fc7c9c1fc8ec5afc14222fa35e6f3ae37a7e2c7a Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Thu, 17 Nov 2022 14:34:54 +0000 Subject: [PATCH] Update CMakeLists.txt to support both Qt5 and Qt6. Add option ENABLE_QT6 --- CMakeLists.txt | 78 +++++++++++++------ cmake/Modules/DeployQt.cmake | 10 ++- cmake/cpack/CMakeLists.txt | 2 +- httpserver/CMakeLists.txt | 4 +- logging/CMakeLists.txt | 4 +- modemm17/CMakeLists.txt | 2 +- .../beamsteeringcwmod/CMakeLists.txt | 4 +- plugins/channelmimo/doa2/CMakeLists.txt | 4 +- .../channelmimo/interferometer/CMakeLists.txt | 4 +- plugins/channelrx/CMakeLists.txt | 2 +- plugins/channelrx/chanalyzer/CMakeLists.txt | 4 +- plugins/channelrx/demodadsb/CMakeLists.txt | 6 +- plugins/channelrx/demodais/CMakeLists.txt | 4 +- plugins/channelrx/demodam/CMakeLists.txt | 4 +- plugins/channelrx/demodapt/CMakeLists.txt | 4 +- plugins/channelrx/demodatv/CMakeLists.txt | 4 +- plugins/channelrx/demodbfm/CMakeLists.txt | 4 +- .../channelrx/demodchirpchat/CMakeLists.txt | 4 +- plugins/channelrx/demoddab/CMakeLists.txt | 4 +- plugins/channelrx/demoddatv/CMakeLists.txt | 8 +- plugins/channelrx/demoddsd/CMakeLists.txt | 4 +- plugins/channelrx/demodfreedv/CMakeLists.txt | 4 +- plugins/channelrx/demodm17/CMakeLists.txt | 4 +- plugins/channelrx/demodnfm/CMakeLists.txt | 4 +- plugins/channelrx/demodpacket/CMakeLists.txt | 4 +- plugins/channelrx/demodpager/CMakeLists.txt | 4 +- .../channelrx/demodradiosonde/CMakeLists.txt | 4 +- plugins/channelrx/demodssb/CMakeLists.txt | 4 +- plugins/channelrx/demodvor/CMakeLists.txt | 4 +- plugins/channelrx/demodvormc/CMakeLists.txt | 4 +- plugins/channelrx/demodwfm/CMakeLists.txt | 4 +- plugins/channelrx/filesink/CMakeLists.txt | 4 +- plugins/channelrx/freqtracker/CMakeLists.txt | 4 +- plugins/channelrx/localsink/CMakeLists.txt | 4 +- plugins/channelrx/noisefigure/CMakeLists.txt | 4 +- .../channelrx/radioastronomy/CMakeLists.txt | 4 +- plugins/channelrx/radioclock/CMakeLists.txt | 4 +- plugins/channelrx/remotesink/CMakeLists.txt | 4 +- .../channelrx/remotetcpsink/CMakeLists.txt | 4 +- .../channelrx/sigmffilesink/CMakeLists.txt | 4 +- plugins/channelrx/udpsink/CMakeLists.txt | 6 +- plugins/channeltx/filesource/CMakeLists.txt | 6 +- plugins/channeltx/localsource/CMakeLists.txt | 4 +- plugins/channeltx/mod802.15.4/CMakeLists.txt | 4 +- plugins/channeltx/modais/CMakeLists.txt | 4 +- plugins/channeltx/modam/CMakeLists.txt | 4 +- plugins/channeltx/modatv/CMakeLists.txt | 4 +- plugins/channeltx/modchirpchat/CMakeLists.txt | 4 +- plugins/channeltx/moddatv/CMakeLists.txt | 4 +- plugins/channeltx/modfreedv/CMakeLists.txt | 4 +- plugins/channeltx/modm17/CMakeLists.txt | 4 +- plugins/channeltx/modnfm/CMakeLists.txt | 4 +- plugins/channeltx/modpacket/CMakeLists.txt | 4 +- plugins/channeltx/modssb/CMakeLists.txt | 4 +- plugins/channeltx/modwfm/CMakeLists.txt | 4 +- plugins/channeltx/remotesource/CMakeLists.txt | 6 +- plugins/channeltx/udpsource/CMakeLists.txt | 6 +- plugins/feature/CMakeLists.txt | 12 +-- plugins/feature/afc/CMakeLists.txt | 4 +- plugins/feature/ais/CMakeLists.txt | 4 +- plugins/feature/ambe/CMakeLists.txt | 4 +- plugins/feature/antennatools/CMakeLists.txt | 4 +- plugins/feature/aprs/CMakeLists.txt | 4 +- plugins/feature/demodanalyzer/CMakeLists.txt | 4 +- .../feature/gs232controller/CMakeLists.txt | 6 +- .../feature/jogdialcontroller/CMakeLists.txt | 4 +- plugins/feature/limerfe/CMakeLists.txt | 4 +- plugins/feature/map/CMakeLists.txt | 6 +- plugins/feature/pertester/CMakeLists.txt | 4 +- plugins/feature/radiosonde/CMakeLists.txt | 4 +- plugins/feature/remotecontrol/CMakeLists.txt | 4 +- plugins/feature/rigctlserver/CMakeLists.txt | 4 +- .../feature/satellitetracker/CMakeLists.txt | 11 ++- plugins/feature/simpleptt/CMakeLists.txt | 4 +- plugins/feature/startracker/CMakeLists.txt | 4 +- plugins/feature/vorlocalizer/CMakeLists.txt | 4 +- .../samplemimo/bladerf2mimo/CMakeLists.txt | 4 +- plugins/samplemimo/limesdrmimo/CMakeLists.txt | 4 +- plugins/samplemimo/metismiso/CMakeLists.txt | 4 +- .../samplemimo/plutosdrmimo/CMakeLists.txt | 4 +- plugins/samplemimo/testmi/CMakeLists.txt | 4 +- plugins/samplemimo/testmosync/CMakeLists.txt | 4 +- plugins/samplemimo/xtrxmimo/CMakeLists.txt | 4 +- plugins/samplesink/audiooutput/CMakeLists.txt | 4 +- .../samplesink/bladerf1output/CMakeLists.txt | 4 +- .../samplesink/bladerf2output/CMakeLists.txt | 4 +- plugins/samplesink/fileoutput/CMakeLists.txt | 4 +- .../samplesink/hackrfoutput/CMakeLists.txt | 4 +- .../samplesink/limesdroutput/CMakeLists.txt | 4 +- plugins/samplesink/localoutput/CMakeLists.txt | 4 +- .../samplesink/plutosdroutput/CMakeLists.txt | 4 +- .../samplesink/remoteoutput/CMakeLists.txt | 4 +- .../samplesink/soapysdroutput/CMakeLists.txt | 4 +- plugins/samplesink/testsink/CMakeLists.txt | 4 +- plugins/samplesink/usrpoutput/CMakeLists.txt | 4 +- plugins/samplesink/xtrxoutput/CMakeLists.txt | 4 +- plugins/samplesource/airspy/CMakeLists.txt | 4 +- plugins/samplesource/airspyhf/CMakeLists.txt | 4 +- .../samplesource/audioinput/CMakeLists.txt | 4 +- .../samplesource/bladerf1input/CMakeLists.txt | 4 +- .../samplesource/bladerf2input/CMakeLists.txt | 4 +- plugins/samplesource/fcdpro/CMakeLists.txt | 4 +- .../samplesource/fcdproplus/CMakeLists.txt | 4 +- plugins/samplesource/fileinput/CMakeLists.txt | 4 +- .../samplesource/hackrfinput/CMakeLists.txt | 4 +- plugins/samplesource/kiwisdr/CMakeLists.txt | 6 +- .../samplesource/limesdrinput/CMakeLists.txt | 4 +- .../samplesource/localinput/CMakeLists.txt | 4 +- plugins/samplesource/perseus/CMakeLists.txt | 4 +- .../samplesource/plutosdrinput/CMakeLists.txt | 4 +- .../samplesource/remoteinput/CMakeLists.txt | 4 +- .../remotetcpinput/CMakeLists.txt | 4 +- plugins/samplesource/rtlsdr/CMakeLists.txt | 4 +- plugins/samplesource/sdrplay/CMakeLists.txt | 4 +- plugins/samplesource/sdrplayv3/CMakeLists.txt | 4 +- .../sigmffileinput/CMakeLists.txt | 4 +- .../samplesource/soapysdrinput/CMakeLists.txt | 4 +- .../samplesource/testsource/CMakeLists.txt | 4 +- plugins/samplesource/usrpinput/CMakeLists.txt | 4 +- plugins/samplesource/xtrxinput/CMakeLists.txt | 4 +- qrtplib/CMakeLists.txt | 4 +- sdrbase/CMakeLists.txt | 19 ++++- sdrbench/CMakeLists.txt | 4 +- sdrgui/CMakeLists.txt | 22 ++++-- sdrsrv/CMakeLists.txt | 4 +- swagger/CMakeLists.txt | 4 +- 126 files changed, 355 insertions(+), 291 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a14a6604f..1f5e6673a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,6 +29,7 @@ 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. \ 'native' option will figure out host machine compatibilities and set flags accordingly (even with MSVC).") +option(ENABLE_QT6 "Build with Qt6 rather than Qt5" OFF) # Sampling devices enablers option(ENABLE_AIRSPY "Enable AirSpy support" ON) @@ -410,30 +411,59 @@ set(CMAKE_AUTORCC TRUE) set(CMAKE_INCLUDE_CURRENT_DIR ON) # Qt requirements -find_package(Qt5 - REQUIRED COMPONENTS - Core - Widgets - WebSockets - Multimedia - MultimediaWidgets - Positioning - Charts - SerialPort) +# See: https://doc-snapshots.qt.io/qt6-dev/cmake-qt5-and-qt6-compatibility.html +if(ENABLE_QT6) + # Qt6 doesn't currently support Location + find_package(Qt6 + COMPONENTS + Core + Widgets + WebSockets + Multimedia + MultimediaWidgets + Positioning + Charts + SerialPort + Core5Compat) +else() + find_package(Qt5 5.15 + REQUIRED COMPONENTS + Core + Widgets + WebSockets + Multimedia + MultimediaWidgets + Positioning + Charts + SerialPort) +endif() # for the server we don't need OpenGL/Qt Quick components if (BUILD_GUI) find_package(OpenGL REQUIRED) - find_package(Qt5 - REQUIRED COMPONENTS - OpenGL - Quick - QuickWidgets - Location - TextToSpeech - WebEngine - WebEngineCore - WebEngineWidgets) + if (ENABLE_QT6) + find_package(Qt6 + REQUIRED COMPONENTS + OpenGL + OpenGLWidgets + Quick + QuickWidgets + TextToSpeech + WebEngineQuick + WebEngineCore + WebEngineWidgets) + else() + find_package(Qt5 + REQUIRED COMPONENTS + OpenGL + Quick + QuickWidgets + Location + TextToSpeech + WebEngine + WebEngineCore + WebEngineWidgets) + endif() endif() # other requirements @@ -629,7 +659,7 @@ add_executable(sdrangelbench ) target_link_libraries(sdrangelbench - Qt5::Multimedia + Qt::Multimedia sdrbench logging ) @@ -646,8 +676,8 @@ if (BUILD_GUI) target_link_libraries(${CMAKE_PROJECT_NAME} ${OPENGL_LIBRARIES} - Qt5::Widgets - Qt5::Multimedia + Qt::Widgets + Qt::Multimedia sdrbase sdrgui logging @@ -670,7 +700,7 @@ if (BUILD_SERVER) ) target_link_libraries(sdrangelsrv - Qt5::Multimedia + Qt::Multimedia sdrbase sdrsrv logging diff --git a/cmake/Modules/DeployQt.cmake b/cmake/Modules/DeployQt.cmake index d302cf203..5a50f0449 100644 --- a/cmake/Modules/DeployQt.cmake +++ b/cmake/Modules/DeployQt.cmake @@ -1,6 +1,10 @@ -find_package(Qt5Core REQUIRED) +if (Qt6_FOUND) + find_package(Qt6Core REQUIRED) +else() + find_package(Qt5Core REQUIRED) +endif() -get_target_property(_qmake_executable Qt5::qmake IMPORTED_LOCATION) +get_target_property(_qmake_executable Qt::qmake IMPORTED_LOCATION) get_filename_component(_qt_bin_dir "${_qmake_executable}" DIRECTORY) find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${_qt_bin_dir}") @@ -20,7 +24,7 @@ function(windeployqt target bindir qmldir) add_custom_command(TARGET ${target} POST_BUILD COMMAND "${CMAKE_COMMAND}" -E env PATH="${_qt_bin_dir}" "${WINDEPLOYQT_EXECUTABLE}" - --verbose 1 + --verbose 2 --no-compiler-runtime --dir "${bindir}" --qmldir "${qmldir}" diff --git a/cmake/cpack/CMakeLists.txt b/cmake/cpack/CMakeLists.txt index 28d91df25..80a78c404 100644 --- a/cmake/cpack/CMakeLists.txt +++ b/cmake/cpack/CMakeLists.txt @@ -1,5 +1,5 @@ # Stuff qmake can tell us -get_target_property (QMAKE_EXECUTABLE Qt5::qmake LOCATION) +get_target_property (QMAKE_EXECUTABLE Qt::qmake LOCATION) function (QUERY_QMAKE VAR RESULT) exec_program (${QMAKE_EXECUTABLE} ARGS "-query ${VAR}" RETURN_VALUE return_code OUTPUT_VARIABLE output) if (NOT return_code) diff --git a/httpserver/CMakeLists.txt b/httpserver/CMakeLists.txt index 45c3ad181..c796c8cbb 100644 --- a/httpserver/CMakeLists.txt +++ b/httpserver/CMakeLists.txt @@ -40,8 +40,8 @@ add_library(httpserver SHARED ) target_link_libraries(httpserver - Qt5::Core - Qt5::Network + Qt::Core + Qt::Network ) install(TARGETS httpserver DESTINATION ${INSTALL_LIB_DIR}) diff --git a/logging/CMakeLists.txt b/logging/CMakeLists.txt index 3c8f92781..995e22ce2 100644 --- a/logging/CMakeLists.txt +++ b/logging/CMakeLists.txt @@ -26,8 +26,8 @@ add_library(logging SHARED ) target_link_libraries(logging - Qt5::Core - Qt5::Network + Qt::Core + Qt::Network ) install(TARGETS logging DESTINATION ${INSTALL_LIB_DIR}) diff --git a/modemm17/CMakeLists.txt b/modemm17/CMakeLists.txt index fa04e8ecf..58f12be85 100644 --- a/modemm17/CMakeLists.txt +++ b/modemm17/CMakeLists.txt @@ -52,7 +52,7 @@ add_library(modemm17 SHARED ) target_link_libraries(modemm17 - Qt5::Core + Qt::Core ) install(TARGETS modemm17 DESTINATION ${INSTALL_LIB_DIR}) diff --git a/plugins/channelmimo/beamsteeringcwmod/CMakeLists.txt b/plugins/channelmimo/beamsteeringcwmod/CMakeLists.txt index e3438107b..baa8ba5c6 100644 --- a/plugins/channelmimo/beamsteeringcwmod/CMakeLists.txt +++ b/plugins/channelmimo/beamsteeringcwmod/CMakeLists.txt @@ -35,7 +35,7 @@ if (NOT SERVER_MODE) ) set(TARGET_NAME beamsteeringcwmod) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -50,7 +50,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channelmimo/doa2/CMakeLists.txt b/plugins/channelmimo/doa2/CMakeLists.txt index 42cc6d2f0..b7a0939c8 100644 --- a/plugins/channelmimo/doa2/CMakeLists.txt +++ b/plugins/channelmimo/doa2/CMakeLists.txt @@ -39,7 +39,7 @@ if (NOT SERVER_MODE) ) set(TARGET_NAME doa2) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -54,7 +54,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channelmimo/interferometer/CMakeLists.txt b/plugins/channelmimo/interferometer/CMakeLists.txt index 5bd83f884..e0f2f7e42 100644 --- a/plugins/channelmimo/interferometer/CMakeLists.txt +++ b/plugins/channelmimo/interferometer/CMakeLists.txt @@ -37,7 +37,7 @@ if (NOT SERVER_MODE) ) set(TARGET_NAME interferometer) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -52,7 +52,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channelrx/CMakeLists.txt b/plugins/channelrx/CMakeLists.txt index 474babb75..f3ad92696 100644 --- a/plugins/channelrx/CMakeLists.txt +++ b/plugins/channelrx/CMakeLists.txt @@ -1,6 +1,6 @@ project(demod) -if (ENABLE_CHANNELRX_DEMODADSB AND Qt5Quick_FOUND AND Qt5QuickWidgets_FOUND AND Qt5Positioning_FOUND) +if (ENABLE_CHANNELRX_DEMODADSB AND Qt${QT_DEFAULT_MAJOR_VERSION}Quick_FOUND AND Qt${QT_DEFAULT_MAJOR_VERSION}QuickWidgets_FOUND AND Qt${QT_DEFAULT_MAJOR_VERSION}Positioning_FOUND) add_subdirectory(demodadsb) # add_subdirectory(demodvormc) endif() diff --git a/plugins/channelrx/chanalyzer/CMakeLists.txt b/plugins/channelrx/chanalyzer/CMakeLists.txt index ba324e091..62352c1ec 100644 --- a/plugins/channelrx/chanalyzer/CMakeLists.txt +++ b/plugins/channelrx/chanalyzer/CMakeLists.txt @@ -34,8 +34,8 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core - Qt5::Widgets + Qt::Core + Qt::Widgets sdrbase sdrgui ) diff --git a/plugins/channelrx/demodadsb/CMakeLists.txt b/plugins/channelrx/demodadsb/CMakeLists.txt index a23f30a5f..02078f24a 100644 --- a/plugins/channelrx/demodadsb/CMakeLists.txt +++ b/plugins/channelrx/demodadsb/CMakeLists.txt @@ -29,7 +29,7 @@ set(adsb_HEADERS include_directories( ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client ${Boost_INCLUDE_DIRS} - ${Qt5Gui_PRIVATE_INCLUDE_DIRS} + ${Qt${QT_DEFAULT_MAJOR_VERSION}Gui_PRIVATE_INCLUDE_DIRS} ) if(NOT SERVER_MODE) @@ -61,7 +61,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME demodadsb) - set(TARGET_LIB Qt5::Widgets Qt5::Quick Qt5::QuickWidgets Qt5::Positioning Qt5::TextToSpeech) + set(TARGET_LIB Qt::Widgets Qt::Quick Qt::QuickWidgets Qt::Positioning Qt::TextToSpeech) set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -81,7 +81,7 @@ endif() target_link_libraries(${TARGET_NAME} Boost::disable_autolinking - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channelrx/demodais/CMakeLists.txt b/plugins/channelrx/demodais/CMakeLists.txt index 14bf2cd59..09978a0b9 100644 --- a/plugins/channelrx/demodais/CMakeLists.txt +++ b/plugins/channelrx/demodais/CMakeLists.txt @@ -34,7 +34,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME demodais) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -49,7 +49,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channelrx/demodam/CMakeLists.txt b/plugins/channelrx/demodam/CMakeLists.txt index ecc7b89b1..c185ce8d9 100644 --- a/plugins/channelrx/demodam/CMakeLists.txt +++ b/plugins/channelrx/demodam/CMakeLists.txt @@ -38,7 +38,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME demodam) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -53,7 +53,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channelrx/demodapt/CMakeLists.txt b/plugins/channelrx/demodapt/CMakeLists.txt index da90ac59a..29aa74166 100644 --- a/plugins/channelrx/demodapt/CMakeLists.txt +++ b/plugins/channelrx/demodapt/CMakeLists.txt @@ -45,7 +45,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME demodapt) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -68,7 +68,7 @@ if(SGP4_EXTERNAL) endif() target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channelrx/demodatv/CMakeLists.txt b/plugins/channelrx/demodatv/CMakeLists.txt index 3f1bb5301..322a55fd6 100644 --- a/plugins/channelrx/demodatv/CMakeLists.txt +++ b/plugins/channelrx/demodatv/CMakeLists.txt @@ -34,8 +34,8 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core - Qt5::Widgets + Qt::Core + Qt::Widgets sdrbase sdrgui ) diff --git a/plugins/channelrx/demodbfm/CMakeLists.txt b/plugins/channelrx/demodbfm/CMakeLists.txt index 3eeb92783..46af33186 100644 --- a/plugins/channelrx/demodbfm/CMakeLists.txt +++ b/plugins/channelrx/demodbfm/CMakeLists.txt @@ -45,7 +45,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME demodbfm) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -60,7 +60,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channelrx/demodchirpchat/CMakeLists.txt b/plugins/channelrx/demodchirpchat/CMakeLists.txt index af65e7238..f312b65e4 100644 --- a/plugins/channelrx/demodchirpchat/CMakeLists.txt +++ b/plugins/channelrx/demodchirpchat/CMakeLists.txt @@ -41,7 +41,7 @@ if(NOT SERVER_MODE) chirpchatdemodgui.h ) set(TARGET_NAME demodchirpchat) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -56,7 +56,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channelrx/demoddab/CMakeLists.txt b/plugins/channelrx/demoddab/CMakeLists.txt index 39d39ca60..38311707a 100644 --- a/plugins/channelrx/demoddab/CMakeLists.txt +++ b/plugins/channelrx/demoddab/CMakeLists.txt @@ -39,7 +39,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME demoddab) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -54,7 +54,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channelrx/demoddatv/CMakeLists.txt b/plugins/channelrx/demoddatv/CMakeLists.txt index 67570c885..552991080 100644 --- a/plugins/channelrx/demoddatv/CMakeLists.txt +++ b/plugins/channelrx/demoddatv/CMakeLists.txt @@ -77,10 +77,10 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core - Qt5::Widgets - Qt5::Multimedia - Qt5::MultimediaWidgets + Qt::Core + Qt::Widgets + Qt::Multimedia + Qt::MultimediaWidgets sdrbase sdrgui ${AVCODEC_LIBRARIES} diff --git a/plugins/channelrx/demoddsd/CMakeLists.txt b/plugins/channelrx/demoddsd/CMakeLists.txt index 9908a5245..e4205aaec 100644 --- a/plugins/channelrx/demoddsd/CMakeLists.txt +++ b/plugins/channelrx/demoddsd/CMakeLists.txt @@ -43,7 +43,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME demoddsd) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -62,7 +62,7 @@ if(LIBDSDCC_EXTERNAL) endif() target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channelrx/demodfreedv/CMakeLists.txt b/plugins/channelrx/demodfreedv/CMakeLists.txt index 33a21d386..79a70448a 100644 --- a/plugins/channelrx/demodfreedv/CMakeLists.txt +++ b/plugins/channelrx/demodfreedv/CMakeLists.txt @@ -34,7 +34,7 @@ if(NOT SERVER_MODE) freedvdemodgui.h ) set(TARGET_NAME demodfreedv) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -53,7 +53,7 @@ if(CODEC2_EXTERNAL) endif() target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channelrx/demodm17/CMakeLists.txt b/plugins/channelrx/demodm17/CMakeLists.txt index 792748365..27918126f 100644 --- a/plugins/channelrx/demodm17/CMakeLists.txt +++ b/plugins/channelrx/demodm17/CMakeLists.txt @@ -44,7 +44,7 @@ if(NOT SERVER_MODE) m17statustextdialog.h ) set(TARGET_NAME demodm17) - set(TARGET_LIB "Qt5::Widgets" Qt5::Charts) + set(TARGET_LIB "Qt::Widgets" Qt::Charts) set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -63,7 +63,7 @@ if(CODEC2_EXTERNAL) endif() target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channelrx/demodnfm/CMakeLists.txt b/plugins/channelrx/demodnfm/CMakeLists.txt index 26de054e7..117f7ae61 100644 --- a/plugins/channelrx/demodnfm/CMakeLists.txt +++ b/plugins/channelrx/demodnfm/CMakeLists.txt @@ -39,7 +39,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME demodnfm) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -54,7 +54,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channelrx/demodpacket/CMakeLists.txt b/plugins/channelrx/demodpacket/CMakeLists.txt index 6967d60b3..df95998c0 100644 --- a/plugins/channelrx/demodpacket/CMakeLists.txt +++ b/plugins/channelrx/demodpacket/CMakeLists.txt @@ -34,7 +34,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME demodpacket) - set(TARGET_LIB "Qt5::Widgets" Qt5::Quick Qt5::QuickWidgets Qt5::Positioning) + set(TARGET_LIB "Qt::Widgets" Qt::Quick Qt::QuickWidgets Qt::Positioning) set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -49,7 +49,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channelrx/demodpager/CMakeLists.txt b/plugins/channelrx/demodpager/CMakeLists.txt index a8a3503c0..beb2eefdf 100644 --- a/plugins/channelrx/demodpager/CMakeLists.txt +++ b/plugins/channelrx/demodpager/CMakeLists.txt @@ -37,7 +37,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME demodpager) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -52,7 +52,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channelrx/demodradiosonde/CMakeLists.txt b/plugins/channelrx/demodradiosonde/CMakeLists.txt index 4301cd726..74b63171a 100644 --- a/plugins/channelrx/demodradiosonde/CMakeLists.txt +++ b/plugins/channelrx/demodradiosonde/CMakeLists.txt @@ -34,7 +34,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME demodradiosonde) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -49,7 +49,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channelrx/demodssb/CMakeLists.txt b/plugins/channelrx/demodssb/CMakeLists.txt index 934a50796..f617295af 100644 --- a/plugins/channelrx/demodssb/CMakeLists.txt +++ b/plugins/channelrx/demodssb/CMakeLists.txt @@ -33,7 +33,7 @@ if(NOT SERVER_MODE) ssbdemodgui.h ) set(TARGET_NAME demodssb) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -48,7 +48,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channelrx/demodvor/CMakeLists.txt b/plugins/channelrx/demodvor/CMakeLists.txt index c488df18f..da0bd5eb0 100644 --- a/plugins/channelrx/demodvor/CMakeLists.txt +++ b/plugins/channelrx/demodvor/CMakeLists.txt @@ -36,7 +36,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME demodvor) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -51,7 +51,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channelrx/demodvormc/CMakeLists.txt b/plugins/channelrx/demodvormc/CMakeLists.txt index 46490ec17..47916407e 100644 --- a/plugins/channelrx/demodvormc/CMakeLists.txt +++ b/plugins/channelrx/demodvormc/CMakeLists.txt @@ -41,7 +41,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME demodvormc) - set(TARGET_LIB "Qt5::Widgets" Qt5::Quick Qt5::QuickWidgets Qt5::Positioning) + set(TARGET_LIB "Qt::Widgets" Qt::Quick Qt::QuickWidgets Qt::Positioning) set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -56,7 +56,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channelrx/demodwfm/CMakeLists.txt b/plugins/channelrx/demodwfm/CMakeLists.txt index 1ae921975..d3e227c07 100644 --- a/plugins/channelrx/demodwfm/CMakeLists.txt +++ b/plugins/channelrx/demodwfm/CMakeLists.txt @@ -34,7 +34,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME demodwfm) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -49,7 +49,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channelrx/filesink/CMakeLists.txt b/plugins/channelrx/filesink/CMakeLists.txt index 90388df02..c9b375c44 100644 --- a/plugins/channelrx/filesink/CMakeLists.txt +++ b/plugins/channelrx/filesink/CMakeLists.txt @@ -36,7 +36,7 @@ if(NOT SERVER_MODE) filesinkgui.h ) set(TARGET_NAME filesink) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -51,7 +51,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channelrx/freqtracker/CMakeLists.txt b/plugins/channelrx/freqtracker/CMakeLists.txt index ebafbb087..a6eea37b0 100644 --- a/plugins/channelrx/freqtracker/CMakeLists.txt +++ b/plugins/channelrx/freqtracker/CMakeLists.txt @@ -37,7 +37,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME freqtracker) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -52,7 +52,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channelrx/localsink/CMakeLists.txt b/plugins/channelrx/localsink/CMakeLists.txt index d1a9e4ab5..a5bfdd8bb 100644 --- a/plugins/channelrx/localsink/CMakeLists.txt +++ b/plugins/channelrx/localsink/CMakeLists.txt @@ -36,7 +36,7 @@ if(NOT SERVER_MODE) localsinkgui.h ) set(TARGET_NAME localsink) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -51,7 +51,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channelrx/noisefigure/CMakeLists.txt b/plugins/channelrx/noisefigure/CMakeLists.txt index 84a0ac269..4c6fbcb0c 100644 --- a/plugins/channelrx/noisefigure/CMakeLists.txt +++ b/plugins/channelrx/noisefigure/CMakeLists.txt @@ -41,7 +41,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME noisefigure) - set(TARGET_LIB "Qt5::Widgets" Qt5::Charts) + set(TARGET_LIB "Qt::Widgets" Qt::Charts) set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -56,7 +56,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channelrx/radioastronomy/CMakeLists.txt b/plugins/channelrx/radioastronomy/CMakeLists.txt index 04e07176e..5ac580a00 100644 --- a/plugins/channelrx/radioastronomy/CMakeLists.txt +++ b/plugins/channelrx/radioastronomy/CMakeLists.txt @@ -43,7 +43,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME radioastronomy) - set(TARGET_LIB "Qt5::Widgets" Qt5::Charts) + set(TARGET_LIB "Qt::Widgets" Qt::Charts) set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -58,7 +58,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channelrx/radioclock/CMakeLists.txt b/plugins/channelrx/radioclock/CMakeLists.txt index e2a8e98e3..384151cdd 100644 --- a/plugins/channelrx/radioclock/CMakeLists.txt +++ b/plugins/channelrx/radioclock/CMakeLists.txt @@ -34,7 +34,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME radioclock) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -49,7 +49,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channelrx/remotesink/CMakeLists.txt b/plugins/channelrx/remotesink/CMakeLists.txt index 5c37a8457..33a2f974f 100644 --- a/plugins/channelrx/remotesink/CMakeLists.txt +++ b/plugins/channelrx/remotesink/CMakeLists.txt @@ -40,7 +40,7 @@ if(NOT SERVER_MODE) remotesinkgui.h ) set(TARGET_NAME remotesink) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -59,7 +59,7 @@ if(CM256CC_EXTERNAL) endif() target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channelrx/remotetcpsink/CMakeLists.txt b/plugins/channelrx/remotetcpsink/CMakeLists.txt index 4abac8af6..12fedbdab 100644 --- a/plugins/channelrx/remotetcpsink/CMakeLists.txt +++ b/plugins/channelrx/remotetcpsink/CMakeLists.txt @@ -34,7 +34,7 @@ if(NOT SERVER_MODE) remotetcpsinkgui.h ) set(TARGET_NAME remotetcpsink) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -49,7 +49,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channelrx/sigmffilesink/CMakeLists.txt b/plugins/channelrx/sigmffilesink/CMakeLists.txt index 07299ff08..fb41a3ffb 100644 --- a/plugins/channelrx/sigmffilesink/CMakeLists.txt +++ b/plugins/channelrx/sigmffilesink/CMakeLists.txt @@ -36,7 +36,7 @@ if(NOT SERVER_MODE) sigmffilesinkgui.h ) set(TARGET_NAME sigmffilesink) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -51,7 +51,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channelrx/udpsink/CMakeLists.txt b/plugins/channelrx/udpsink/CMakeLists.txt index c62573b54..d6bb2c174 100644 --- a/plugins/channelrx/udpsink/CMakeLists.txt +++ b/plugins/channelrx/udpsink/CMakeLists.txt @@ -35,7 +35,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME udpsink) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -50,9 +50,9 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} - Qt5::Network + Qt::Network sdrbase ${TARGET_LIB_GUI} ) diff --git a/plugins/channeltx/filesource/CMakeLists.txt b/plugins/channeltx/filesource/CMakeLists.txt index 3a107439d..20d497ba8 100644 --- a/plugins/channeltx/filesource/CMakeLists.txt +++ b/plugins/channeltx/filesource/CMakeLists.txt @@ -36,7 +36,7 @@ if(NOT SERVER_MODE) filesourcegui.h ) set(TARGET_NAME filesource) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -51,9 +51,9 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} - Qt5::Network + Qt::Network sdrbase ${TARGET_LIB_GUI} swagger diff --git a/plugins/channeltx/localsource/CMakeLists.txt b/plugins/channeltx/localsource/CMakeLists.txt index 4cd089401..f75b559ab 100644 --- a/plugins/channeltx/localsource/CMakeLists.txt +++ b/plugins/channeltx/localsource/CMakeLists.txt @@ -38,7 +38,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME localsource) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -53,7 +53,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channeltx/mod802.15.4/CMakeLists.txt b/plugins/channeltx/mod802.15.4/CMakeLists.txt index 7562e2fac..574cd4b96 100644 --- a/plugins/channeltx/mod802.15.4/CMakeLists.txt +++ b/plugins/channeltx/mod802.15.4/CMakeLists.txt @@ -41,7 +41,7 @@ if(NOT SERVER_MODE) ieee_802_15_4_modtxsettingsdialog.h ) set(TARGET_NAME modieee_802_15_4) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -56,7 +56,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channeltx/modais/CMakeLists.txt b/plugins/channeltx/modais/CMakeLists.txt index 27e36de95..b5f71ee84 100644 --- a/plugins/channeltx/modais/CMakeLists.txt +++ b/plugins/channeltx/modais/CMakeLists.txt @@ -39,7 +39,7 @@ if(NOT SERVER_MODE) aismodtxsettingsdialog.h ) set(TARGET_NAME modais) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -54,7 +54,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channeltx/modam/CMakeLists.txt b/plugins/channeltx/modam/CMakeLists.txt index 3b08ed84e..cd7cb0e05 100644 --- a/plugins/channeltx/modam/CMakeLists.txt +++ b/plugins/channeltx/modam/CMakeLists.txt @@ -35,7 +35,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME modam) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -50,7 +50,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channeltx/modatv/CMakeLists.txt b/plugins/channeltx/modatv/CMakeLists.txt index 832871c57..c10a3f2bf 100644 --- a/plugins/channeltx/modatv/CMakeLists.txt +++ b/plugins/channeltx/modatv/CMakeLists.txt @@ -38,7 +38,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME modatv) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -53,7 +53,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channeltx/modchirpchat/CMakeLists.txt b/plugins/channeltx/modchirpchat/CMakeLists.txt index d8638f088..19439ad9b 100644 --- a/plugins/channeltx/modchirpchat/CMakeLists.txt +++ b/plugins/channeltx/modchirpchat/CMakeLists.txt @@ -42,7 +42,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME modchirpchat) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -57,7 +57,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channeltx/moddatv/CMakeLists.txt b/plugins/channeltx/moddatv/CMakeLists.txt index 77c1ad85a..149ac26a8 100644 --- a/plugins/channeltx/moddatv/CMakeLists.txt +++ b/plugins/channeltx/moddatv/CMakeLists.txt @@ -59,7 +59,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME moddatv) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -75,7 +75,7 @@ add_library(${TARGET_NAME} SHARED target_link_libraries(${TARGET_NAME} Boost::disable_autolinking - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channeltx/modfreedv/CMakeLists.txt b/plugins/channeltx/modfreedv/CMakeLists.txt index b45390959..d231d0505 100644 --- a/plugins/channeltx/modfreedv/CMakeLists.txt +++ b/plugins/channeltx/modfreedv/CMakeLists.txt @@ -34,7 +34,7 @@ if(NOT SERVER_MODE) freedvmodgui.h ) set(TARGET_NAME modfreedv) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -53,7 +53,7 @@ if(CODEC2_EXTERNAL) endif() target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channeltx/modm17/CMakeLists.txt b/plugins/channeltx/modm17/CMakeLists.txt index 889b17f1a..090d13c77 100644 --- a/plugins/channeltx/modm17/CMakeLists.txt +++ b/plugins/channeltx/modm17/CMakeLists.txt @@ -44,7 +44,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME modm17) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -63,7 +63,7 @@ if(CODEC2_EXTERNAL) endif() target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channeltx/modnfm/CMakeLists.txt b/plugins/channeltx/modnfm/CMakeLists.txt index 468708800..5bd9d0f1b 100644 --- a/plugins/channeltx/modnfm/CMakeLists.txt +++ b/plugins/channeltx/modnfm/CMakeLists.txt @@ -37,7 +37,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME modnfm) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -52,7 +52,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channeltx/modpacket/CMakeLists.txt b/plugins/channeltx/modpacket/CMakeLists.txt index b165b2768..8acf95911 100644 --- a/plugins/channeltx/modpacket/CMakeLists.txt +++ b/plugins/channeltx/modpacket/CMakeLists.txt @@ -42,7 +42,7 @@ if(NOT SERVER_MODE) packetmodtxsettingsdialog.h ) set(TARGET_NAME modpacket) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -57,7 +57,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channeltx/modssb/CMakeLists.txt b/plugins/channeltx/modssb/CMakeLists.txt index e08d42ad6..5156b2e36 100644 --- a/plugins/channeltx/modssb/CMakeLists.txt +++ b/plugins/channeltx/modssb/CMakeLists.txt @@ -35,7 +35,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME modssb) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -50,7 +50,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channeltx/modwfm/CMakeLists.txt b/plugins/channeltx/modwfm/CMakeLists.txt index 299df0e07..d2cc22fc0 100644 --- a/plugins/channeltx/modwfm/CMakeLists.txt +++ b/plugins/channeltx/modwfm/CMakeLists.txt @@ -35,7 +35,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME modwfm) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -50,7 +50,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/channeltx/remotesource/CMakeLists.txt b/plugins/channeltx/remotesource/CMakeLists.txt index 1f812a2d5..1a5ac0b76 100644 --- a/plugins/channeltx/remotesource/CMakeLists.txt +++ b/plugins/channeltx/remotesource/CMakeLists.txt @@ -39,7 +39,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME remotesource) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -58,9 +58,9 @@ if(CM256CC_EXTERNAL) endif() target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} - Qt5::Network + Qt::Network sdrbase ${TARGET_LIB_GUI} swagger diff --git a/plugins/channeltx/udpsource/CMakeLists.txt b/plugins/channeltx/udpsource/CMakeLists.txt index 4aa3b5bf0..deb682aed 100644 --- a/plugins/channeltx/udpsource/CMakeLists.txt +++ b/plugins/channeltx/udpsource/CMakeLists.txt @@ -39,7 +39,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME udpsource) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -54,9 +54,9 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} - Qt5::Network + Qt::Network sdrbase ${TARGET_LIB_GUI} swagger diff --git a/plugins/feature/CMakeLists.txt b/plugins/feature/CMakeLists.txt index 31cf277e7..d7d11584d 100644 --- a/plugins/feature/CMakeLists.txt +++ b/plugins/feature/CMakeLists.txt @@ -1,14 +1,14 @@ project(feature) -if (ENABLE_FEATURE_GS232CONTROLLER AND Qt5SerialPort_FOUND) +if (ENABLE_FEATURE_GS232CONTROLLER AND Qt${QT_DEFAULT_MAJOR_VERSION}SerialPort_FOUND) add_subdirectory(gs232controller) endif() -if (ENABLE_FEATURE_MAP AND Qt5Quick_FOUND AND Qt5QuickWidgets_FOUND AND Qt5Positioning_FOUND AND Qt5Location_FOUND AND Qt5WebEngine_FOUND) +if (ENABLE_FEATURE_MAP AND Qt${QT_DEFAULT_MAJOR_VERSION}Quick_FOUND AND Qt${QT_DEFAULT_MAJOR_VERSION}QuickWidgets_FOUND AND Qt${QT_DEFAULT_MAJOR_VERSION}Positioning_FOUND AND Qt${QT_DEFAULT_MAJOR_VERSION}Location_FOUND AND Qt${QT_DEFAULT_MAJOR_VERSION}WebEngine_FOUND) add_subdirectory(map) endif() -if (ENABLE_FEATURE_VORLOCALIZER AND Qt5Quick_FOUND AND Qt5QuickWidgets_FOUND AND Qt5Positioning_FOUND) +if (ENABLE_FEATURE_VORLOCALIZER AND Qt${QT_DEFAULT_MAJOR_VERSION}Quick_FOUND AND Qt${QT_DEFAULT_MAJOR_VERSION}QuickWidgets_FOUND AND Qt${QT_DEFAULT_MAJOR_VERSION}Positioning_FOUND) add_subdirectory(vorlocalizer) endif() @@ -45,19 +45,19 @@ if (ENABLE_FEATURE_SIMPLEPTT) endif() if (NOT SERVER_MODE) - if (ENABLE_FEATURE_SATELLITETRACKER AND SGP4_FOUND AND Qt5Positioning_FOUND AND Qt5Charts_FOUND AND Qt5TextToSpeech_FOUND) + if (ENABLE_FEATURE_SATELLITETRACKER AND SGP4_FOUND AND Qt${QT_DEFAULT_MAJOR_VERSION}Positioning_FOUND AND Qt${QT_DEFAULT_MAJOR_VERSION}Charts_FOUND AND Qt${QT_DEFAULT_MAJOR_VERSION}TextToSpeech_FOUND) add_subdirectory(satellitetracker) endif() if (ENABLE_FEATURE_JOGDIALCONTROLLER) add_subdirectory(jogdialcontroller) endif() else() - if (ENABLE_FEATURE_SATELLITETRACKER AND SGP4_FOUND AND Qt5Positioning_FOUND AND Qt5Charts_FOUND) + if (ENABLE_FEATURE_SATELLITETRACKER AND SGP4_FOUND AND Qt${QT_DEFAULT_MAJOR_VERSION}Positioning_FOUND AND Qt${QT_DEFAULT_MAJOR_VERSION}Charts_FOUND) add_subdirectory(satellitetracker) endif() endif() -if (Qt5Charts_FOUND) +if (Qt${QT_DEFAULT_MAJOR_VERSION}Charts_FOUND) if (ENABLE_FEATURE_RADIOSONDE) add_subdirectory(radiosonde) endif() diff --git a/plugins/feature/afc/CMakeLists.txt b/plugins/feature/afc/CMakeLists.txt index b7a6bdfb9..fd64256c2 100644 --- a/plugins/feature/afc/CMakeLists.txt +++ b/plugins/feature/afc/CMakeLists.txt @@ -34,7 +34,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME featureafc) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -49,7 +49,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/feature/ais/CMakeLists.txt b/plugins/feature/ais/CMakeLists.txt index ea46a9386..afdec0c05 100644 --- a/plugins/feature/ais/CMakeLists.txt +++ b/plugins/feature/ais/CMakeLists.txt @@ -31,7 +31,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME featureais) - set(TARGET_LIB Qt5::Widgets) + set(TARGET_LIB Qt::Widgets) set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -46,7 +46,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/feature/ambe/CMakeLists.txt b/plugins/feature/ambe/CMakeLists.txt index e2fb11f72..82704fb2c 100644 --- a/plugins/feature/ambe/CMakeLists.txt +++ b/plugins/feature/ambe/CMakeLists.txt @@ -35,7 +35,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME featureambe) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -50,7 +50,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/feature/antennatools/CMakeLists.txt b/plugins/feature/antennatools/CMakeLists.txt index be0acb2a6..bcbdccd6e 100644 --- a/plugins/feature/antennatools/CMakeLists.txt +++ b/plugins/feature/antennatools/CMakeLists.txt @@ -31,7 +31,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME antennatools) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -46,7 +46,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/feature/aprs/CMakeLists.txt b/plugins/feature/aprs/CMakeLists.txt index c12ada009..0f67590dd 100644 --- a/plugins/feature/aprs/CMakeLists.txt +++ b/plugins/feature/aprs/CMakeLists.txt @@ -37,7 +37,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME aprs) - set(TARGET_LIB "Qt5::Widgets" Qt5::Charts) + set(TARGET_LIB "Qt::Widgets" Qt::Charts) set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -52,7 +52,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/feature/demodanalyzer/CMakeLists.txt b/plugins/feature/demodanalyzer/CMakeLists.txt index 428207ca6..c6998f852 100644 --- a/plugins/feature/demodanalyzer/CMakeLists.txt +++ b/plugins/feature/demodanalyzer/CMakeLists.txt @@ -32,7 +32,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME featuredemodanalyzer) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -47,7 +47,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/feature/gs232controller/CMakeLists.txt b/plugins/feature/gs232controller/CMakeLists.txt index 8b46bae28..ccc58673f 100644 --- a/plugins/feature/gs232controller/CMakeLists.txt +++ b/plugins/feature/gs232controller/CMakeLists.txt @@ -33,7 +33,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME featuregs232controller) - set(TARGET_LIB Qt5::Widgets) + set(TARGET_LIB Qt::Widgets) set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -48,8 +48,8 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core - Qt5::SerialPort + Qt::Core + Qt::SerialPort ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/feature/jogdialcontroller/CMakeLists.txt b/plugins/feature/jogdialcontroller/CMakeLists.txt index 3bfd8c35e..685849487 100644 --- a/plugins/feature/jogdialcontroller/CMakeLists.txt +++ b/plugins/feature/jogdialcontroller/CMakeLists.txt @@ -30,7 +30,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME jogdialcontroller) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -45,7 +45,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/feature/limerfe/CMakeLists.txt b/plugins/feature/limerfe/CMakeLists.txt index 6ed968ef8..4cfc776a6 100644 --- a/plugins/feature/limerfe/CMakeLists.txt +++ b/plugins/feature/limerfe/CMakeLists.txt @@ -33,7 +33,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME featurelimerfe) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -48,7 +48,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/feature/map/CMakeLists.txt b/plugins/feature/map/CMakeLists.txt index fe578a004..8d4e51f92 100644 --- a/plugins/feature/map/CMakeLists.txt +++ b/plugins/feature/map/CMakeLists.txt @@ -24,7 +24,7 @@ set(map_HEADERS include_directories( ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client - ${Qt5Gui_PRIVATE_INCLUDE_DIRS} + ${Qt${QT_DEFAULT_MAJOR_VERSION}Gui_PRIVATE_INCLUDE_DIRS} ) if(NOT SERVER_MODE) @@ -70,7 +70,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME map) - set(TARGET_LIB "Qt5::Widgets" Qt5::Quick Qt5::QuickWidgets Qt5::Positioning Qt5::Location Qt5::WebEngine Qt5::WebEngineCore Qt5::WebEngineWidgets) + set(TARGET_LIB "Qt::Widgets" Qt::Quick Qt::QuickWidgets Qt::Positioning Qt::Location Qt::WebEngine Qt::WebEngineCore Qt::WebEngineWidgets) set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -85,7 +85,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/feature/pertester/CMakeLists.txt b/plugins/feature/pertester/CMakeLists.txt index d2ad7d26f..33c2b0116 100644 --- a/plugins/feature/pertester/CMakeLists.txt +++ b/plugins/feature/pertester/CMakeLists.txt @@ -33,7 +33,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME featurepertester) - set(TARGET_LIB Qt5::Widgets) + set(TARGET_LIB Qt::Widgets) set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -48,7 +48,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/feature/radiosonde/CMakeLists.txt b/plugins/feature/radiosonde/CMakeLists.txt index 3a08fa765..c9d5a22b8 100644 --- a/plugins/feature/radiosonde/CMakeLists.txt +++ b/plugins/feature/radiosonde/CMakeLists.txt @@ -31,7 +31,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME featureradiosonde) - set(TARGET_LIB Qt5::Widgets Qt5::Charts) + set(TARGET_LIB Qt::Widgets Qt::Charts) set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -46,7 +46,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/feature/remotecontrol/CMakeLists.txt b/plugins/feature/remotecontrol/CMakeLists.txt index 079e2844b..12f0fb2cf 100644 --- a/plugins/feature/remotecontrol/CMakeLists.txt +++ b/plugins/feature/remotecontrol/CMakeLists.txt @@ -42,7 +42,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME featureremotecontrol) - set(TARGET_LIB Qt5::Widgets Qt5::Charts) + set(TARGET_LIB Qt::Widgets Qt::Charts) set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -57,7 +57,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/feature/rigctlserver/CMakeLists.txt b/plugins/feature/rigctlserver/CMakeLists.txt index 98579e8c0..25737fa14 100644 --- a/plugins/feature/rigctlserver/CMakeLists.txt +++ b/plugins/feature/rigctlserver/CMakeLists.txt @@ -32,7 +32,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME featurerigctlserver) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -47,7 +47,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/feature/satellitetracker/CMakeLists.txt b/plugins/feature/satellitetracker/CMakeLists.txt index 7e630f403..f6324c8e4 100644 --- a/plugins/feature/satellitetracker/CMakeLists.txt +++ b/plugins/feature/satellitetracker/CMakeLists.txt @@ -48,12 +48,12 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME featuresatellitetracker) - set(TARGET_LIB Qt5::Widgets Qt5::Positioning Qt5::Charts Qt5::TextToSpeech) + set(TARGET_LIB Qt::Widgets Qt::Positioning Qt::Charts Qt::TextToSpeech) set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() set(TARGET_NAME featuresatellitetrackersrv) - set(TARGET_LIB Qt5::Positioning Qt5::Charts) + set(TARGET_LIB Qt::Positioning Qt::Charts) set(TARGET_LIB_GUI "") set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR}) endif() @@ -67,12 +67,17 @@ if(SGP4_EXTERNAL) endif() target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} ${SGP4_LIBRARIES} ) +if (Qt6_FOUND) + target_link_libraries(${TARGET_NAME} + Qt::Core5Compat + ) +endif() install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER}) diff --git a/plugins/feature/simpleptt/CMakeLists.txt b/plugins/feature/simpleptt/CMakeLists.txt index 33bb4781b..ebb651830 100644 --- a/plugins/feature/simpleptt/CMakeLists.txt +++ b/plugins/feature/simpleptt/CMakeLists.txt @@ -34,7 +34,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME featuresimpleptt) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -49,7 +49,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/feature/startracker/CMakeLists.txt b/plugins/feature/startracker/CMakeLists.txt index f79d4b3f1..3d44af827 100644 --- a/plugins/feature/startracker/CMakeLists.txt +++ b/plugins/feature/startracker/CMakeLists.txt @@ -44,7 +44,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME featurestartracker) - set(TARGET_LIB Qt5::Widgets Qt5::Charts) + set(TARGET_LIB Qt::Widgets Qt::Charts) set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -59,7 +59,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/feature/vorlocalizer/CMakeLists.txt b/plugins/feature/vorlocalizer/CMakeLists.txt index aaf5267bd..599c94481 100644 --- a/plugins/feature/vorlocalizer/CMakeLists.txt +++ b/plugins/feature/vorlocalizer/CMakeLists.txt @@ -37,7 +37,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME vorlocalizer) - set(TARGET_LIB "Qt5::Widgets" Qt5::Quick Qt5::QuickWidgets Qt5::Positioning) + set(TARGET_LIB "Qt::Widgets" Qt::Quick Qt::QuickWidgets Qt::Positioning) set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -52,7 +52,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplemimo/bladerf2mimo/CMakeLists.txt b/plugins/samplemimo/bladerf2mimo/CMakeLists.txt index 8720d5f93..5e6a086b3 100644 --- a/plugins/samplemimo/bladerf2mimo/CMakeLists.txt +++ b/plugins/samplemimo/bladerf2mimo/CMakeLists.txt @@ -35,7 +35,7 @@ if (NOT SERVER_MODE) bladerf2mimogui.h ) set(TARGET_NAME mimobladerf2) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -54,7 +54,7 @@ if(LIBBLADERF_EXTERNAL) endif() target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplemimo/limesdrmimo/CMakeLists.txt b/plugins/samplemimo/limesdrmimo/CMakeLists.txt index 78b8310b4..1d73578cc 100644 --- a/plugins/samplemimo/limesdrmimo/CMakeLists.txt +++ b/plugins/samplemimo/limesdrmimo/CMakeLists.txt @@ -35,7 +35,7 @@ if (NOT SERVER_MODE) limesdrmimogui.h ) set(TARGET_NAME mimolimesdr) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -54,7 +54,7 @@ if(LIMESUITE_EXTERNAL) endif() target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplemimo/metismiso/CMakeLists.txt b/plugins/samplemimo/metismiso/CMakeLists.txt index d6df9eb7b..b84fcc9c9 100644 --- a/plugins/samplemimo/metismiso/CMakeLists.txt +++ b/plugins/samplemimo/metismiso/CMakeLists.txt @@ -34,7 +34,7 @@ if (NOT SERVER_MODE) metismisogui.h ) set(TARGET_NAME mimometismiso) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -49,7 +49,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplemimo/plutosdrmimo/CMakeLists.txt b/plugins/samplemimo/plutosdrmimo/CMakeLists.txt index 7280a9564..63e84b199 100644 --- a/plugins/samplemimo/plutosdrmimo/CMakeLists.txt +++ b/plugins/samplemimo/plutosdrmimo/CMakeLists.txt @@ -35,7 +35,7 @@ if (NOT SERVER_MODE) plutosdrmimogui.h ) set(TARGET_NAME mimoplutosdr) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -54,7 +54,7 @@ if(LIBIIO_EXTERNAL) endif() target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplemimo/testmi/CMakeLists.txt b/plugins/samplemimo/testmi/CMakeLists.txt index 76af18619..dddfe84b9 100644 --- a/plugins/samplemimo/testmi/CMakeLists.txt +++ b/plugins/samplemimo/testmi/CMakeLists.txt @@ -31,7 +31,7 @@ if (NOT SERVER_MODE) testsourcegui.h ) set(TARGET_NAME mimotestmi) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -46,7 +46,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplemimo/testmosync/CMakeLists.txt b/plugins/samplemimo/testmosync/CMakeLists.txt index 3673019ed..45b9e16ab 100644 --- a/plugins/samplemimo/testmosync/CMakeLists.txt +++ b/plugins/samplemimo/testmosync/CMakeLists.txt @@ -30,7 +30,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME outputtestmosync) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -45,7 +45,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplemimo/xtrxmimo/CMakeLists.txt b/plugins/samplemimo/xtrxmimo/CMakeLists.txt index e6cb291be..05a849b14 100644 --- a/plugins/samplemimo/xtrxmimo/CMakeLists.txt +++ b/plugins/samplemimo/xtrxmimo/CMakeLists.txt @@ -35,7 +35,7 @@ if (NOT SERVER_MODE) xtrxmimogui.h ) set(TARGET_NAME mimoxtrx) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -50,7 +50,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesink/audiooutput/CMakeLists.txt b/plugins/samplesink/audiooutput/CMakeLists.txt index 47a49fc2e..a11ca707d 100644 --- a/plugins/samplesink/audiooutput/CMakeLists.txt +++ b/plugins/samplesink/audiooutput/CMakeLists.txt @@ -32,7 +32,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME outputaudio) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -47,7 +47,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesink/bladerf1output/CMakeLists.txt b/plugins/samplesink/bladerf1output/CMakeLists.txt index 865c0fff0..22a71583a 100644 --- a/plugins/samplesink/bladerf1output/CMakeLists.txt +++ b/plugins/samplesink/bladerf1output/CMakeLists.txt @@ -35,7 +35,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME outputbladerf1) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -54,7 +54,7 @@ if(LIBBLADERF_EXTERNAL) endif() target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesink/bladerf2output/CMakeLists.txt b/plugins/samplesink/bladerf2output/CMakeLists.txt index 9920906d8..39fc937eb 100644 --- a/plugins/samplesink/bladerf2output/CMakeLists.txt +++ b/plugins/samplesink/bladerf2output/CMakeLists.txt @@ -35,7 +35,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME outputbladerf2) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -54,7 +54,7 @@ if(LIBBLADERF_EXTERNAL) endif() target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesink/fileoutput/CMakeLists.txt b/plugins/samplesink/fileoutput/CMakeLists.txt index 39363e49f..030d2b2f0 100644 --- a/plugins/samplesink/fileoutput/CMakeLists.txt +++ b/plugins/samplesink/fileoutput/CMakeLists.txt @@ -32,7 +32,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME outputfileoutput) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -47,7 +47,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesink/hackrfoutput/CMakeLists.txt b/plugins/samplesink/hackrfoutput/CMakeLists.txt index 5c8f57ea4..000be2a97 100644 --- a/plugins/samplesink/hackrfoutput/CMakeLists.txt +++ b/plugins/samplesink/hackrfoutput/CMakeLists.txt @@ -35,7 +35,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME outputhackrf) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -50,7 +50,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesink/limesdroutput/CMakeLists.txt b/plugins/samplesink/limesdroutput/CMakeLists.txt index b28e23b72..321b704ea 100644 --- a/plugins/samplesink/limesdroutput/CMakeLists.txt +++ b/plugins/samplesink/limesdroutput/CMakeLists.txt @@ -35,7 +35,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME outputlimesdr) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -54,7 +54,7 @@ if(LIMESUITE_EXTERNAL) endif() target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesink/localoutput/CMakeLists.txt b/plugins/samplesink/localoutput/CMakeLists.txt index 25395343c..3d16f2f3d 100644 --- a/plugins/samplesink/localoutput/CMakeLists.txt +++ b/plugins/samplesink/localoutput/CMakeLists.txt @@ -31,7 +31,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME outputlocal) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -46,7 +46,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesink/plutosdroutput/CMakeLists.txt b/plugins/samplesink/plutosdroutput/CMakeLists.txt index 8966721ef..4e0e26389 100644 --- a/plugins/samplesink/plutosdroutput/CMakeLists.txt +++ b/plugins/samplesink/plutosdroutput/CMakeLists.txt @@ -35,7 +35,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME outputplutosdr) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -54,7 +54,7 @@ if(LIBIIO_EXTERNAL) endif() target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesink/remoteoutput/CMakeLists.txt b/plugins/samplesink/remoteoutput/CMakeLists.txt index f4163cc05..778a1b5f0 100644 --- a/plugins/samplesink/remoteoutput/CMakeLists.txt +++ b/plugins/samplesink/remoteoutput/CMakeLists.txt @@ -40,7 +40,7 @@ if(NOT SERVER_MODE) remoteoutputgui.h ) set(TARGET_NAME outputremote) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -59,7 +59,7 @@ if(CM256CC_EXTERNAL) endif() target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesink/soapysdroutput/CMakeLists.txt b/plugins/samplesink/soapysdroutput/CMakeLists.txt index 2967aebd8..0fa5833b9 100644 --- a/plugins/samplesink/soapysdroutput/CMakeLists.txt +++ b/plugins/samplesink/soapysdroutput/CMakeLists.txt @@ -35,7 +35,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME outputsoapysdr) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -50,7 +50,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesink/testsink/CMakeLists.txt b/plugins/samplesink/testsink/CMakeLists.txt index 0bc6c0888..d2637127c 100644 --- a/plugins/samplesink/testsink/CMakeLists.txt +++ b/plugins/samplesink/testsink/CMakeLists.txt @@ -30,7 +30,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME outputtestsink) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -45,7 +45,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesink/usrpoutput/CMakeLists.txt b/plugins/samplesink/usrpoutput/CMakeLists.txt index ee4858e6d..d679c5c06 100644 --- a/plugins/samplesink/usrpoutput/CMakeLists.txt +++ b/plugins/samplesink/usrpoutput/CMakeLists.txt @@ -35,7 +35,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME outputusrp) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -54,7 +54,7 @@ if(UHD_EXTERNAL) endif() target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesink/xtrxoutput/CMakeLists.txt b/plugins/samplesink/xtrxoutput/CMakeLists.txt index 8e91847f1..f25f7bfb8 100644 --- a/plugins/samplesink/xtrxoutput/CMakeLists.txt +++ b/plugins/samplesink/xtrxoutput/CMakeLists.txt @@ -34,7 +34,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME outputxtrx) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -49,7 +49,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesource/airspy/CMakeLists.txt b/plugins/samplesource/airspy/CMakeLists.txt index b63ebbe49..24acb5bcd 100644 --- a/plugins/samplesource/airspy/CMakeLists.txt +++ b/plugins/samplesource/airspy/CMakeLists.txt @@ -33,7 +33,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME inputairspy) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -52,7 +52,7 @@ if(LIBAIRSPY_EXTERNAL AND NOT LINUX) endif() target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesource/airspyhf/CMakeLists.txt b/plugins/samplesource/airspyhf/CMakeLists.txt index 13ea9d904..c056e217e 100644 --- a/plugins/samplesource/airspyhf/CMakeLists.txt +++ b/plugins/samplesource/airspyhf/CMakeLists.txt @@ -34,7 +34,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME inputairspyhf) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -53,7 +53,7 @@ if(LIBAIRSPYHF_EXTERNAL) endif() target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesource/audioinput/CMakeLists.txt b/plugins/samplesource/audioinput/CMakeLists.txt index 6931ad621..d1c754f1b 100644 --- a/plugins/samplesource/audioinput/CMakeLists.txt +++ b/plugins/samplesource/audioinput/CMakeLists.txt @@ -32,7 +32,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME inputaudio) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -47,7 +47,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesource/bladerf1input/CMakeLists.txt b/plugins/samplesource/bladerf1input/CMakeLists.txt index 26a220dfd..0c41e1944 100644 --- a/plugins/samplesource/bladerf1input/CMakeLists.txt +++ b/plugins/samplesource/bladerf1input/CMakeLists.txt @@ -34,7 +34,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME inputbladerf1) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -53,7 +53,7 @@ if(LIBBLADERF_EXTERNAL) endif() target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesource/bladerf2input/CMakeLists.txt b/plugins/samplesource/bladerf2input/CMakeLists.txt index ff00ba567..4827ac76b 100644 --- a/plugins/samplesource/bladerf2input/CMakeLists.txt +++ b/plugins/samplesource/bladerf2input/CMakeLists.txt @@ -35,7 +35,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME inputbladerf2) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -54,7 +54,7 @@ if(LIBBLADERF_EXTERNAL) endif() target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesource/fcdpro/CMakeLists.txt b/plugins/samplesource/fcdpro/CMakeLists.txt index 8c59e5ab1..4b65abe0d 100644 --- a/plugins/samplesource/fcdpro/CMakeLists.txt +++ b/plugins/samplesource/fcdpro/CMakeLists.txt @@ -35,7 +35,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME inputfcdpro) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -51,7 +51,7 @@ add_library(${TARGET_NAME} SHARED target_link_libraries(${TARGET_NAME} ${HIDAPI_LIBRARIES} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesource/fcdproplus/CMakeLists.txt b/plugins/samplesource/fcdproplus/CMakeLists.txt index 90fc9ba0f..83bd24f8a 100644 --- a/plugins/samplesource/fcdproplus/CMakeLists.txt +++ b/plugins/samplesource/fcdproplus/CMakeLists.txt @@ -35,7 +35,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME inputfcdproplus) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -51,7 +51,7 @@ add_library(${TARGET_NAME} SHARED target_link_libraries(${TARGET_NAME} ${HIDAPI_LIBRARIES} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesource/fileinput/CMakeLists.txt b/plugins/samplesource/fileinput/CMakeLists.txt index 1476dcb56..5042b499a 100644 --- a/plugins/samplesource/fileinput/CMakeLists.txt +++ b/plugins/samplesource/fileinput/CMakeLists.txt @@ -31,7 +31,7 @@ if(NOT SERVER_MODE) fileinputgui.h ) set(TARGET_NAME inputfileinput) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -46,7 +46,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesource/hackrfinput/CMakeLists.txt b/plugins/samplesource/hackrfinput/CMakeLists.txt index 8b87d76af..e17a3710d 100644 --- a/plugins/samplesource/hackrfinput/CMakeLists.txt +++ b/plugins/samplesource/hackrfinput/CMakeLists.txt @@ -35,7 +35,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME inputhackrf) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -50,7 +50,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesource/kiwisdr/CMakeLists.txt b/plugins/samplesource/kiwisdr/CMakeLists.txt index 1a9f7ac6a..f6714b79e 100644 --- a/plugins/samplesource/kiwisdr/CMakeLists.txt +++ b/plugins/samplesource/kiwisdr/CMakeLists.txt @@ -33,7 +33,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME inputkiwisdr) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -48,8 +48,8 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core - Qt5::WebSockets + Qt::Core + Qt::WebSockets ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesource/limesdrinput/CMakeLists.txt b/plugins/samplesource/limesdrinput/CMakeLists.txt index c16d75ebe..fcc50b4af 100644 --- a/plugins/samplesource/limesdrinput/CMakeLists.txt +++ b/plugins/samplesource/limesdrinput/CMakeLists.txt @@ -35,7 +35,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME inputlimesdr) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -54,7 +54,7 @@ if(LIMESUITE_EXTERNAL) endif() target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesource/localinput/CMakeLists.txt b/plugins/samplesource/localinput/CMakeLists.txt index ad1271876..a7bd05457 100644 --- a/plugins/samplesource/localinput/CMakeLists.txt +++ b/plugins/samplesource/localinput/CMakeLists.txt @@ -32,7 +32,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME inputlocal) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -47,7 +47,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesource/perseus/CMakeLists.txt b/plugins/samplesource/perseus/CMakeLists.txt index 5a96dad00..d20662f0a 100644 --- a/plugins/samplesource/perseus/CMakeLists.txt +++ b/plugins/samplesource/perseus/CMakeLists.txt @@ -36,7 +36,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME inputperseus) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -55,7 +55,7 @@ if(LIBPERSEUS_EXTERNAL) endif() target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesource/plutosdrinput/CMakeLists.txt b/plugins/samplesource/plutosdrinput/CMakeLists.txt index a7b6a7338..98ed3045b 100644 --- a/plugins/samplesource/plutosdrinput/CMakeLists.txt +++ b/plugins/samplesource/plutosdrinput/CMakeLists.txt @@ -35,7 +35,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME inputplutosdr) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -54,7 +54,7 @@ if(LIBIIO_EXTERNAL) endif() target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesource/remoteinput/CMakeLists.txt b/plugins/samplesource/remoteinput/CMakeLists.txt index d4d1ec32d..b6f50261c 100644 --- a/plugins/samplesource/remoteinput/CMakeLists.txt +++ b/plugins/samplesource/remoteinput/CMakeLists.txt @@ -36,7 +36,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME inputremote) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -55,7 +55,7 @@ if(CM256CC_EXTERNAL) endif() target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesource/remotetcpinput/CMakeLists.txt b/plugins/samplesource/remotetcpinput/CMakeLists.txt index 74e3bdb70..39bd1d6f6 100644 --- a/plugins/samplesource/remotetcpinput/CMakeLists.txt +++ b/plugins/samplesource/remotetcpinput/CMakeLists.txt @@ -32,7 +32,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME inputtcpremote) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -47,7 +47,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesource/rtlsdr/CMakeLists.txt b/plugins/samplesource/rtlsdr/CMakeLists.txt index 1c441083d..1d25aadce 100644 --- a/plugins/samplesource/rtlsdr/CMakeLists.txt +++ b/plugins/samplesource/rtlsdr/CMakeLists.txt @@ -33,7 +33,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME inputrtlsdr) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -48,7 +48,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesource/sdrplay/CMakeLists.txt b/plugins/samplesource/sdrplay/CMakeLists.txt index 09ca4778b..203d42d71 100644 --- a/plugins/samplesource/sdrplay/CMakeLists.txt +++ b/plugins/samplesource/sdrplay/CMakeLists.txt @@ -34,7 +34,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME inputsdrplay) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -53,7 +53,7 @@ if(LIBMIRISDR_EXTERNAL) endif(LIBMIRISDR_EXTERNAL) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesource/sdrplayv3/CMakeLists.txt b/plugins/samplesource/sdrplayv3/CMakeLists.txt index acf2822bb..15a095921 100644 --- a/plugins/samplesource/sdrplayv3/CMakeLists.txt +++ b/plugins/samplesource/sdrplayv3/CMakeLists.txt @@ -33,7 +33,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME inputsdrplayv3) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -48,7 +48,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesource/sigmffileinput/CMakeLists.txt b/plugins/samplesource/sigmffileinput/CMakeLists.txt index 5c4f8a2e2..efab2460b 100644 --- a/plugins/samplesource/sigmffileinput/CMakeLists.txt +++ b/plugins/samplesource/sigmffileinput/CMakeLists.txt @@ -35,7 +35,7 @@ if(NOT SERVER_MODE) recordinfodialog.h ) set(TARGET_NAME inputsigmffileinput) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -50,7 +50,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesource/soapysdrinput/CMakeLists.txt b/plugins/samplesource/soapysdrinput/CMakeLists.txt index bbff360eb..1bd2abe92 100644 --- a/plugins/samplesource/soapysdrinput/CMakeLists.txt +++ b/plugins/samplesource/soapysdrinput/CMakeLists.txt @@ -35,7 +35,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME inputsoapysdr) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -50,7 +50,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesource/testsource/CMakeLists.txt b/plugins/samplesource/testsource/CMakeLists.txt index c3d6b4184..a82fb4562 100644 --- a/plugins/samplesource/testsource/CMakeLists.txt +++ b/plugins/samplesource/testsource/CMakeLists.txt @@ -33,7 +33,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME inputtestsource) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -48,7 +48,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesource/usrpinput/CMakeLists.txt b/plugins/samplesource/usrpinput/CMakeLists.txt index 09d14648f..4a5868b41 100644 --- a/plugins/samplesource/usrpinput/CMakeLists.txt +++ b/plugins/samplesource/usrpinput/CMakeLists.txt @@ -35,7 +35,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME inputusrp) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -54,7 +54,7 @@ if(UHD_EXTERNAL) endif() target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/plugins/samplesource/xtrxinput/CMakeLists.txt b/plugins/samplesource/xtrxinput/CMakeLists.txt index 97a49c3ad..93019d83b 100644 --- a/plugins/samplesource/xtrxinput/CMakeLists.txt +++ b/plugins/samplesource/xtrxinput/CMakeLists.txt @@ -35,7 +35,7 @@ if(NOT SERVER_MODE) ) set(TARGET_NAME inputxtrx) - set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB "Qt::Widgets") set(TARGET_LIB_GUI "sdrgui") set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) else() @@ -50,7 +50,7 @@ add_library(${TARGET_NAME} SHARED ) target_link_libraries(${TARGET_NAME} - Qt5::Core + Qt::Core ${TARGET_LIB} sdrbase ${TARGET_LIB_GUI} diff --git a/qrtplib/CMakeLists.txt b/qrtplib/CMakeLists.txt index 0c75ee075..97d44826a 100644 --- a/qrtplib/CMakeLists.txt +++ b/qrtplib/CMakeLists.txt @@ -81,8 +81,8 @@ add_library(qrtplib SHARED ) target_link_libraries(qrtplib - Qt5::Core - Qt5::Network + Qt::Core + Qt::Network ) install(TARGETS qrtplib DESTINATION ${INSTALL_LIB_DIR}) diff --git a/sdrbase/CMakeLists.txt b/sdrbase/CMakeLists.txt index bb6f5f21b..d1bcb297e 100644 --- a/sdrbase/CMakeLists.txt +++ b/sdrbase/CMakeLists.txt @@ -55,6 +55,7 @@ set(sdrbase_SOURCES audio/audiocompressor.cpp audio/audiocompressorsnd.cpp + audio/audiodeviceinfo.cpp audio/audiodevicemanager.cpp audio/audiofifo.cpp audio/audiofilter.cpp @@ -237,6 +238,7 @@ set(sdrbase_HEADERS audio/audiocompressor.h audio/audiocompressorsnd.h + audio/audiodeviceinfo.h audio/audiodevicemanager.h audio/audiofifo.h audio/audiofilter.h @@ -486,17 +488,28 @@ target_link_libraries(sdrbase ${sdrbase_SERIALDV_LIB} ${sdrbase_LIMERFE_LIB} ${sdrbase_LIBSIGMF_LIB} - Qt5::Core - Qt5::Multimedia - Qt5::WebSockets + Qt::Core + Qt::Multimedia + Qt::WebSockets httpserver logging qrtplib swagger ) +if (Qt6_FOUND) + target_link_libraries(sdrbase + Qt::Core5Compat + ) +endif() install(TARGETS sdrbase DESTINATION ${INSTALL_LIB_DIR}) +if(WIN32 AND Qt6_FOUND) + # Run deployqt for Core5Compat + include(DeployQt) + windeployqt(sdrbase ${SDRANGEL_BINARY_BIN_DIR} "") +endif() + # Install debug symbols if (WIN32) install(FILES $ CONFIGURATIONS Debug RelWithDebInfo DESTINATION ${INSTALL_LIB_DIR} ) diff --git a/sdrbench/CMakeLists.txt b/sdrbench/CMakeLists.txt index ffc9c9258..eded1a2c2 100644 --- a/sdrbench/CMakeLists.txt +++ b/sdrbench/CMakeLists.txt @@ -22,8 +22,8 @@ include_directories( ) target_link_libraries(sdrbench - Qt5::Core - Qt5::Gui + Qt::Core + Qt::Gui sdrbase logging ) diff --git a/sdrgui/CMakeLists.txt b/sdrgui/CMakeLists.txt index 70442beb8..f72f87701 100644 --- a/sdrgui/CMakeLists.txt +++ b/sdrgui/CMakeLists.txt @@ -168,6 +168,7 @@ set(sdrgui_HEADERS gui/physicalunit.h gui/pluginsdialog.h gui/presetitem.h + gui/qtcompatibility.h gui/rollupcontents.h gui/rollupwidget.h gui/samplingdevicedialog.h @@ -259,7 +260,7 @@ set(sdrgui_FORMS soapygui/arginfogui.ui ) -qt5_wrap_ui(sdrgui_FORMS_HEADERS ${sdrgui_FORMS}) +qt_wrap_ui(sdrgui_FORMS_HEADERS ${sdrgui_FORMS}) include_directories( ${CMAKE_SOURCE_DIR}/exports @@ -277,18 +278,29 @@ add_library(sdrgui SHARED ) target_link_libraries(sdrgui - Qt5::Core - Qt5::Widgets - Qt5::OpenGL - Qt5::Multimedia + Qt::Core + Qt::Widgets + Qt::OpenGL + Qt::Multimedia ${OPENGL_LIBRARIES} ${sdrgui_LIMERFE_LIB} sdrbase logging ) +if (Qt6_FOUND) + target_link_libraries(sdrbase + Qt::OpenGLWidgets + ) +endif() install(TARGETS sdrgui DESTINATION ${INSTALL_LIB_DIR}) +if(WIN32 AND Qt6_FOUND) + # Run deployqt for OpenGLWidgets + include(DeployQt) + windeployqt(sdrgui ${SDRANGEL_BINARY_BIN_DIR} "") +endif() + # Install debug symbols if (WIN32) install(FILES $ CONFIGURATIONS Debug RelWithDebInfo DESTINATION ${INSTALL_LIB_DIR} ) diff --git a/sdrsrv/CMakeLists.txt b/sdrsrv/CMakeLists.txt index 6d196cac4..6eb6ec485 100644 --- a/sdrsrv/CMakeLists.txt +++ b/sdrsrv/CMakeLists.txt @@ -27,8 +27,8 @@ add_library(sdrsrv SHARED ) target_link_libraries(sdrsrv - Qt5::Core - Qt5::Multimedia + Qt::Core + Qt::Multimedia sdrbase logging ) diff --git a/swagger/CMakeLists.txt b/swagger/CMakeLists.txt index c40c0993a..ef643ed01 100644 --- a/swagger/CMakeLists.txt +++ b/swagger/CMakeLists.txt @@ -22,8 +22,8 @@ if (NOT MSVC) endif() target_link_libraries(swagger - Qt5::Core - Qt5::Network + Qt::Core + Qt::Network ) install(TARGETS swagger DESTINATION ${INSTALL_LIB_DIR})