VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes for Arch. Manual merge of pull request #183. DATV demod: fixed some of ffmpeg deprecation warnings

This commit is contained in:
f4exb 2018-06-13 00:20:51 +02:00
parent f76fafe826
commit 1eb8716a9f
77 changed files with 173 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -56,7 +56,7 @@ set(CMAKE_AUTOMOC ON)
find_package(Qt5Core 5.0 REQUIRED) find_package(Qt5Core 5.0 REQUIRED)
find_package(Qt5Widgets 5.0 REQUIRED) find_package(Qt5Widgets 5.0 REQUIRED)
find_package(Qt5Multimedia 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(OpenGL REQUIRED)
find_package(PkgConfig) find_package(PkgConfig)
find_package(Boost REQUIRED) find_package(Boost REQUIRED)
@ -276,7 +276,7 @@ if(WIN32)
set_target_properties(sdrangel PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:windows /ENTRY:mainCRTStartup") set_target_properties(sdrangel PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:windows /ENTRY:mainCRTStartup")
endif(WIN32) endif(WIN32)
qt5_use_modules(sdrangel Widgets Multimedia) target_link_libraries(sdrangel Qt5::Widgets Qt5::Multimedia)
############################################################################## ##############################################################################
# main server application # main server application
@ -300,7 +300,7 @@ target_link_libraries(sdrangelsrv
${QT_LIBRARIES} ${QT_LIBRARIES}
) )
qt5_use_modules(sdrangelsrv Multimedia) target_link_libraries(sdrangelsrv Qt5::Multimedia)
############################################################################## ##############################################################################
# main benchmark application # main benchmark application
@ -324,7 +324,7 @@ target_link_libraries(sdrangelbench
) )
target_compile_features(sdrangelbench PRIVATE cxx_generalized_initializers) # cmake >= 3.1.0 target_compile_features(sdrangelbench PRIVATE cxx_generalized_initializers) # cmake >= 3.1.0
qt5_use_modules(sdrangelbench Multimedia) target_link_libraries(sdrangelbench Qt5::Multimedia)
############################################################################## ##############################################################################

2
app/main.cpp
View File

@ -35,7 +35,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
*/ */
QCoreApplication::setOrganizationName("f4exb"); QCoreApplication::setOrganizationName("f4exb");
QCoreApplication::setApplicationName("SDRangel"); QCoreApplication::setApplicationName("SDRangel");
QCoreApplication::setApplicationVersion("4.0.0"); QCoreApplication::setApplicationVersion("4.0.1");
#if 1 #if 1
qApp->setStyle(QStyleFactory::create("fusion")); qApp->setStyle(QStyleFactory::create("fusion"));

2
appbench/main.cpp
View File

@ -57,7 +57,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
QCoreApplication::setOrganizationName("f4exb"); QCoreApplication::setOrganizationName("f4exb");
QCoreApplication::setApplicationName("SDRangelBench"); QCoreApplication::setApplicationName("SDRangelBench");
QCoreApplication::setApplicationVersion("4.0.0"); QCoreApplication::setApplicationVersion("4.0.1");
int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP}; int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP};
std::vector<int> vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int)); std::vector<int> vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int));

2
appsrv/main.cpp
View File

@ -56,7 +56,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
QCoreApplication::setOrganizationName("f4exb"); QCoreApplication::setOrganizationName("f4exb");
QCoreApplication::setApplicationName("SDRangelSrv"); QCoreApplication::setApplicationName("SDRangelSrv");
QCoreApplication::setApplicationVersion("4.0.0"); QCoreApplication::setApplicationVersion("4.0.1");
int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP}; int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP};
std::vector<int> vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int)); std::vector<int> vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int));

2
httpserver/CMakeLists.txt
View File

@ -50,6 +50,6 @@ target_link_libraries(httpserver
${QT_LIBRARIES} ${QT_LIBRARIES}
) )
qt5_use_modules(httpserver Core Network) target_link_libraries(httpserver Qt5::Core Qt5::Network)
install(TARGETS httpserver DESTINATION lib) install(TARGETS httpserver DESTINATION lib)

2
logging/CMakeLists.txt
View File

@ -36,6 +36,6 @@ target_link_libraries(logging
${QT_LIBRARIES} ${QT_LIBRARIES}
) )
qt5_use_modules(logging Core Network) target_link_libraries(logging Qt5::Core Qt5::Network)
install(TARGETS logging DESTINATION lib) install(TARGETS logging DESTINATION lib)

2
plugins/channelrx/chanalyzer/CMakeLists.txt
View File

@ -43,6 +43,6 @@ target_link_libraries(chanalyzer
sdrgui sdrgui
) )
qt5_use_modules(chanalyzer Core Widgets ) target_link_libraries(chanalyzer Qt5::Core Qt5::Widgets)
install(TARGETS chanalyzer DESTINATION lib/plugins/channelrx) install(TARGETS chanalyzer DESTINATION lib/plugins/channelrx)

4
plugins/channelrx/demodam/CMakeLists.txt
View File

