From 1eb8716a9f70ed0253bb65dafae55025649be8af Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 13 Jun 2018 00:20:51 +0200 Subject: [PATCH] Fixes for Arch. Manual merge of pull request #183. DATV demod: fixed some of ffmpeg deprecation warnings --- CMakeLists.txt | 8 +- app/main.cpp | 2 +- appbench/main.cpp | 2 +- appsrv/main.cpp | 2 +- httpserver/CMakeLists.txt | 2 +- logging/CMakeLists.txt | 2 +- plugins/channelrx/chanalyzer/CMakeLists.txt | 2 +- plugins/channelrx/demodam/CMakeLists.txt | 4 +- plugins/channelrx/demodatv/CMakeLists.txt | 2 +- plugins/channelrx/demodbfm/CMakeLists.txt | 2 +- plugins/channelrx/demoddatv/CMakeLists.txt | 3 +- .../channelrx/demoddatv/datvdemodplugin.cpp | 2 +- .../channelrx/demoddatv/datvideorender.cpp | 37 ++++++- plugins/channelrx/demoddatv/datvideorender.h | 2 + plugins/channelrx/demoddsd/CMakeLists.txt | 2 +- plugins/channelrx/demodlora/CMakeLists.txt | 2 +- plugins/channelrx/demodnfm/CMakeLists.txt | 2 +- plugins/channelrx/demodssb/CMakeLists.txt | 2 +- plugins/channelrx/demodwfm/CMakeLists.txt | 4 +- plugins/channelrx/udpsrc/CMakeLists.txt | 2 +- plugins/channeltx/modam/CMakeLists.txt | 101 +++++++++--------- plugins/channeltx/modatv/CMakeLists.txt | 4 +- plugins/channeltx/modnfm/CMakeLists.txt | 4 +- plugins/channeltx/modssb/CMakeLists.txt | 6 +- plugins/channeltx/modwfm/CMakeLists.txt | 4 +- plugins/channeltx/udpsink/CMakeLists.txt | 2 +- .../samplesink/bladerfoutput/CMakeLists.txt | 2 +- plugins/samplesink/filesink/CMakeLists.txt | 2 +- .../samplesink/hackrfoutput/CMakeLists.txt | 2 +- .../samplesink/limesdroutput/CMakeLists.txt | 2 +- .../samplesink/sdrdaemonsink/CMakeLists.txt | 2 +- plugins/samplesource/airspy/CMakeLists.txt | 2 +- .../samplesource/bladerfinput/CMakeLists.txt | 2 +- plugins/samplesource/fcdpro/CMakeLists.txt | 4 +- .../samplesource/fcdproplus/CMakeLists.txt | 2 +- .../samplesource/filesource/CMakeLists.txt | 2 +- .../samplesource/hackrfinput/CMakeLists.txt | 2 +- .../samplesource/limesdrinput/CMakeLists.txt | 2 +- plugins/samplesource/rtlsdr/CMakeLists.txt | 2 +- .../sdrdaemonsource/CMakeLists.txt | 2 +- plugins/samplesource/sdrplay/CMakeLists.txt | 2 +- .../samplesource/testsource/CMakeLists.txt | 2 +- pluginssrv/channelrx/demodam/CMakeLists.txt | 2 +- pluginssrv/channelrx/demodbfm/CMakeLists.txt | 2 +- pluginssrv/channelrx/demoddsd/CMakeLists.txt | 2 +- pluginssrv/channelrx/demodnfm/CMakeLists.txt | 2 +- pluginssrv/channelrx/demodssb/CMakeLists.txt | 2 +- pluginssrv/channelrx/demodwfm/CMakeLists.txt | 2 +- pluginssrv/channelrx/udpsrc/CMakeLists.txt | 2 +- pluginssrv/channeltx/modam/CMakeLists.txt | 2 +- pluginssrv/channeltx/modatv/CMakeLists.txt | 2 +- pluginssrv/channeltx/modnfm/CMakeLists.txt | 2 +- pluginssrv/channeltx/modssb/CMakeLists.txt | 2 +- pluginssrv/channeltx/modwfm/CMakeLists.txt | 2 +- pluginssrv/channeltx/udpsink/CMakeLists.txt | 2 +- .../samplesink/bladerfoutput/CMakeLists.txt | 2 +- pluginssrv/samplesink/filesink/CMakeLists.txt | 2 +- .../samplesink/hackrfoutput/CMakeLists.txt | 2 +- .../samplesink/limesdroutput/CMakeLists.txt | 2 +- .../samplesink/sdrdaemonsink/CMakeLists.txt | 2 +- pluginssrv/samplesource/airspy/CMakeLists.txt | 2 +- .../samplesource/bladerfinput/CMakeLists.txt | 2 +- pluginssrv/samplesource/fcdpro/CMakeLists.txt | 2 +- .../samplesource/fcdproplus/CMakeLists.txt | 2 +- .../samplesource/filesource/CMakeLists.txt | 2 +- .../samplesource/hackrfinput/CMakeLists.txt | 2 +- .../samplesource/limesdrinput/CMakeLists.txt | 2 +- pluginssrv/samplesource/rtlsdr/CMakeLists.txt | 2 +- .../sdrdaemonsource/CMakeLists.txt | 2 +- .../samplesource/sdrplay/CMakeLists.txt | 2 +- .../samplesource/testsource/CMakeLists.txt | 2 +- qrtplib/CMakeLists.txt | 2 +- sdrbase/CMakeLists.txt | 2 +- sdrbench/CMakeLists.txt | 2 +- sdrgui/CMakeLists.txt | 2 +- sdrsrv/CMakeLists.txt | 2 +- swagger/CMakeLists.txt | 2 +- 77 files changed, 173 insertions(+), 138 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e800c432e..133ef301d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,7 @@ set(CMAKE_AUTOMOC ON) find_package(Qt5Core 5.0 REQUIRED) find_package(Qt5Widgets 5.0 REQUIRED) find_package(Qt5Multimedia 5.0 REQUIRED) -#find_package(QT5OpenGL 5.0 REQUIRED) +find_package(Qt5OpenGL 5.0 REQUIRED) find_package(OpenGL REQUIRED) find_package(PkgConfig) find_package(Boost REQUIRED) @@ -276,7 +276,7 @@ if(WIN32) set_target_properties(sdrangel PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:windows /ENTRY:mainCRTStartup") endif(WIN32) -qt5_use_modules(sdrangel Widgets Multimedia) +target_link_libraries(sdrangel Qt5::Widgets Qt5::Multimedia) ############################################################################## # main server application @@ -300,7 +300,7 @@ target_link_libraries(sdrangelsrv ${QT_LIBRARIES} ) -qt5_use_modules(sdrangelsrv Multimedia) +target_link_libraries(sdrangelsrv Qt5::Multimedia) ############################################################################## # main benchmark application @@ -324,7 +324,7 @@ target_link_libraries(sdrangelbench ) target_compile_features(sdrangelbench PRIVATE cxx_generalized_initializers) # cmake >= 3.1.0 -qt5_use_modules(sdrangelbench Multimedia) +target_link_libraries(sdrangelbench Qt5::Multimedia) ############################################################################## diff --git a/app/main.cpp b/app/main.cpp index 7a414c771..f03f084de 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -35,7 +35,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo */ QCoreApplication::setOrganizationName("f4exb"); QCoreApplication::setApplicationName("SDRangel"); - QCoreApplication::setApplicationVersion("4.0.0"); + QCoreApplication::setApplicationVersion("4.0.1"); #if 1 qApp->setStyle(QStyleFactory::create("fusion")); diff --git a/appbench/main.cpp b/appbench/main.cpp index 97b7a8f41..004d2192c 100644 --- a/appbench/main.cpp +++ b/appbench/main.cpp @@ -57,7 +57,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo QCoreApplication::setOrganizationName("f4exb"); QCoreApplication::setApplicationName("SDRangelBench"); - QCoreApplication::setApplicationVersion("4.0.0"); + QCoreApplication::setApplicationVersion("4.0.1"); int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP}; std::vector vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int)); diff --git a/appsrv/main.cpp b/appsrv/main.cpp index b3e3b1cde..120aa16d9 100644 --- a/appsrv/main.cpp +++ b/appsrv/main.cpp @@ -56,7 +56,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo QCoreApplication::setOrganizationName("f4exb"); QCoreApplication::setApplicationName("SDRangelSrv"); - QCoreApplication::setApplicationVersion("4.0.0"); + QCoreApplication::setApplicationVersion("4.0.1"); int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP}; std::vector vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int)); diff --git a/httpserver/CMakeLists.txt b/httpserver/CMakeLists.txt index 72721e406..1b8341028 100644 --- a/httpserver/CMakeLists.txt +++ b/httpserver/CMakeLists.txt @@ -50,6 +50,6 @@ target_link_libraries(httpserver ${QT_LIBRARIES} ) -qt5_use_modules(httpserver Core Network) +target_link_libraries(httpserver Qt5::Core Qt5::Network) install(TARGETS httpserver DESTINATION lib) diff --git a/logging/CMakeLists.txt b/logging/CMakeLists.txt index b26835edb..5208d4326 100644 --- a/logging/CMakeLists.txt +++ b/logging/CMakeLists.txt @@ -36,6 +36,6 @@ target_link_libraries(logging ${QT_LIBRARIES} ) -qt5_use_modules(logging Core Network) +target_link_libraries(logging Qt5::Core Qt5::Network) install(TARGETS logging DESTINATION lib) diff --git a/plugins/channelrx/chanalyzer/CMakeLists.txt b/plugins/channelrx/chanalyzer/CMakeLists.txt index b749209a4..a33c29a51 100644 --- a/plugins/channelrx/chanalyzer/CMakeLists.txt +++ b/plugins/channelrx/chanalyzer/CMakeLists.txt @@ -43,6 +43,6 @@ target_link_libraries(chanalyzer sdrgui ) -qt5_use_modules(chanalyzer Core Widgets ) +target_link_libraries(chanalyzer Qt5::Core Qt5::Widgets) install(TARGETS chanalyzer DESTINATION lib/plugins/channelrx) diff --git a/plugins/channelrx/demodam/CMakeLists.txt b/plugins/channelrx/demodam/CMakeLists.txt index adbc2d1e4..602e4a140 100644 --- a/plugins/channelrx/demodam/CMakeLists.txt +++ b/plugins/channelrx/demodam/CMakeLists.txt @@ -49,6 +49,6 @@ target_link_libraries(demodam sdrgui ) -qt5_use_modules(demodam Core Widgets) +target_link_libraries(demodam Qt5::Core Qt5::Widgets) -install(TARGETS demodam DESTINATION lib/plugins/channelrx) \ No newline at end of file +install(TARGETS demodam DESTINATION lib/plugins/channelrx) diff --git a/plugins/channelrx/demodatv/CMakeLists.txt b/plugins/channelrx/demodatv/CMakeLists.txt index 5683fbbad..7665ee799 100644 --- a/plugins/channelrx/demodatv/CMakeLists.txt +++ b/plugins/channelrx/demodatv/CMakeLists.txt @@ -43,6 +43,6 @@ target_link_libraries(demodatv sdrgui ) -qt5_use_modules(demodatv Core Widgets) +target_link_libraries(demodatv Qt5::Core Qt5::Widgets) install(TARGETS demodatv DESTINATION lib/plugins/channelrx) diff --git a/plugins/channelrx/demodbfm/CMakeLists.txt b/plugins/channelrx/demodbfm/CMakeLists.txt index a80c86d56..71721706c 100644 --- a/plugins/channelrx/demodbfm/CMakeLists.txt +++ b/plugins/channelrx/demodbfm/CMakeLists.txt @@ -57,6 +57,6 @@ target_link_libraries(demodbfm sdrgui ) -qt5_use_modules(demodbfm Core Widgets) +target_link_libraries(demodbfm Qt5::Core Qt5::Widgets) install(TARGETS demodbfm DESTINATION lib/plugins/channelrx) diff --git a/plugins/channelrx/demoddatv/CMakeLists.txt b/plugins/channelrx/demoddatv/CMakeLists.txt index bf41c23f0..a4bfb1b0e 100644 --- a/plugins/channelrx/demoddatv/CMakeLists.txt +++ b/plugins/channelrx/demoddatv/CMakeLists.txt @@ -53,6 +53,7 @@ target_link_libraries(demoddatv ${SWSCALE_LIBRARIES} ) -qt5_use_modules(demoddatv Core Widgets Multimedia MultimediaWidgets) +find_package(Qt5MultimediaWidgets 5.0 REQUIRED) +target_link_libraries(demoddatv Qt5::Core Qt5::Widgets Qt5::Multimedia Qt5::MultimediaWidgets) install(TARGETS demoddatv DESTINATION lib/plugins/channelrx) diff --git a/plugins/channelrx/demoddatv/datvdemodplugin.cpp b/plugins/channelrx/demoddatv/datvdemodplugin.cpp index 2ac38cf0d..346a898ff 100644 --- a/plugins/channelrx/demoddatv/datvdemodplugin.cpp +++ b/plugins/channelrx/demoddatv/datvdemodplugin.cpp @@ -27,7 +27,7 @@ const PluginDescriptor DATVDemodPlugin::m_ptrPluginDescriptor = { QString("DATV Demodulator"), - QString("3.14.5"), + QString("4.0.1"), QString("(c) F4HKW for SDRAngel using LeanSDR framework (c) F4DAV"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/channelrx/demoddatv/datvideorender.cpp b/plugins/channelrx/demoddatv/datvideorender.cpp index 32aa01f9e..15924f548 100644 --- a/plugins/channelrx/demoddatv/datvideorender.cpp +++ b/plugins/channelrx/demoddatv/datvideorender.cpp @@ -180,6 +180,10 @@ bool DATVideoRender::PreprocessStream() //Prepare Codec and extract meta data + // FIXME: codec is depreecated but replacement fails +// AVCodecParameters *parms = m_objFormatCtx->streams[m_intVideoStreamIndex]->codecpar; +// m_objDecoderCtx = new AVCodecContext(); +// avcodec_parameters_to_context(m_objDecoderCtx, parms); m_objDecoderCtx = m_objFormatCtx->streams[m_intVideoStreamIndex]->codec; //Meta Data @@ -341,7 +345,7 @@ bool DATVideoRender::OpenStream(DATVideostream *objDevice) return false; } - ptrIOBuffer = (unsigned char *)av_malloc(intIOBufferSize+ FF_INPUT_BUFFER_PADDING_SIZE); + ptrIOBuffer = (unsigned char *)av_malloc(intIOBufferSize+ AV_INPUT_BUFFER_PADDING_SIZE); objIOCtx = avio_alloc_context( ptrIOBuffer, intIOBufferSize, @@ -416,7 +420,7 @@ bool DATVideoRender::RenderStream() intGotFrame=0; - if(avcodec_decode_video2( m_objDecoderCtx, m_objFrame, &intGotFrame, &objPacket)<0) + if(new_decode( m_objDecoderCtx, m_objFrame, &intGotFrame, &objPacket)<0) { qDebug() << "DATVideoProcess::RenderStream decoding packet error"; @@ -520,7 +524,7 @@ bool DATVideoRender::RenderStream() } - av_free_packet(&objPacket); + av_packet_unref(&objPacket); //********** Rendering ********** @@ -597,3 +601,30 @@ bool DATVideoRender::CloseStream(QIODevice *objDevice) return true; } + +/** + * Replacement of deprecated avcodec_decode_video2 with the same signature + * https://blogs.gentoo.org/lu_zero/2016/03/29/new-avcodec-api/ + */ +int DATVideoRender::new_decode(AVCodecContext *avctx, AVFrame *frame, int *got_frame, AVPacket *pkt) +{ + int ret; + + *got_frame = 0; + + if (pkt) { + ret = avcodec_send_packet(avctx, pkt); + // In particular, we don't expect AVERROR(EAGAIN), because we read all + // decoded frames with avcodec_receive_frame() until done. + if (ret < 0) + return ret == AVERROR_EOF ? 0 : ret; + } + + ret = avcodec_receive_frame(avctx, frame); + if (ret < 0 && ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) + return ret; + if (ret >= 0) + *got_frame = 1; + + return 0; +} diff --git a/plugins/channelrx/demoddatv/datvideorender.h b/plugins/channelrx/demoddatv/datvideorender.h index 5603b6497..02dddfb3d 100644 --- a/plugins/channelrx/demoddatv/datvideorender.h +++ b/plugins/channelrx/demoddatv/datvideorender.h @@ -124,6 +124,8 @@ private: bool PreprocessStream(); void ResetMetaData(); + int new_decode(AVCodecContext *avctx, AVFrame *frame, int *got_frame, AVPacket *pkt); + protected: virtual bool eventFilter(QObject *obj, QEvent *event); diff --git a/plugins/channelrx/demoddsd/CMakeLists.txt b/plugins/channelrx/demoddsd/CMakeLists.txt index e862aa291..5932da235 100644 --- a/plugins/channelrx/demoddsd/CMakeLists.txt +++ b/plugins/channelrx/demoddsd/CMakeLists.txt @@ -77,6 +77,6 @@ target_link_libraries(demoddsd endif (BUILD_DEBIAN) -qt5_use_modules(demoddsd Core Widgets) +target_link_libraries(demoddsd Qt5::Core Qt5::Widgets) install(TARGETS demoddsd DESTINATION lib/plugins/channelrx) diff --git a/plugins/channelrx/demodlora/CMakeLists.txt b/plugins/channelrx/demodlora/CMakeLists.txt index d8076dac0..a2ced900c 100644 --- a/plugins/channelrx/demodlora/CMakeLists.txt +++ b/plugins/channelrx/demodlora/CMakeLists.txt @@ -43,6 +43,6 @@ target_link_libraries(demodlora sdrgui ) -qt5_use_modules(demodlora Core Widgets) +target_link_libraries(demodlora Qt5::Core Qt5::Widgets) install(TARGETS demodlora DESTINATION lib/plugins/channelrx) diff --git a/plugins/channelrx/demodnfm/CMakeLists.txt b/plugins/channelrx/demodnfm/CMakeLists.txt index 3efccfd31..3e405ea4f 100644 --- a/plugins/channelrx/demodnfm/CMakeLists.txt +++ b/plugins/channelrx/demodnfm/CMakeLists.txt @@ -47,6 +47,6 @@ target_link_libraries(demodnfm swagger ) -qt5_use_modules(demodnfm Core Widgets) +target_link_libraries(demodnfm Qt5::Core Qt5::Widgets) install(TARGETS demodnfm DESTINATION lib/plugins/channelrx) \ No newline at end of file diff --git a/plugins/channelrx/demodssb/CMakeLists.txt b/plugins/channelrx/demodssb/CMakeLists.txt index 514f1e01b..d1c095eb0 100644 --- a/plugins/channelrx/demodssb/CMakeLists.txt +++ b/plugins/channelrx/demodssb/CMakeLists.txt @@ -46,6 +46,6 @@ target_link_libraries(demodssb sdrgui ) -qt5_use_modules(demodssb Core Widgets) +target_link_libraries(demodssb Qt5::Core Qt5::Widgets) install(TARGETS demodssb DESTINATION lib/plugins/channelrx) diff --git a/plugins/channelrx/demodwfm/CMakeLists.txt b/plugins/channelrx/demodwfm/CMakeLists.txt index 914a448ff..a2f04465c 100644 --- a/plugins/channelrx/demodwfm/CMakeLists.txt +++ b/plugins/channelrx/demodwfm/CMakeLists.txt @@ -46,6 +46,6 @@ target_link_libraries(demodwfm sdrgui ) -qt5_use_modules(demodwfm Core Widgets) +target_link_libraries(demodwfm Qt5::Core Qt5::Widgets) -install(TARGETS demodwfm DESTINATION lib/plugins/channelrx) \ No newline at end of file +install(TARGETS demodwfm DESTINATION lib/plugins/channelrx) diff --git a/plugins/channelrx/udpsrc/CMakeLists.txt b/plugins/channelrx/udpsrc/CMakeLists.txt index d4ccd6a79..c73e0f38b 100644 --- a/plugins/channelrx/udpsrc/CMakeLists.txt +++ b/plugins/channelrx/udpsrc/CMakeLists.txt @@ -45,6 +45,6 @@ target_link_libraries(demodudpsrc sdrgui ) -qt5_use_modules(demodudpsrc Core Widgets Network) +target_link_libraries(demodudpsrc Qt5::Core Qt5::Widgets Qt5::Network) install(TARGETS demodudpsrc DESTINATION lib/plugins/channelrx) diff --git a/plugins/channeltx/modam/CMakeLists.txt b/plugins/channeltx/modam/CMakeLists.txt index a9ac4cc4c..eb2d22c4d 100644 --- a/plugins/channeltx/modam/CMakeLists.txt +++ b/plugins/channeltx/modam/CMakeLists.txt @@ -1,50 +1,51 @@ -project(modam) - -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - -set(modam_SOURCES - ammod.cpp - ammodgui.cpp - ammodplugin.cpp - ammodsettings.cpp -) - -set(modam_HEADERS - ammod.h - ammodgui.h - ammodplugin.h - ammodsettings.h -) - -set(modam_FORMS - ammodgui.ui -) - -include_directories( - . - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client -) - -add_definitions(${QT_DEFINITIONS}) -add_definitions(-DQT_PLUGIN) -add_definitions(-DQT_SHARED) - -qt5_wrap_ui(modam_FORMS_HEADERS ${modam_FORMS}) - -add_library(modam SHARED - ${modam_SOURCES} - ${modam_HEADERS_MOC} - ${modam_FORMS_HEADERS} -) - -target_link_libraries(modam - ${QT_LIBRARIES} - sdrbase - sdrgui - swagger -) - -qt5_use_modules(modam Core Widgets) - -install(TARGETS modam DESTINATION lib/plugins/channeltx) \ No newline at end of file +project(modam) + +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + +set(modam_SOURCES + ammod.cpp + ammodgui.cpp + ammodplugin.cpp + ammodsettings.cpp +) + +set(modam_HEADERS + ammod.h + ammodgui.h + ammodplugin.h + ammodsettings.h +) + +set(modam_FORMS + ammodgui.ui +) + +include_directories( + . + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client +) + +add_definitions(${QT_DEFINITIONS}) +add_definitions(-DQT_PLUGIN) +add_definitions(-DQT_SHARED) + +qt5_wrap_ui(modam_FORMS_HEADERS ${modam_FORMS}) + +add_library(modam SHARED + ${modam_SOURCES} + ${modam_HEADERS_MOC} + ${modam_FORMS_HEADERS} +) + +target_link_libraries(modam + ${QT_LIBRARIES} + sdrbase + sdrgui + swagger +) + +target_link_libraries(modam Qt5::Core Qt5::Widgets) + +install(TARGETS modam DESTINATION lib/plugins/channeltx) + diff --git a/plugins/channeltx/modatv/CMakeLists.txt b/plugins/channeltx/modatv/CMakeLists.txt index 21aad47e1..f3ef7ac29 100644 --- a/plugins/channeltx/modatv/CMakeLists.txt +++ b/plugins/channeltx/modatv/CMakeLists.txt @@ -49,6 +49,6 @@ target_link_libraries(modatv swagger ) -qt5_use_modules(modatv Core Widgets) +target_link_libraries(modatv Qt5::Core Qt5::Widgets) -install(TARGETS modatv DESTINATION lib/plugins/channeltx) \ No newline at end of file +install(TARGETS modatv DESTINATION lib/plugins/channeltx) diff --git a/plugins/channeltx/modnfm/CMakeLists.txt b/plugins/channeltx/modnfm/CMakeLists.txt index f7060fcd0..5355274b6 100644 --- a/plugins/channeltx/modnfm/CMakeLists.txt +++ b/plugins/channeltx/modnfm/CMakeLists.txt @@ -45,6 +45,6 @@ target_link_libraries(modnfm swagger ) -qt5_use_modules(modnfm Core Widgets) +target_link_libraries(modnfm Qt5::Core Qt5::Widgets) -install(TARGETS modnfm DESTINATION lib/plugins/channeltx) \ No newline at end of file +install(TARGETS modnfm DESTINATION lib/plugins/channeltx) diff --git a/plugins/channeltx/modssb/CMakeLists.txt b/plugins/channeltx/modssb/CMakeLists.txt index 631900497..cfb683961 100644 --- a/plugins/channeltx/modssb/CMakeLists.txt +++ b/plugins/channeltx/modssb/CMakeLists.txt @@ -42,9 +42,9 @@ target_link_libraries(modssb ${QT_LIBRARIES} sdrbase sdrgui - swagger + swagger ) -qt5_use_modules(modssb Core Widgets) +target_link_libraries(modssb Qt5::Core Qt5::Widgets) -install(TARGETS modssb DESTINATION lib/plugins/channeltx) \ No newline at end of file +install(TARGETS modssb DESTINATION lib/plugins/channeltx) diff --git a/plugins/channeltx/modwfm/CMakeLists.txt b/plugins/channeltx/modwfm/CMakeLists.txt index e9d104f88..800e33353 100644 --- a/plugins/channeltx/modwfm/CMakeLists.txt +++ b/plugins/channeltx/modwfm/CMakeLists.txt @@ -45,6 +45,6 @@ target_link_libraries(modwfm swagger ) -qt5_use_modules(modwfm Core Widgets) +target_link_libraries(modwfm Qt5::Core Qt5::Widgets) -install(TARGETS modwfm DESTINATION lib/plugins/channeltx) \ No newline at end of file +install(TARGETS modwfm DESTINATION lib/plugins/channeltx) diff --git a/plugins/channeltx/udpsink/CMakeLists.txt b/plugins/channeltx/udpsink/CMakeLists.txt index d278e2484..760a55c14 100644 --- a/plugins/channeltx/udpsink/CMakeLists.txt +++ b/plugins/channeltx/udpsink/CMakeLists.txt @@ -50,6 +50,6 @@ target_link_libraries(modudpsink swagger ) -qt5_use_modules(modudpsink Core Widgets Network) +target_link_libraries(modudpsink Qt5::Core Qt5::Widgets Qt5::Network) install(TARGETS modudpsink DESTINATION lib/plugins/channeltx) diff --git a/plugins/samplesink/bladerfoutput/CMakeLists.txt b/plugins/samplesink/bladerfoutput/CMakeLists.txt index 0f4d99354..719a7442e 100644 --- a/plugins/samplesink/bladerfoutput/CMakeLists.txt +++ b/plugins/samplesink/bladerfoutput/CMakeLists.txt @@ -75,6 +75,6 @@ target_link_libraries(outputbladerf ) endif (BUILD_DEBIAN) -qt5_use_modules(outputbladerf Core Widgets) +target_link_libraries(outputbladerf Qt5::Core Qt5::Widgets) install(TARGETS outputbladerf DESTINATION lib/plugins/samplesink) diff --git a/plugins/samplesink/filesink/CMakeLists.txt b/plugins/samplesink/filesink/CMakeLists.txt index e8ddcf468..ccedfe7af 100644 --- a/plugins/samplesink/filesink/CMakeLists.txt +++ b/plugins/samplesink/filesink/CMakeLists.txt @@ -47,6 +47,6 @@ target_link_libraries(outputfilesink swagger ) -qt5_use_modules(outputfilesink Core Widgets) +target_link_libraries(outputfilesink Qt5::Core Qt5::Widgets) install(TARGETS outputfilesink DESTINATION lib/plugins/samplesink) diff --git a/plugins/samplesink/hackrfoutput/CMakeLists.txt b/plugins/samplesink/hackrfoutput/CMakeLists.txt index 7a0ea9af9..87bbe5234 100644 --- a/plugins/samplesink/hackrfoutput/CMakeLists.txt +++ b/plugins/samplesink/hackrfoutput/CMakeLists.txt @@ -76,6 +76,6 @@ target_link_libraries(outputhackrf ) endif (BUILD_DEBIAN) -qt5_use_modules(outputhackrf Core Widgets) +target_link_libraries(outputhackrf Qt5::Core Qt5::Widgets) install(TARGETS outputhackrf DESTINATION lib/plugins/samplesink) diff --git a/plugins/samplesink/limesdroutput/CMakeLists.txt b/plugins/samplesink/limesdroutput/CMakeLists.txt index 8b92052e2..eed28022d 100644 --- a/plugins/samplesink/limesdroutput/CMakeLists.txt +++ b/plugins/samplesink/limesdroutput/CMakeLists.txt @@ -82,6 +82,6 @@ target_link_libraries(outputlimesdr ) endif (BUILD_DEBIAN) -qt5_use_modules(outputlimesdr Core Widgets) +target_link_libraries(outputlimesdr Qt5::Core Qt5::Widgets) install(TARGETS outputlimesdr DESTINATION lib/plugins/samplesink) diff --git a/plugins/samplesink/sdrdaemonsink/CMakeLists.txt b/plugins/samplesink/sdrdaemonsink/CMakeLists.txt index a18319650..0d07ae186 100644 --- a/plugins/samplesink/sdrdaemonsink/CMakeLists.txt +++ b/plugins/samplesink/sdrdaemonsink/CMakeLists.txt @@ -86,6 +86,6 @@ target_link_libraries(outputsdrdaemonsink ) endif (BUILD_DEBIAN) -qt5_use_modules(outputsdrdaemonsink Core Widgets) +target_link_libraries(outputsdrdaemonsink Qt5::Core Qt5::Widgets) install(TARGETS outputsdrdaemonsink DESTINATION lib/plugins/samplesink) diff --git a/plugins/samplesource/airspy/CMakeLists.txt b/plugins/samplesource/airspy/CMakeLists.txt index 022530bff..9d2aa6bf4 100644 --- a/plugins/samplesource/airspy/CMakeLists.txt +++ b/plugins/samplesource/airspy/CMakeLists.txt @@ -73,6 +73,6 @@ target_link_libraries(inputairspy endif (BUILD_DEBIAN) -qt5_use_modules(inputairspy Core Widgets) +target_link_libraries(inputairspy Qt5::Core Qt5::Widgets) install(TARGETS inputairspy DESTINATION lib/plugins/samplesource) diff --git a/plugins/samplesource/bladerfinput/CMakeLists.txt b/plugins/samplesource/bladerfinput/CMakeLists.txt index 2daf77264..943e3a7df 100644 --- a/plugins/samplesource/bladerfinput/CMakeLists.txt +++ b/plugins/samplesource/bladerfinput/CMakeLists.txt @@ -75,6 +75,6 @@ target_link_libraries(inputbladerf ) endif (BUILD_DEBIAN) -qt5_use_modules(inputbladerf Core Widgets) +target_link_libraries(inputbladerf Qt5::Core Qt5::Widgets) install(TARGETS inputbladerf DESTINATION lib/plugins/samplesource) diff --git a/plugins/samplesource/fcdpro/CMakeLists.txt b/plugins/samplesource/fcdpro/CMakeLists.txt index 5441a76e9..a3270955f 100644 --- a/plugins/samplesource/fcdpro/CMakeLists.txt +++ b/plugins/samplesource/fcdpro/CMakeLists.txt @@ -54,6 +54,6 @@ target_link_libraries(inputfcdpro swagger ) -qt5_use_modules(inputfcdpro Core Widgets) +target_link_libraries(inputfcdpro Qt5::Core Qt5::Widgets) -install(TARGETS inputfcdpro DESTINATION lib/plugins/samplesource) \ No newline at end of file +install(TARGETS inputfcdpro DESTINATION lib/plugins/samplesource) diff --git a/plugins/samplesource/fcdproplus/CMakeLists.txt b/plugins/samplesource/fcdproplus/CMakeLists.txt index b9dd191bd..0b94f9658 100644 --- a/plugins/samplesource/fcdproplus/CMakeLists.txt +++ b/plugins/samplesource/fcdproplus/CMakeLists.txt @@ -54,6 +54,6 @@ target_link_libraries(inputfcdproplus swagger ) -qt5_use_modules(inputfcdproplus Core Widgets) +target_link_libraries(inputfcdproplus Qt5::Core Qt5::Widgets) install(TARGETS inputfcdproplus DESTINATION lib/plugins/samplesource) diff --git a/plugins/samplesource/filesource/CMakeLists.txt b/plugins/samplesource/filesource/CMakeLists.txt index 6984dd483..c467096d2 100644 --- a/plugins/samplesource/filesource/CMakeLists.txt +++ b/plugins/samplesource/filesource/CMakeLists.txt @@ -49,6 +49,6 @@ target_link_libraries(inputfilesource swagger ) -qt5_use_modules(inputfilesource Core Widgets) +target_link_libraries(inputfilesource Qt5::Core Qt5::Widgets) install(TARGETS inputfilesource DESTINATION lib/plugins/samplesource) diff --git a/plugins/samplesource/hackrfinput/CMakeLists.txt b/plugins/samplesource/hackrfinput/CMakeLists.txt index 98881b3d1..f8946515e 100644 --- a/plugins/samplesource/hackrfinput/CMakeLists.txt +++ b/plugins/samplesource/hackrfinput/CMakeLists.txt @@ -76,6 +76,6 @@ target_link_libraries(inputhackrf ) endif (BUILD_DEBIAN) -qt5_use_modules(inputhackrf Core Widgets) +target_link_libraries(inputhackrf Qt5::Core Qt5::Widgets) install(TARGETS inputhackrf DESTINATION lib/plugins/samplesource) diff --git a/plugins/samplesource/limesdrinput/CMakeLists.txt b/plugins/samplesource/limesdrinput/CMakeLists.txt index b5d9fd215..6bf0d5602 100644 --- a/plugins/samplesource/limesdrinput/CMakeLists.txt +++ b/plugins/samplesource/limesdrinput/CMakeLists.txt @@ -82,6 +82,6 @@ target_link_libraries(inputlimesdr ) endif (BUILD_DEBIAN) -qt5_use_modules(inputlimesdr Core Widgets) +target_link_libraries(inputlimesdr Qt5::Core Qt5::Widgets) install(TARGETS inputlimesdr DESTINATION lib/plugins/samplesource) diff --git a/plugins/samplesource/rtlsdr/CMakeLists.txt b/plugins/samplesource/rtlsdr/CMakeLists.txt index 5ce6daa93..918d5641b 100644 --- a/plugins/samplesource/rtlsdr/CMakeLists.txt +++ b/plugins/samplesource/rtlsdr/CMakeLists.txt @@ -72,6 +72,6 @@ target_link_libraries(inputrtlsdr endif (BUILD_DEBIAN) -qt5_use_modules(inputrtlsdr Core Widgets) +target_link_libraries(inputrtlsdr Qt5::Core Qt5::Widgets) install(TARGETS inputrtlsdr DESTINATION lib/plugins/samplesource) diff --git a/plugins/samplesource/sdrdaemonsource/CMakeLists.txt b/plugins/samplesource/sdrdaemonsource/CMakeLists.txt index 477561e9b..e134b5200 100644 --- a/plugins/samplesource/sdrdaemonsource/CMakeLists.txt +++ b/plugins/samplesource/sdrdaemonsource/CMakeLists.txt @@ -85,6 +85,6 @@ target_link_libraries(inputsdrdaemonsource ) endif (BUILD_DEBIAN) -qt5_use_modules(inputsdrdaemonsource Core Widgets) +target_link_libraries(inputsdrdaemonsource Qt5::Core Qt5::Widgets) install(TARGETS inputsdrdaemonsource DESTINATION lib/plugins/samplesource) diff --git a/plugins/samplesource/sdrplay/CMakeLists.txt b/plugins/samplesource/sdrplay/CMakeLists.txt index aa9464e53..13d79ee72 100644 --- a/plugins/samplesource/sdrplay/CMakeLists.txt +++ b/plugins/samplesource/sdrplay/CMakeLists.txt @@ -68,6 +68,6 @@ target_link_libraries(inputsdrplay ) endif (BUILD_DEBIAN) -qt5_use_modules(inputsdrplay Core Widgets) +target_link_libraries(inputsdrplay Qt5::Core Qt5::Widgets) install(TARGETS inputsdrplay DESTINATION lib/plugins/samplesource) diff --git a/plugins/samplesource/testsource/CMakeLists.txt b/plugins/samplesource/testsource/CMakeLists.txt index 24fd797fc..110b29e7f 100644 --- a/plugins/samplesource/testsource/CMakeLists.txt +++ b/plugins/samplesource/testsource/CMakeLists.txt @@ -49,6 +49,6 @@ target_link_libraries(inputtestsource swagger ) -qt5_use_modules(inputtestsource Core Widgets) +target_link_libraries(inputtestsource Qt5::Core Qt5::Widgets) install(TARGETS inputtestsource DESTINATION lib/plugins/samplesource) diff --git a/pluginssrv/channelrx/demodam/CMakeLists.txt b/pluginssrv/channelrx/demodam/CMakeLists.txt index 7f0ade068..b5ba1b65e 100644 --- a/pluginssrv/channelrx/demodam/CMakeLists.txt +++ b/pluginssrv/channelrx/demodam/CMakeLists.txt @@ -37,6 +37,6 @@ target_link_libraries(demodamsrv swagger ) -qt5_use_modules(demodamsrv Core) +target_link_libraries(demodamsrv Qt5::Core) install(TARGETS demodamsrv DESTINATION lib/pluginssrv/channelrx) \ No newline at end of file diff --git a/pluginssrv/channelrx/demodbfm/CMakeLists.txt b/pluginssrv/channelrx/demodbfm/CMakeLists.txt index dffd1854a..f1862946b 100644 --- a/pluginssrv/channelrx/demodbfm/CMakeLists.txt +++ b/pluginssrv/channelrx/demodbfm/CMakeLists.txt @@ -50,6 +50,6 @@ target_link_libraries(demodbfmsrv swagger ) -qt5_use_modules(demodbfmsrv Core) +target_link_libraries(demodbfmsrv Qt5::Core) install(TARGETS demodbfmsrv DESTINATION lib/pluginssrv/channelrx) diff --git a/pluginssrv/channelrx/demoddsd/CMakeLists.txt b/pluginssrv/channelrx/demoddsd/CMakeLists.txt index ae646e045..c0a5d2571 100644 --- a/pluginssrv/channelrx/demoddsd/CMakeLists.txt +++ b/pluginssrv/channelrx/demoddsd/CMakeLists.txt @@ -64,6 +64,6 @@ target_link_libraries(demoddsdsrv endif (BUILD_DEBIAN) -qt5_use_modules(demoddsdsrv Core) +target_link_libraries(demoddsdsrv Qt5::Core) install(TARGETS demoddsdsrv DESTINATION lib/pluginssrv/channelrx) diff --git a/pluginssrv/channelrx/demodnfm/CMakeLists.txt b/pluginssrv/channelrx/demodnfm/CMakeLists.txt index 25c04df68..1c6f98132 100644 --- a/pluginssrv/channelrx/demodnfm/CMakeLists.txt +++ b/pluginssrv/channelrx/demodnfm/CMakeLists.txt @@ -37,6 +37,6 @@ target_link_libraries(demodnfmsrv swagger ) -qt5_use_modules(demodnfmsrv Core) +target_link_libraries(demodnfmsrv Qt5::Core) install(TARGETS demodnfmsrv DESTINATION lib/pluginssrv/channelrx) \ No newline at end of file diff --git a/pluginssrv/channelrx/demodssb/CMakeLists.txt b/pluginssrv/channelrx/demodssb/CMakeLists.txt index d7c87016e..a2c9e8c41 100644 --- a/pluginssrv/channelrx/demodssb/CMakeLists.txt +++ b/pluginssrv/channelrx/demodssb/CMakeLists.txt @@ -38,6 +38,6 @@ target_link_libraries(demodssbsrv sdrbase ) -qt5_use_modules(demodssbsrv Core) +target_link_libraries(demodssbsrv Qt5::Core) install(TARGETS demodssbsrv DESTINATION lib/pluginssrv/channelrx) diff --git a/pluginssrv/channelrx/demodwfm/CMakeLists.txt b/pluginssrv/channelrx/demodwfm/CMakeLists.txt index ef69350ad..6a1c3a73f 100644 --- a/pluginssrv/channelrx/demodwfm/CMakeLists.txt +++ b/pluginssrv/channelrx/demodwfm/CMakeLists.txt @@ -38,6 +38,6 @@ target_link_libraries(demodwfmsrv sdrbase ) -qt5_use_modules(demodwfmsrv Core) +target_link_libraries(demodwfmsrv Qt5::Core) install(TARGETS demodwfmsrv DESTINATION lib/pluginssrv/channelrx) \ No newline at end of file diff --git a/pluginssrv/channelrx/udpsrc/CMakeLists.txt b/pluginssrv/channelrx/udpsrc/CMakeLists.txt index 0b0efbf05..36e3d15de 100644 --- a/pluginssrv/channelrx/udpsrc/CMakeLists.txt +++ b/pluginssrv/channelrx/udpsrc/CMakeLists.txt @@ -36,6 +36,6 @@ target_link_libraries(demodudpsrcsrv sdrbase ) -qt5_use_modules(demodudpsrcsrv Core Network) +target_link_libraries(demodudpsrcsrv Qt5::Core Qt5::Network) install(TARGETS demodudpsrcsrv DESTINATION lib/pluginssrv/channelrx) diff --git a/pluginssrv/channeltx/modam/CMakeLists.txt b/pluginssrv/channeltx/modam/CMakeLists.txt index 5f0430448..51f6493b2 100644 --- a/pluginssrv/channeltx/modam/CMakeLists.txt +++ b/pluginssrv/channeltx/modam/CMakeLists.txt @@ -36,6 +36,6 @@ target_link_libraries(modamsrv swagger ) -qt5_use_modules(modamsrv Core) +target_link_libraries(modamsrv Qt5::Core) install(TARGETS modamsrv DESTINATION lib/pluginssrv/channeltx) \ No newline at end of file diff --git a/pluginssrv/channeltx/modatv/CMakeLists.txt b/pluginssrv/channeltx/modatv/CMakeLists.txt index 4338f70fb..d67f453fa 100644 --- a/pluginssrv/channeltx/modatv/CMakeLists.txt +++ b/pluginssrv/channeltx/modatv/CMakeLists.txt @@ -40,6 +40,6 @@ target_link_libraries(modatvsrv swagger ) -qt5_use_modules(modatvsrv Core) +target_link_libraries(modatvsrv Qt5::Core) install(TARGETS modatvsrv DESTINATION lib/pluginssrv/channeltx) \ No newline at end of file diff --git a/pluginssrv/channeltx/modnfm/CMakeLists.txt b/pluginssrv/channeltx/modnfm/CMakeLists.txt index 7d1eb0d6f..21af13ac5 100644 --- a/pluginssrv/channeltx/modnfm/CMakeLists.txt +++ b/pluginssrv/channeltx/modnfm/CMakeLists.txt @@ -36,6 +36,6 @@ target_link_libraries(modnfmsrv swagger ) -qt5_use_modules(modnfmsrv Core) +target_link_libraries(modnfmsrv Qt5::Core) install(TARGETS modnfmsrv DESTINATION lib/pluginssrv/channeltx) \ No newline at end of file diff --git a/pluginssrv/channeltx/modssb/CMakeLists.txt b/pluginssrv/channeltx/modssb/CMakeLists.txt index 4da444e3b..c65b75bac 100644 --- a/pluginssrv/channeltx/modssb/CMakeLists.txt +++ b/pluginssrv/channeltx/modssb/CMakeLists.txt @@ -36,6 +36,6 @@ target_link_libraries(modssbsrv swagger ) -qt5_use_modules(modssbsrv Core) +target_link_libraries(modssbsrv Qt5::Core) install(TARGETS modssbsrv DESTINATION lib/pluginssrv/channeltx) \ No newline at end of file diff --git a/pluginssrv/channeltx/modwfm/CMakeLists.txt b/pluginssrv/channeltx/modwfm/CMakeLists.txt index 090d63b99..e8a8e145c 100644 --- a/pluginssrv/channeltx/modwfm/CMakeLists.txt +++ b/pluginssrv/channeltx/modwfm/CMakeLists.txt @@ -36,6 +36,6 @@ target_link_libraries(modwfmsrv swagger ) -qt5_use_modules(modwfmsrv Core) +target_link_libraries(modwfmsrv Qt5::Core) install(TARGETS modwfmsrv DESTINATION lib/pluginssrv/channeltx) \ No newline at end of file diff --git a/pluginssrv/channeltx/udpsink/CMakeLists.txt b/pluginssrv/channeltx/udpsink/CMakeLists.txt index bb7f3b0f3..5f81e4025 100644 --- a/pluginssrv/channeltx/udpsink/CMakeLists.txt +++ b/pluginssrv/channeltx/udpsink/CMakeLists.txt @@ -40,6 +40,6 @@ target_link_libraries(modudpsinksrv swagger ) -qt5_use_modules(modudpsinksrv Core Network) +target_link_libraries(modudpsinksrv Qt5::Core Qt5::Network) install(TARGETS modudpsinksrv DESTINATION lib/pluginssrv/channeltx) diff --git a/pluginssrv/samplesink/bladerfoutput/CMakeLists.txt b/pluginssrv/samplesink/bladerfoutput/CMakeLists.txt index 7c1365553..a4f4d0cc9 100644 --- a/pluginssrv/samplesink/bladerfoutput/CMakeLists.txt +++ b/pluginssrv/samplesink/bladerfoutput/CMakeLists.txt @@ -63,6 +63,6 @@ target_link_libraries(outputbladerfsrv ) endif (BUILD_DEBIAN) -qt5_use_modules(outputbladerfsrv Core) +target_link_libraries(outputbladerfsrv Qt5::Core) install(TARGETS outputbladerfsrv DESTINATION lib/pluginssrv/samplesink) diff --git a/pluginssrv/samplesink/filesink/CMakeLists.txt b/pluginssrv/samplesink/filesink/CMakeLists.txt index b224a7b0b..3efdee02c 100644 --- a/pluginssrv/samplesink/filesink/CMakeLists.txt +++ b/pluginssrv/samplesink/filesink/CMakeLists.txt @@ -39,6 +39,6 @@ target_link_libraries(outputfilesinksrv swagger ) -qt5_use_modules(outputfilesinksrv Core) +target_link_libraries(outputfilesinksrv Qt5::Core) install(TARGETS outputfilesinksrv DESTINATION lib/pluginssrv/samplesink) diff --git a/pluginssrv/samplesink/hackrfoutput/CMakeLists.txt b/pluginssrv/samplesink/hackrfoutput/CMakeLists.txt index ab42a142b..fcb5af765 100644 --- a/pluginssrv/samplesink/hackrfoutput/CMakeLists.txt +++ b/pluginssrv/samplesink/hackrfoutput/CMakeLists.txt @@ -65,6 +65,6 @@ target_link_libraries(outputhackrfsrv ) endif (BUILD_DEBIAN) -qt5_use_modules(outputhackrfsrv Core) +target_link_libraries(outputhackrfsrv Qt5::Core) install(TARGETS outputhackrfsrv DESTINATION lib/pluginssrv/samplesink) diff --git a/pluginssrv/samplesink/limesdroutput/CMakeLists.txt b/pluginssrv/samplesink/limesdroutput/CMakeLists.txt index e8c5f9113..4bda2a737 100644 --- a/pluginssrv/samplesink/limesdroutput/CMakeLists.txt +++ b/pluginssrv/samplesink/limesdroutput/CMakeLists.txt @@ -73,6 +73,6 @@ target_link_libraries(outputlimesdrsrv ) endif (BUILD_DEBIAN) -qt5_use_modules(outputlimesdrsrv Core) +target_link_libraries(outputlimesdrsrv Qt5::Core) install(TARGETS outputlimesdrsrv DESTINATION lib/pluginssrv/samplesink) diff --git a/pluginssrv/samplesink/sdrdaemonsink/CMakeLists.txt b/pluginssrv/samplesink/sdrdaemonsink/CMakeLists.txt index f24f23701..ff4115065 100644 --- a/pluginssrv/samplesink/sdrdaemonsink/CMakeLists.txt +++ b/pluginssrv/samplesink/sdrdaemonsink/CMakeLists.txt @@ -76,6 +76,6 @@ target_link_libraries(outputsdrdaemonsinksrv ) endif (BUILD_DEBIAN) -qt5_use_modules(outputsdrdaemonsinksrv Core) +target_link_libraries(outputsdrdaemonsinksrv Qt5::Core) install(TARGETS outputsdrdaemonsinksrv DESTINATION lib/pluginssrv/samplesink) diff --git a/pluginssrv/samplesource/airspy/CMakeLists.txt b/pluginssrv/samplesource/airspy/CMakeLists.txt index 2ce19f4f6..cbc40b880 100644 --- a/pluginssrv/samplesource/airspy/CMakeLists.txt +++ b/pluginssrv/samplesource/airspy/CMakeLists.txt @@ -60,6 +60,6 @@ target_link_libraries(inputairspysrv endif (BUILD_DEBIAN) -qt5_use_modules(inputairspysrv Core) +target_link_libraries(inputairspysrv Qt5::Core) install(TARGETS inputairspysrv DESTINATION lib/pluginssrv/samplesource) diff --git a/pluginssrv/samplesource/bladerfinput/CMakeLists.txt b/pluginssrv/samplesource/bladerfinput/CMakeLists.txt index b468ae23b..78ed1c820 100644 --- a/pluginssrv/samplesource/bladerfinput/CMakeLists.txt +++ b/pluginssrv/samplesource/bladerfinput/CMakeLists.txt @@ -63,6 +63,6 @@ target_link_libraries(inputbladerfsrv ) endif (BUILD_DEBIAN) -qt5_use_modules(inputbladerfsrv Core) +target_link_libraries(inputbladerfsrv Qt5::Core) install(TARGETS inputbladerfsrv DESTINATION lib/pluginssrv/samplesource) diff --git a/pluginssrv/samplesource/fcdpro/CMakeLists.txt b/pluginssrv/samplesource/fcdpro/CMakeLists.txt index ffcd0948b..44ad593ad 100644 --- a/pluginssrv/samplesource/fcdpro/CMakeLists.txt +++ b/pluginssrv/samplesource/fcdpro/CMakeLists.txt @@ -43,6 +43,6 @@ target_link_libraries(inputfcdprosrv swagger ) -qt5_use_modules(inputfcdprosrv Core) +target_link_libraries(inputfcdprosrv Qt5::Core) install(TARGETS inputfcdprosrv DESTINATION lib/pluginssrv/samplesource) \ No newline at end of file diff --git a/pluginssrv/samplesource/fcdproplus/CMakeLists.txt b/pluginssrv/samplesource/fcdproplus/CMakeLists.txt index e23a61855..623d259e8 100644 --- a/pluginssrv/samplesource/fcdproplus/CMakeLists.txt +++ b/pluginssrv/samplesource/fcdproplus/CMakeLists.txt @@ -43,6 +43,6 @@ target_link_libraries(inputfcdproplussrv swagger ) -qt5_use_modules(inputfcdproplussrv Core) +target_link_libraries(inputfcdproplussrv Qt5::Core) install(TARGETS inputfcdproplussrv DESTINATION lib/pluginssrv/samplesource) diff --git a/pluginssrv/samplesource/filesource/CMakeLists.txt b/pluginssrv/samplesource/filesource/CMakeLists.txt index 0f6e72d72..edf9458a5 100644 --- a/pluginssrv/samplesource/filesource/CMakeLists.txt +++ b/pluginssrv/samplesource/filesource/CMakeLists.txt @@ -40,6 +40,6 @@ target_link_libraries(inputfilesourcesrv swagger ) -qt5_use_modules(inputfilesourcesrv Core) +target_link_libraries(inputfilesourcesrv Qt5::Core) install(TARGETS inputfilesourcesrv DESTINATION lib/pluginssrv/samplesource) diff --git a/pluginssrv/samplesource/hackrfinput/CMakeLists.txt b/pluginssrv/samplesource/hackrfinput/CMakeLists.txt index 66f9d5673..61a8760ed 100644 --- a/pluginssrv/samplesource/hackrfinput/CMakeLists.txt +++ b/pluginssrv/samplesource/hackrfinput/CMakeLists.txt @@ -65,6 +65,6 @@ target_link_libraries(inputhackrfsrv ) endif (BUILD_DEBIAN) -qt5_use_modules(inputhackrfsrv Core) +target_link_libraries(inputhackrfsrv Qt5::Core) install(TARGETS inputhackrfsrv DESTINATION lib/pluginssrv/samplesource) diff --git a/pluginssrv/samplesource/limesdrinput/CMakeLists.txt b/pluginssrv/samplesource/limesdrinput/CMakeLists.txt index b92ca4b8e..85c619849 100644 --- a/pluginssrv/samplesource/limesdrinput/CMakeLists.txt +++ b/pluginssrv/samplesource/limesdrinput/CMakeLists.txt @@ -73,6 +73,6 @@ target_link_libraries(inputlimesdrsrv ) endif (BUILD_DEBIAN) -qt5_use_modules(inputlimesdrsrv Core) +target_link_libraries(inputlimesdrsrv Qt5::Core) install(TARGETS inputlimesdrsrv DESTINATION lib/pluginssrv/samplesource) diff --git a/pluginssrv/samplesource/rtlsdr/CMakeLists.txt b/pluginssrv/samplesource/rtlsdr/CMakeLists.txt index 8e15b3095..705afd1e0 100644 --- a/pluginssrv/samplesource/rtlsdr/CMakeLists.txt +++ b/pluginssrv/samplesource/rtlsdr/CMakeLists.txt @@ -63,6 +63,6 @@ target_link_libraries(inputrtlsdrsrv endif (BUILD_DEBIAN) -qt5_use_modules(inputrtlsdrsrv Core) +target_link_libraries(inputrtlsdrsrv Qt5::Core) install(TARGETS inputrtlsdrsrv DESTINATION lib/pluginssrv/samplesource) diff --git a/pluginssrv/samplesource/sdrdaemonsource/CMakeLists.txt b/pluginssrv/samplesource/sdrdaemonsource/CMakeLists.txt index 8d4bdd555..2e9b7eb23 100644 --- a/pluginssrv/samplesource/sdrdaemonsource/CMakeLists.txt +++ b/pluginssrv/samplesource/sdrdaemonsource/CMakeLists.txt @@ -74,6 +74,6 @@ target_link_libraries(inputsdrdaemonsourcesrv ) endif (BUILD_DEBIAN) -qt5_use_modules(inputsdrdaemonsourcesrv Core) +target_link_libraries(inputsdrdaemonsourcesrv Qt5::Core) install(TARGETS inputsdrdaemonsourcesrv DESTINATION lib/pluginssrv/samplesource) diff --git a/pluginssrv/samplesource/sdrplay/CMakeLists.txt b/pluginssrv/samplesource/sdrplay/CMakeLists.txt index 37a6d4eb8..67b3939ac 100644 --- a/pluginssrv/samplesource/sdrplay/CMakeLists.txt +++ b/pluginssrv/samplesource/sdrplay/CMakeLists.txt @@ -58,6 +58,6 @@ target_link_libraries(inputsdrplaysrv ) endif (BUILD_DEBIAN) -qt5_use_modules(inputsdrplaysrv Core) +target_link_libraries(inputsdrplaysrv Qt5::Core) install(TARGETS inputsdrplaysrv DESTINATION lib/pluginssrv/samplesource) diff --git a/pluginssrv/samplesource/testsource/CMakeLists.txt b/pluginssrv/samplesource/testsource/CMakeLists.txt index 0e5c96f23..8b1dc76c2 100644 --- a/pluginssrv/samplesource/testsource/CMakeLists.txt +++ b/pluginssrv/samplesource/testsource/CMakeLists.txt @@ -38,6 +38,6 @@ target_link_libraries(inputtestsourcesrv swagger ) -qt5_use_modules(inputtestsourcesrv Core) +target_link_libraries(inputtestsourcesrv Qt5::Core) install(TARGETS inputtestsourcesrv DESTINATION lib/pluginssrv/samplesource) diff --git a/qrtplib/CMakeLists.txt b/qrtplib/CMakeLists.txt index 7bd992492..784e7f504 100644 --- a/qrtplib/CMakeLists.txt +++ b/qrtplib/CMakeLists.txt @@ -90,6 +90,6 @@ target_link_libraries(qrtplib ${QT_LIBRARIES} ) -qt5_use_modules(qrtplib Core Network) +target_link_libraries(qrtplib Qt5::Core Qt5::Network) install(TARGETS qrtplib DESTINATION lib) diff --git a/sdrbase/CMakeLists.txt b/sdrbase/CMakeLists.txt index c3ac5e833..32191b24f 100644 --- a/sdrbase/CMakeLists.txt +++ b/sdrbase/CMakeLists.txt @@ -301,7 +301,7 @@ endif (BUILD_DEBIAN) set_target_properties(sdrbase PROPERTIES DEFINE_SYMBOL "sdrbase_EXPORTS") target_compile_features(sdrbase PRIVATE cxx_generalized_initializers) # cmake >= 3.1.0 -qt5_use_modules(sdrbase Core Multimedia) +target_link_libraries(sdrbase Qt5::Core Qt5::Multimedia) install(TARGETS sdrbase DESTINATION lib) diff --git a/sdrbench/CMakeLists.txt b/sdrbench/CMakeLists.txt index 55c3b5449..9fe9d935b 100644 --- a/sdrbench/CMakeLists.txt +++ b/sdrbench/CMakeLists.txt @@ -41,7 +41,7 @@ target_link_libraries(sdrbench target_compile_features(sdrbench PRIVATE cxx_generalized_initializers) # cmake >= 3.1.0 -qt5_use_modules(sdrbench Core Gui) +target_link_libraries(sdrbench Qt5::Core Qt5::Gui) install(TARGETS sdrbench DESTINATION lib) diff --git a/sdrgui/CMakeLists.txt b/sdrgui/CMakeLists.txt index 4da2e430e..4f6289690 100644 --- a/sdrgui/CMakeLists.txt +++ b/sdrgui/CMakeLists.txt @@ -190,7 +190,7 @@ target_link_libraries(sdrgui set_target_properties(sdrgui PROPERTIES DEFINE_SYMBOL "sdrgui_EXPORTS") target_compile_features(sdrgui PRIVATE cxx_generalized_initializers) # cmake >= 3.1.0 -qt5_use_modules(sdrgui Core Widgets OpenGL Multimedia) +target_link_libraries(sdrgui Qt5::Core Qt5::Widgets Qt5::OpenGL Qt5::Multimedia) install(TARGETS sdrgui DESTINATION lib) diff --git a/sdrsrv/CMakeLists.txt b/sdrsrv/CMakeLists.txt index d06292637..cb599edbb 100644 --- a/sdrsrv/CMakeLists.txt +++ b/sdrsrv/CMakeLists.txt @@ -44,7 +44,7 @@ target_link_libraries(sdrsrv target_compile_features(sdrsrv PRIVATE cxx_generalized_initializers) # cmake >= 3.1.0 -qt5_use_modules(sdrsrv Core Multimedia) +target_link_libraries(sdrsrv Qt5::Core Qt5::Multimedia) install(TARGETS sdrsrv DESTINATION lib) diff --git a/swagger/CMakeLists.txt b/swagger/CMakeLists.txt index c906a88c8..92cd86f9b 100644 --- a/swagger/CMakeLists.txt +++ b/swagger/CMakeLists.txt @@ -33,6 +33,6 @@ target_link_libraries(swagger set_target_properties(swagger PROPERTIES DEFINE_SYMBOL "sdrangel_EXPORTS") -qt5_use_modules(swagger Core Network) +target_link_libraries(swagger Qt5::Core Qt5::Network) install(TARGETS swagger DESTINATION lib)