@ -49,6 +49,6 @@ target_link_libraries(demodam
sdrgui sdrgui
) )
qt5_use_modules(demodam Core Widgets) target_link_libraries(demodam Qt5::Core Qt5::Widgets)
install(TARGETS demodam DESTINATION lib/plugins/channelrx) install(TARGETS demodam DESTINATION lib/plugins/channelrx)

2
plugins/channelrx/demodatv/CMakeLists.txt
View File

@ -43,6 +43,6 @@ target_link_libraries(demodatv
sdrgui sdrgui
) )
qt5_use_modules(demodatv Core Widgets) target_link_libraries(demodatv Qt5::Core Qt5::Widgets)
install(TARGETS demodatv DESTINATION lib/plugins/channelrx) install(TARGETS demodatv DESTINATION lib/plugins/channelrx)

2
plugins/channelrx/demodbfm/CMakeLists.txt
View File

@ -57,6 +57,6 @@ target_link_libraries(demodbfm
sdrgui sdrgui
) )
qt5_use_modules(demodbfm Core Widgets) target_link_libraries(demodbfm Qt5::Core Qt5::Widgets)
install(TARGETS demodbfm DESTINATION lib/plugins/channelrx) install(TARGETS demodbfm DESTINATION lib/plugins/channelrx)

3
plugins/channelrx/demoddatv/CMakeLists.txt
View File

@ -53,6 +53,7 @@ target_link_libraries(demoddatv
${SWSCALE_LIBRARIES} ${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) install(TARGETS demoddatv DESTINATION lib/plugins/channelrx)

2
plugins/channelrx/demoddatv/datvdemodplugin.cpp
View File

@ -27,7 +27,7 @@
const PluginDescriptor DATVDemodPlugin::m_ptrPluginDescriptor = const PluginDescriptor DATVDemodPlugin::m_ptrPluginDescriptor =
{ {
QString("DATV Demodulator"), QString("DATV Demodulator"),
QString("3.14.5"), QString("4.0.1"),
QString("(c) F4HKW for SDRAngel using LeanSDR framework (c) F4DAV"), QString("(c) F4HKW for SDRAngel using LeanSDR framework (c) F4DAV"),
QString("https://github.com/f4exb/sdrangel"), QString("https://github.com/f4exb/sdrangel"),
true, true,

37
plugins/channelrx/demoddatv/datvideorender.cpp
View File

@ -180,6 +180,10 @@ bool DATVideoRender::PreprocessStream()
//Prepare Codec and extract meta data //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; m_objDecoderCtx = m_objFormatCtx->streams[m_intVideoStreamIndex]->codec;
//Meta Data //Meta Data
@ -341,7 +345,7 @@ bool DATVideoRender::OpenStream(DATVideostream *objDevice)
return false; 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, objIOCtx = avio_alloc_context( ptrIOBuffer,
intIOBufferSize, intIOBufferSize,
@ -416,7 +420,7 @@ bool DATVideoRender::RenderStream()
intGotFrame=0; 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"; qDebug() << "DATVideoProcess::RenderStream decoding packet error";
@ -520,7 +524,7 @@ bool DATVideoRender::RenderStream()
} }
av_free_packet(&objPacket); av_packet_unref(&objPacket);
//********** Rendering ********** //********** Rendering **********
@ -597,3 +601,30 @@ bool DATVideoRender::CloseStream(QIODevice *objDevice)
return true; 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;
}

2
plugins/channelrx/demoddatv/datvideorender.h
View File

@ -124,6 +124,8 @@ private:
bool PreprocessStream(); bool PreprocessStream();
void ResetMetaData(); void ResetMetaData();
int new_decode(AVCodecContext *avctx, AVFrame *frame, int *got_frame, AVPacket *pkt);
protected: protected:
virtual bool eventFilter(QObject *obj, QEvent *event); virtual bool eventFilter(QObject *obj, QEvent *event);

2
plugins/channelrx/demoddsd/CMakeLists.txt
View File

@ -77,6 +77,6 @@ target_link_libraries(demoddsd
endif (BUILD_DEBIAN) endif (BUILD_DEBIAN)
qt5_use_modules(demoddsd Core Widgets) target_link_libraries(demoddsd Qt5::Core Qt5::Widgets)
install(TARGETS demoddsd DESTINATION lib/plugins/channelrx) install(TARGETS demoddsd DESTINATION lib/plugins/channelrx)

2
plugins/channelrx/demodlora/CMakeLists.txt
View File

@ -43,6 +43,6 @@ target_link_libraries(demodlora
sdrgui sdrgui
) )
qt5_use_modules(demodlora Core Widgets) target_link_libraries(demodlora Qt5::Core Qt5::Widgets)
install(TARGETS demodlora DESTINATION lib/plugins/channelrx) install(TARGETS demodlora DESTINATION lib/plugins/channelrx)

2
plugins/channelrx/demodnfm/CMakeLists.txt
View File

@ -47,6 +47,6 @@ target_link_libraries(demodnfm
swagger swagger
) )
qt5_use_modules(demodnfm Core Widgets) target_link_libraries(demodnfm Qt5::Core Qt5::Widgets)
install(TARGETS demodnfm DESTINATION lib/plugins/channelrx) install(TARGETS demodnfm DESTINATION lib/plugins/channelrx)

2
plugins/channelrx/demodssb/CMakeLists.txt
View File

@ -46,6 +46,6 @@ target_link_libraries(demodssb
sdrgui sdrgui
) )
qt5_use_modules(demodssb Core Widgets) target_link_libraries(demodssb Qt5::Core Qt5::Widgets)
install(TARGETS demodssb DESTINATION lib/plugins/channelrx) install(TARGETS demodssb DESTINATION lib/plugins/channelrx)

4
plugins/channelrx/demodwfm/CMakeLists.txt
View File

@ -46,6 +46,6 @@ target_link_libraries(demodwfm
sdrgui sdrgui
) )
qt5_use_modules(demodwfm Core Widgets) target_link_libraries(demodwfm Qt5::Core Qt5::Widgets)
install(TARGETS demodwfm DESTINATION lib/plugins/channelrx) install(TARGETS demodwfm DESTINATION lib/plugins/channelrx)

2
plugins/channelrx/udpsrc/CMakeLists.txt
View File

@ -45,6 +45,6 @@ target_link_libraries(demodudpsrc
sdrgui 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) install(TARGETS demodudpsrc DESTINATION lib/plugins/channelrx)

101
plugins/channeltx/modam/CMakeLists.txt
View File

@ -1,50 +1,51 @@
project(modam) project(modam)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(modam_SOURCES set(modam_SOURCES
ammod.cpp ammod.cpp
ammodgui.cpp ammodgui.cpp
ammodplugin.cpp ammodplugin.cpp
ammodsettings.cpp ammodsettings.cpp
) )
set(modam_HEADERS set(modam_HEADERS
ammod.h ammod.h
ammodgui.h ammodgui.h
ammodplugin.h ammodplugin.h
ammodsettings.h ammodsettings.h
) )
set(modam_FORMS set(modam_FORMS
ammodgui.ui ammodgui.ui
) )
include_directories( include_directories(
. .
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
) )
add_definitions(${QT_DEFINITIONS}) add_definitions(${QT_DEFINITIONS})
add_definitions(-DQT_PLUGIN) add_definitions(-DQT_PLUGIN)
add_definitions(-DQT_SHARED) add_definitions(-DQT_SHARED)
qt5_wrap_ui(modam_FORMS_HEADERS ${modam_FORMS}) qt5_wrap_ui(modam_FORMS_HEADERS ${modam_FORMS})
add_library(modam SHARED add_library(modam SHARED
${modam_SOURCES} ${modam_SOURCES}
${modam_HEADERS_MOC} ${modam_HEADERS_MOC}
${modam_FORMS_HEADERS} ${modam_FORMS_HEADERS}
) )
target_link_libraries(modam target_link_libraries(modam
${QT_LIBRARIES} ${QT_LIBRARIES}
sdrbase sdrbase
sdrgui sdrgui
swagger swagger
) )
qt5_use_modules(modam Core Widgets) target_link_libraries(modam Qt5::Core Qt5::Widgets)
install(TARGETS modam DESTINATION lib/plugins/channeltx) install(TARGETS modam DESTINATION lib/plugins/channeltx)

4
plugins/channeltx/modatv/CMakeLists.txt
View File

@ -49,6 +49,6 @@ target_link_libraries(modatv
swagger swagger
) )
qt5_use_modules(modatv Core Widgets) target_link_libraries(modatv Qt5::Core Qt5::Widgets)
install(TARGETS modatv DESTINATION lib/plugins/channeltx) install(TARGETS modatv DESTINATION lib/plugins/channeltx)

4
plugins/channeltx/modnfm/CMakeLists.txt
View File

@ -45,6 +45,6 @@ target_link_libraries(modnfm
swagger swagger
) )
qt5_use_modules(modnfm Core Widgets) target_link_libraries(modnfm Qt5::Core Qt5::Widgets)
install(TARGETS modnfm DESTINATION lib/plugins/channeltx) install(TARGETS modnfm DESTINATION lib/plugins/channeltx)

6
plugins/channeltx/modssb/CMakeLists.txt
View File

@ -42,9 +42,9 @@ target_link_libraries(modssb
${QT_LIBRARIES} ${QT_LIBRARIES}
sdrbase sdrbase
sdrgui sdrgui
swagger swagger
) )
qt5_use_modules(modssb Core Widgets) target_link_libraries(modssb Qt5::Core Qt5::Widgets)
install(TARGETS modssb DESTINATION lib/plugins/channeltx) install(TARGETS modssb DESTINATION lib/plugins/channeltx)

4
plugins/channeltx/modwfm/CMakeLists.txt
View File

@ -45,6 +45,6 @@ target_link_libraries(modwfm
swagger swagger
) )
qt5_use_modules(modwfm Core Widgets) target_link_libraries(modwfm Qt5::Core Qt5::Widgets)
install(TARGETS modwfm DESTINATION lib/plugins/channeltx) install(TARGETS modwfm DESTINATION lib/plugins/channeltx)

2
plugins/channeltx/udpsink/CMakeLists.txt
View File

@ -50,6 +50,6 @@ target_link_libraries(modudpsink
swagger 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) install(TARGETS modudpsink DESTINATION lib/plugins/channeltx)

2
plugins/samplesink/bladerfoutput/CMakeLists.txt
View File

@ -75,6 +75,6 @@ target_link_libraries(outputbladerf
) )
endif (BUILD_DEBIAN) endif (BUILD_DEBIAN)
qt5_use_modules(outputbladerf Core Widgets) target_link_libraries(outputbladerf Qt5::Core Qt5::Widgets)
install(TARGETS outputbladerf DESTINATION lib/plugins/samplesink) install(TARGETS outputbladerf DESTINATION lib/plugins/samplesink)

2
plugins/samplesink/filesink/CMakeLists.txt
View File

@ -47,6 +47,6 @@ target_link_libraries(outputfilesink
swagger swagger
) )
qt5_use_modules(outputfilesink Core Widgets) target_link_libraries(outputfilesink Qt5::Core Qt5::Widgets)
install(TARGETS outputfilesink DESTINATION lib/plugins/samplesink) install(TARGETS outputfilesink DESTINATION lib/plugins/samplesink)

2
plugins/samplesink/hackrfoutput/CMakeLists.txt
View File

@ -76,6 +76,6 @@ target_link_libraries(outputhackrf
) )
endif (BUILD_DEBIAN) endif (BUILD_DEBIAN)
qt5_use_modules(outputhackrf Core Widgets) target_link_libraries(outputhackrf Qt5::Core Qt5::Widgets)
install(TARGETS outputhackrf DESTINATION lib/plugins/samplesink) install(TARGETS outputhackrf DESTINATION lib/plugins/samplesink)

2
plugins/samplesink/limesdroutput/CMakeLists.txt
View File

@ -82,6 +82,6 @@ target_link_libraries(outputlimesdr
) )
endif (BUILD_DEBIAN) endif (BUILD_DEBIAN)
qt5_use_modules(outputlimesdr Core Widgets) target_link_libraries(outputlimesdr Qt5::Core Qt5::Widgets)
install(TARGETS outputlimesdr DESTINATION lib/plugins/samplesink) install(TARGETS outputlimesdr DESTINATION lib/plugins/samplesink)

2
plugins/samplesink/sdrdaemonsink/CMakeLists.txt
View File

@ -86,6 +86,6 @@ target_link_libraries(outputsdrdaemonsink
) )
endif (BUILD_DEBIAN) endif (BUILD_DEBIAN)
qt5_use_modules(outputsdrdaemonsink Core Widgets) target_link_libraries(outputsdrdaemonsink Qt5::Core Qt5::Widgets)
install(TARGETS outputsdrdaemonsink DESTINATION lib/plugins/samplesink) install(TARGETS outputsdrdaemonsink DESTINATION lib/plugins/samplesink)

2
plugins/samplesource/airspy/CMakeLists.txt
View File

@ -73,6 +73,6 @@ target_link_libraries(inputairspy
endif (BUILD_DEBIAN) endif (BUILD_DEBIAN)
qt5_use_modules(inputairspy Core Widgets) target_link_libraries(inputairspy Qt5::Core Qt5::Widgets)
install(TARGETS inputairspy DESTINATION lib/plugins/samplesource) install(TARGETS inputairspy DESTINATION lib/plugins/samplesource)

2
plugins/samplesource/bladerfinput/CMakeLists.txt
View File

@ -75,6 +75,6 @@ target_link_libraries(inputbladerf
) )
endif (BUILD_DEBIAN) endif (BUILD_DEBIAN)
qt5_use_modules(inputbladerf Core Widgets) target_link_libraries(inputbladerf Qt5::Core Qt5::Widgets)
install(TARGETS inputbladerf DESTINATION lib/plugins/samplesource) install(TARGETS inputbladerf DESTINATION lib/plugins/samplesource)

4
plugins/samplesource/fcdpro/CMakeLists.txt
View File

@ -54,6 +54,6 @@ target_link_libraries(inputfcdpro
swagger swagger
) )
qt5_use_modules(inputfcdpro Core Widgets) target_link_libraries(inputfcdpro Qt5::Core Qt5::Widgets)
install(TARGETS inputfcdpro DESTINATION lib/plugins/samplesource) install(TARGETS inputfcdpro DESTINATION lib/plugins/samplesource)

2
plugins/samplesource/fcdproplus/CMakeLists.txt
View File

@ -54,6 +54,6 @@ target_link_libraries(inputfcdproplus
swagger swagger
) )
qt5_use_modules(inputfcdproplus Core Widgets) target_link_libraries(inputfcdproplus Qt5::Core Qt5::Widgets)
install(TARGETS inputfcdproplus DESTINATION lib/plugins/samplesource) install(TARGETS inputfcdproplus DESTINATION lib/plugins/samplesource)

2
plugins/samplesource/filesource/CMakeLists.txt
View File

@ -49,6 +49,6 @@ target_link_libraries(inputfilesource
swagger swagger
) )
qt5_use_modules(inputfilesource Core Widgets) target_link_libraries(inputfilesource Qt5::Core Qt5::Widgets)
install(TARGETS inputfilesource DESTINATION lib/plugins/samplesource) install(TARGETS inputfilesource DESTINATION lib/plugins/samplesource)

2
plugins/samplesource/hackrfinput/CMakeLists.txt
View File

@ -76,6 +76,6 @@ target_link_libraries(inputhackrf
) )
endif (BUILD_DEBIAN) endif (BUILD_DEBIAN)
qt5_use_modules(inputhackrf Core Widgets) target_link_libraries(inputhackrf Qt5::Core Qt5::Widgets)
install(TARGETS inputhackrf DESTINATION lib/plugins/samplesource) install(TARGETS inputhackrf DESTINATION lib/plugins/samplesource)

2
plugins/samplesource/limesdrinput/CMakeLists.txt
View File

@ -82,6 +82,6 @@ target_link_libraries(inputlimesdr
) )
endif (BUILD_DEBIAN) endif (BUILD_DEBIAN)
qt5_use_modules(inputlimesdr Core Widgets) target_link_libraries(inputlimesdr Qt5::Core Qt5::Widgets)
install(TARGETS inputlimesdr DESTINATION lib/plugins/samplesource) install(TARGETS inputlimesdr DESTINATION lib/plugins/samplesource)

2
plugins/samplesource/rtlsdr/CMakeLists.txt
View File

@ -72,6 +72,6 @@ target_link_libraries(inputrtlsdr
endif (BUILD_DEBIAN) endif (BUILD_DEBIAN)
qt5_use_modules(inputrtlsdr Core Widgets) target_link_libraries(inputrtlsdr Qt5::Core Qt5::Widgets)
install(TARGETS inputrtlsdr DESTINATION lib/plugins/samplesource) install(TARGETS inputrtlsdr DESTINATION lib/plugins/samplesource)

2
plugins/samplesource/sdrdaemonsource/CMakeLists.txt
View File

@ -85,6 +85,6 @@ target_link_libraries(inputsdrdaemonsource
) )
endif (BUILD_DEBIAN) endif (BUILD_DEBIAN)
qt5_use_modules(inputsdrdaemonsource Core Widgets) target_link_libraries(inputsdrdaemonsource Qt5::Core Qt5::Widgets)
install(TARGETS inputsdrdaemonsource DESTINATION lib/plugins/samplesource) install(TARGETS inputsdrdaemonsource DESTINATION lib/plugins/samplesource)

2
plugins/samplesource/sdrplay/CMakeLists.txt
View File

@ -68,6 +68,6 @@ target_link_libraries(inputsdrplay
) )
endif (BUILD_DEBIAN) endif (BUILD_DEBIAN)
qt5_use_modules(inputsdrplay Core Widgets) target_link_libraries(inputsdrplay Qt5::Core Qt5::Widgets)
install(TARGETS inputsdrplay DESTINATION lib/plugins/samplesource) install(TARGETS inputsdrplay DESTINATION lib/plugins/samplesource)

2
plugins/samplesource/testsource/CMakeLists.txt
View File

@ -49,6 +49,6 @@ target_link_libraries(inputtestsource
swagger swagger
) )
qt5_use_modules(inputtestsource Core Widgets) target_link_libraries(inputtestsource Qt5::Core Qt5::Widgets)
install(TARGETS inputtestsource DESTINATION lib/plugins/samplesource) install(TARGETS inputtestsource DESTINATION lib/plugins/samplesource)

2
pluginssrv/channelrx/demodam/CMakeLists.txt
View File

@ -37,6 +37,6 @@ target_link_libraries(demodamsrv
swagger swagger
) )
qt5_use_modules(demodamsrv Core) target_link_libraries(demodamsrv Qt5::Core)
install(TARGETS demodamsrv DESTINATION lib/pluginssrv/channelrx) install(TARGETS demodamsrv DESTINATION lib/pluginssrv/channelrx)

2
pluginssrv/channelrx/demodbfm/CMakeLists.txt
View File

@ -50,6 +50,6 @@ target_link_libraries(demodbfmsrv
swagger swagger
) )
qt5_use_modules(demodbfmsrv Core) target_link_libraries(demodbfmsrv Qt5::Core)
install(TARGETS demodbfmsrv DESTINATION lib/pluginssrv/channelrx) install(TARGETS demodbfmsrv DESTINATION lib/pluginssrv/channelrx)

2
pluginssrv/channelrx/demoddsd/CMakeLists.txt
View File

@ -64,6 +64,6 @@ target_link_libraries(demoddsdsrv
endif (BUILD_DEBIAN) endif (BUILD_DEBIAN)
qt5_use_modules(demoddsdsrv Core) target_link_libraries(demoddsdsrv Qt5::Core)
install(TARGETS demoddsdsrv DESTINATION lib/pluginssrv/channelrx) install(TARGETS demoddsdsrv DESTINATION lib/pluginssrv/channelrx)

2
pluginssrv/channelrx/demodnfm/CMakeLists.txt
View File

@ -37,6 +37,6 @@ target_link_libraries(demodnfmsrv
swagger swagger
) )
qt5_use_modules(demodnfmsrv Core) target_link_libraries(demodnfmsrv Qt5::Core)
install(TARGETS demodnfmsrv DESTINATION lib/pluginssrv/channelrx) install(TARGETS demodnfmsrv DESTINATION lib/pluginssrv/channelrx)

2
pluginssrv/channelrx/demodssb/CMakeLists.txt
View File

@ -38,6 +38,6 @@ target_link_libraries(demodssbsrv
sdrbase sdrbase
) )
qt5_use_modules(demodssbsrv Core) target_link_libraries(demodssbsrv Qt5::Core)
install(TARGETS demodssbsrv DESTINATION lib/pluginssrv/channelrx) install(TARGETS demodssbsrv DESTINATION lib/pluginssrv/channelrx)

2
pluginssrv/channelrx/demodwfm/CMakeLists.txt
View File

@ -38,6 +38,6 @@ target_link_libraries(demodwfmsrv
sdrbase sdrbase
) )
qt5_use_modules(demodwfmsrv Core) target_link_libraries(demodwfmsrv Qt5::Core)
install(TARGETS demodwfmsrv DESTINATION lib/pluginssrv/channelrx) install(TARGETS demodwfmsrv DESTINATION lib/pluginssrv/channelrx)

2
pluginssrv/channelrx/udpsrc/CMakeLists.txt
View File

@ -36,6 +36,6 @@ target_link_libraries(demodudpsrcsrv
sdrbase sdrbase
) )
qt5_use_modules(demodudpsrcsrv Core Network) target_link_libraries(demodudpsrcsrv Qt5::Core Qt5::Network)
install(TARGETS demodudpsrcsrv DESTINATION lib/pluginssrv/channelrx) install(TARGETS demodudpsrcsrv DESTINATION lib/pluginssrv/channelrx)

2
pluginssrv/channeltx/modam/CMakeLists.txt
View File

@ -36,6 +36,6 @@ target_link_libraries(modamsrv
swagger swagger
) )
qt5_use_modules(modamsrv Core) target_link_libraries(modamsrv Qt5::Core)
install(TARGETS modamsrv DESTINATION lib/pluginssrv/channeltx) install(TARGETS modamsrv DESTINATION lib/pluginssrv/channeltx)

2
pluginssrv/channeltx/modatv/CMakeLists.txt
View File

@ -40,6 +40,6 @@ target_link_libraries(modatvsrv
swagger swagger
) )
qt5_use_modules(modatvsrv Core) target_link_libraries(modatvsrv Qt5::Core)
install(TARGETS modatvsrv DESTINATION lib/pluginssrv/channeltx) install(TARGETS modatvsrv DESTINATION lib/pluginssrv/channeltx)

2
pluginssrv/channeltx/modnfm/CMakeLists.txt
View File

@ -36,6 +36,6 @@ target_link_libraries(modnfmsrv
swagger swagger
) )
qt5_use_modules(modnfmsrv Core) target_link_libraries(modnfmsrv Qt5::Core)
install(TARGETS modnfmsrv DESTINATION lib/pluginssrv/channeltx) install(TARGETS modnfmsrv DESTINATION lib/pluginssrv/channeltx)

2
pluginssrv/channeltx/modssb/CMakeLists.txt
View File

@ -36,6 +36,6 @@ target_link_libraries(modssbsrv
swagger swagger
) )
qt5_use_modules(modssbsrv Core) target_link_libraries(modssbsrv Qt5::Core)
install(TARGETS modssbsrv DESTINATION lib/pluginssrv/channeltx) install(TARGETS modssbsrv DESTINATION lib/pluginssrv/channeltx)

2
pluginssrv/channeltx/modwfm/CMakeLists.txt
View File

@ -36,6 +36,6 @@ target_link_libraries(modwfmsrv
swagger swagger
) )
qt5_use_modules(modwfmsrv Core) target_link_libraries(modwfmsrv Qt5::Core)
install(TARGETS modwfmsrv DESTINATION lib/pluginssrv/channeltx) install(TARGETS modwfmsrv DESTINATION lib/pluginssrv/channeltx)

2
pluginssrv/channeltx/udpsink/CMakeLists.txt
View File

@ -40,6 +40,6 @@ target_link_libraries(modudpsinksrv
swagger swagger
) )
qt5_use_modules(modudpsinksrv Core Network) target_link_libraries(modudpsinksrv Qt5::Core Qt5::Network)
install(TARGETS modudpsinksrv DESTINATION lib/pluginssrv/channeltx) install(TARGETS modudpsinksrv DESTINATION lib/pluginssrv/channeltx)

2
pluginssrv/samplesink/bladerfoutput/CMakeLists.txt
View File

@ -63,6 +63,6 @@ target_link_libraries(outputbladerfsrv
) )
endif (BUILD_DEBIAN) endif (BUILD_DEBIAN)
qt5_use_modules(outputbladerfsrv Core) target_link_libraries(outputbladerfsrv Qt5::Core)
install(TARGETS outputbladerfsrv DESTINATION lib/pluginssrv/samplesink) install(TARGETS outputbladerfsrv DESTINATION lib/pluginssrv/samplesink)

2
pluginssrv/samplesink/filesink/CMakeLists.txt
View File

@ -39,6 +39,6 @@ target_link_libraries(outputfilesinksrv
swagger swagger
) )
qt5_use_modules(outputfilesinksrv Core) target_link_libraries(outputfilesinksrv Qt5::Core)
install(TARGETS outputfilesinksrv DESTINATION lib/pluginssrv/samplesink) install(TARGETS outputfilesinksrv DESTINATION lib/pluginssrv/samplesink)

2
pluginssrv/samplesink/hackrfoutput/CMakeLists.txt
View File

@ -65,6 +65,6 @@ target_link_libraries(outputhackrfsrv
) )
endif (BUILD_DEBIAN) endif (BUILD_DEBIAN)
qt5_use_modules(outputhackrfsrv Core) target_link_libraries(outputhackrfsrv Qt5::Core)
install(TARGETS outputhackrfsrv DESTINATION lib/pluginssrv/samplesink) install(TARGETS outputhackrfsrv DESTINATION lib/pluginssrv/samplesink)

2
pluginssrv/samplesink/limesdroutput/CMakeLists.txt
View File

@ -73,6 +73,6 @@ target_link_libraries(outputlimesdrsrv
) )
endif (BUILD_DEBIAN) endif (BUILD_DEBIAN)
qt5_use_modules(outputlimesdrsrv Core) target_link_libraries(outputlimesdrsrv Qt5::Core)
install(TARGETS outputlimesdrsrv DESTINATION lib/pluginssrv/samplesink) install(TARGETS outputlimesdrsrv DESTINATION lib/pluginssrv/samplesink)

2
pluginssrv/samplesink/sdrdaemonsink/CMakeLists.txt
View File

@ -76,6 +76,6 @@ target_link_libraries(outputsdrdaemonsinksrv
) )
endif (BUILD_DEBIAN) endif (BUILD_DEBIAN)
qt5_use_modules(outputsdrdaemonsinksrv Core) target_link_libraries(outputsdrdaemonsinksrv Qt5::Core)
install(TARGETS outputsdrdaemonsinksrv DESTINATION lib/pluginssrv/samplesink) install(TARGETS outputsdrdaemonsinksrv DESTINATION lib/pluginssrv/samplesink)

2
pluginssrv/samplesource/airspy/CMakeLists.txt
View File

@ -60,6 +60,6 @@ target_link_libraries(inputairspysrv
endif (BUILD_DEBIAN) endif (BUILD_DEBIAN)
qt5_use_modules(inputairspysrv Core) target_link_libraries(inputairspysrv Qt5::Core)
install(TARGETS inputairspysrv DESTINATION lib/pluginssrv/samplesource) install(TARGETS inputairspysrv DESTINATION lib/pluginssrv/samplesource)

2
pluginssrv/samplesource/bladerfinput/CMakeLists.txt
View File

@ -63,6 +63,6 @@ target_link_libraries(inputbladerfsrv
) )
endif (BUILD_DEBIAN) endif (BUILD_DEBIAN)
qt5_use_modules(inputbladerfsrv Core) target_link_libraries(inputbladerfsrv Qt5::Core)
install(TARGETS inputbladerfsrv DESTINATION lib/pluginssrv/samplesource) install(TARGETS inputbladerfsrv DESTINATION lib/pluginssrv/samplesource)

2
pluginssrv/samplesource/fcdpro/CMakeLists.txt
View File

@ -43,6 +43,6 @@ target_link_libraries(inputfcdprosrv
swagger swagger
) )
qt5_use_modules(inputfcdprosrv Core) target_link_libraries(inputfcdprosrv Qt5::Core)
install(TARGETS inputfcdprosrv DESTINATION lib/pluginssrv/samplesource) install(TARGETS inputfcdprosrv DESTINATION lib/pluginssrv/samplesource)

2
pluginssrv/samplesource/fcdproplus/CMakeLists.txt
View File

@ -43,6 +43,6 @@ target_link_libraries(inputfcdproplussrv
swagger swagger
) )
qt5_use_modules(inputfcdproplussrv Core) target_link_libraries(inputfcdproplussrv Qt5::Core)
install(TARGETS inputfcdproplussrv DESTINATION lib/pluginssrv/samplesource) install(TARGETS inputfcdproplussrv DESTINATION lib/pluginssrv/samplesource)

2
pluginssrv/samplesource/filesource/CMakeLists.txt
View File

@ -40,6 +40,6 @@ target_link_libraries(inputfilesourcesrv
swagger swagger
) )
qt5_use_modules(inputfilesourcesrv Core) target_link_libraries(inputfilesourcesrv Qt5::Core)
install(TARGETS inputfilesourcesrv DESTINATION lib/pluginssrv/samplesource) install(TARGETS inputfilesourcesrv DESTINATION lib/pluginssrv/samplesource)

2
pluginssrv/samplesource/hackrfinput/CMakeLists.txt
View File

@ -65,6 +65,6 @@ target_link_libraries(inputhackrfsrv
) )
endif (BUILD_DEBIAN) endif (BUILD_DEBIAN)
qt5_use_modules(inputhackrfsrv Core) target_link_libraries(inputhackrfsrv Qt5::Core)
install(TARGETS inputhackrfsrv DESTINATION lib/pluginssrv/samplesource) install(TARGETS inputhackrfsrv DESTINATION lib/pluginssrv/samplesource)

2
pluginssrv/samplesource/limesdrinput/CMakeLists.txt
View File

@ -73,6 +73,6 @@ target_link_libraries(inputlimesdrsrv
) )
endif (BUILD_DEBIAN) endif (BUILD_DEBIAN)
qt5_use_modules(inputlimesdrsrv Core) target_link_libraries(inputlimesdrsrv Qt5::Core)
install(TARGETS inputlimesdrsrv DESTINATION lib/pluginssrv/samplesource) install(TARGETS inputlimesdrsrv DESTINATION lib/pluginssrv/samplesource)

2
pluginssrv/samplesource/rtlsdr/CMakeLists.txt
View File

@ -63,6 +63,6 @@ target_link_libraries(inputrtlsdrsrv
endif (BUILD_DEBIAN) endif (BUILD_DEBIAN)
qt5_use_modules(inputrtlsdrsrv Core) target_link_libraries(inputrtlsdrsrv Qt5::Core)
install(TARGETS inputrtlsdrsrv DESTINATION lib/pluginssrv/samplesource) install(TARGETS inputrtlsdrsrv DESTINATION lib/pluginssrv/samplesource)

2
pluginssrv/samplesource/sdrdaemonsource/CMakeLists.txt
View File

@ -74,6 +74,6 @@ target_link_libraries(inputsdrdaemonsourcesrv
) )
endif (BUILD_DEBIAN) endif (BUILD_DEBIAN)
qt5_use_modules(inputsdrdaemonsourcesrv Core) target_link_libraries(inputsdrdaemonsourcesrv Qt5::Core)
install(TARGETS inputsdrdaemonsourcesrv DESTINATION lib/pluginssrv/samplesource) install(TARGETS inputsdrdaemonsourcesrv DESTINATION lib/pluginssrv/samplesource)

2
pluginssrv/samplesource/sdrplay/CMakeLists.txt
View File

@ -58,6 +58,6 @@ target_link_libraries(inputsdrplaysrv
) )
endif (BUILD_DEBIAN) endif (BUILD_DEBIAN)
qt5_use_modules(inputsdrplaysrv Core) target_link_libraries(inputsdrplaysrv Qt5::Core)
install(TARGETS inputsdrplaysrv DESTINATION lib/pluginssrv/samplesource) install(TARGETS inputsdrplaysrv DESTINATION lib/pluginssrv/samplesource)

2
pluginssrv/samplesource/testsource/CMakeLists.txt
View File

@ -38,6 +38,6 @@ target_link_libraries(inputtestsourcesrv
swagger swagger
) )
qt5_use_modules(inputtestsourcesrv Core) target_link_libraries(inputtestsourcesrv Qt5::Core)
install(TARGETS inputtestsourcesrv DESTINATION lib/pluginssrv/samplesource) install(TARGETS inputtestsourcesrv DESTINATION lib/pluginssrv/samplesource)

2
qrtplib/CMakeLists.txt
View File

@ -90,6 +90,6 @@ target_link_libraries(qrtplib
${QT_LIBRARIES} ${QT_LIBRARIES}
) )
qt5_use_modules(qrtplib Core Network) target_link_libraries(qrtplib Qt5::Core Qt5::Network)
install(TARGETS qrtplib DESTINATION lib) install(TARGETS qrtplib DESTINATION lib)

2
sdrbase/CMakeLists.txt
View File

@ -301,7 +301,7 @@ endif (BUILD_DEBIAN)
set_target_properties(sdrbase PROPERTIES DEFINE_SYMBOL "sdrbase_EXPORTS") set_target_properties(sdrbase PROPERTIES DEFINE_SYMBOL "sdrbase_EXPORTS")
target_compile_features(sdrbase PRIVATE cxx_generalized_initializers) # cmake >= 3.1.0 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) install(TARGETS sdrbase DESTINATION lib)

2
sdrbench/CMakeLists.txt
View File

@ -41,7 +41,7 @@ target_link_libraries(sdrbench
target_compile_features(sdrbench PRIVATE cxx_generalized_initializers) # cmake >= 3.1.0 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) install(TARGETS sdrbench DESTINATION lib)

2
sdrgui/CMakeLists.txt
View File

@ -190,7 +190,7 @@ target_link_libraries(sdrgui
set_target_properties(sdrgui PROPERTIES DEFINE_SYMBOL "sdrgui_EXPORTS") set_target_properties(sdrgui PROPERTIES DEFINE_SYMBOL "sdrgui_EXPORTS")
target_compile_features(sdrgui PRIVATE cxx_generalized_initializers) # cmake >= 3.1.0 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) install(TARGETS sdrgui DESTINATION lib)

2
sdrsrv/CMakeLists.txt
View File

@ -44,7 +44,7 @@ target_link_libraries(sdrsrv
target_compile_features(sdrsrv PRIVATE cxx_generalized_initializers) # cmake >= 3.1.0 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) install(TARGETS sdrsrv DESTINATION lib)

2
swagger/CMakeLists.txt
View File

@ -33,6 +33,6 @@ target_link_libraries(swagger
set_target_properties(swagger PROPERTIES DEFINE_SYMBOL "sdrangel_EXPORTS") 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) install(TARGETS swagger DESTINATION lib)