From d52f260d11d736db984296a9421c90367e9162ab Mon Sep 17 00:00:00 2001 From: Davide Gerhard Date: Fri, 3 May 2019 20:13:39 +0200 Subject: [PATCH] localsink and localinput to new cmake format --- plugins/channelrx/localsink/CMakeLists.txt | 82 +++++++++--------- plugins/channelrx/localsink/localsink.pro | 60 ------------- .../samplesource/localinput/CMakeLists.txt | 85 ++++++++++--------- .../samplesource/localinput/localinput.pro | 58 ------------- 4 files changed, 90 insertions(+), 195 deletions(-) delete mode 100644 plugins/channelrx/localsink/localsink.pro delete mode 100644 plugins/samplesource/localinput/localinput.pro diff --git a/plugins/channelrx/localsink/CMakeLists.txt b/plugins/channelrx/localsink/CMakeLists.txt index 275128774..4a728ea7a 100644 --- a/plugins/channelrx/localsink/CMakeLists.txt +++ b/plugins/channelrx/localsink/CMakeLists.txt @@ -1,53 +1,59 @@ project(localsink) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - set(localsink_SOURCES - localsink.cpp - localsinkgui.cpp - localsinksettings.cpp - localsinkthread.cpp - localsinkplugin.cpp + localsink.cpp + localsinksettings.cpp + localsinkthread.cpp + localsinkplugin.cpp ) set(localsink_HEADERS localsink.h - localsinkgui.h localsinksettings.h localsinkthread.h localsinkplugin.h -) + ) -set(localsink_FORMS - localsinkgui.ui -) - -#include(${QT_USE_FILE}) -add_definitions(${QT_DEFINITIONS}) -add_definitions(-DQT_PLUGIN) -add_definitions(-DQT_SHARED) - -qt5_wrap_ui(localsink_FORMS_HEADERS ${localsink_FORMS}) - -add_library(localsink SHARED - ${localsink_SOURCES} - ${localsink_HEADERS_MOC} - ${localsink_FORMS_HEADERS} -) - -target_include_directories(localsink PUBLIC - . +include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client + ${Boost_INCLUDE_DIR} + ) + +if(NOT SERVER_MODE) + set(localsink_SOURCES + ${localsink_SOURCES} + localsinkgui.cpp + + localsinkgui.ui + ) + set(localsink_HEADERS + ${localsink_HEADERS} + localsinkgui.h + ) + + set(TARGET_NAME localsink) + set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB_GUI "sdrgui") + set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) +else() + set(TARGET_NAME localsinksrv) + set(TARGET_LIB "") + set(TARGET_LIB_GUI "") + set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR}) +endif() + +add_library(${TARGET_NAME} SHARED + ${localsink_SOURCES} + ) + +target_link_libraries(${TARGET_NAME} + Qt5::Core + ${TARGET_LIB} + sdrbase + ${TARGET_LIB_GUI} + ${CM256CC_LIBRARIES} + swagger ) -target_link_libraries(localsink - ${QT_LIBRARIES} - sdrbase - sdrgui - swagger -) - -target_link_libraries(localsink Qt5::Core Qt5::Widgets) - -install(TARGETS localsink DESTINATION lib/plugins/channelrx) +install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER}) diff --git a/plugins/channelrx/localsink/localsink.pro b/plugins/channelrx/localsink/localsink.pro deleted file mode 100644 index 4415e0519..000000000 --- a/plugins/channelrx/localsink/localsink.pro +++ /dev/null @@ -1,60 +0,0 @@ -#-------------------------------------------------------- -# -# Pro file for Windows builds with Qt Creator -# -#-------------------------------------------------------- - -TEMPLATE = lib -CONFIG += plugin - -QT += core gui widgets multimedia network opengl - -TARGET = localsink - -INCLUDEPATH += $$PWD -INCLUDEPATH += ../../../exports -INCLUDEPATH += ../../../sdrbase -INCLUDEPATH += ../../../sdrgui -INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client -macx:INCLUDEPATH += /opt/local/include - -DEFINES += USE_SSE2=1 -QMAKE_CXXFLAGS += -msse2 -DEFINES += USE_SSSE3=1 -QMAKE_CXXFLAGS += -mssse3 -DEFINES += USE_SSE4_1=1 -QMAKE_CXXFLAGS += -msse4.1 -QMAKE_CXXFLAGS += -std=c++11 - -CONFIG(Release):build_subdir = release -CONFIG(Debug):build_subdir = debug - -CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0" -CONFIG(MSVC):INCLUDEPATH += "C:\softs\boost_1_66_0" -CONFIG(macx):INCLUDEPATH += "../../../boost_1_69_0" - -SOURCES += localsink.cpp\ - localsinkgui.cpp\ - localsinksettings.cpp\ - localsinkplugin.cpp\ - localsinkthread.cpp - -HEADERS += localsink.h\ - localsinkgui.h\ - localsinksettings.h\ - localsinkplugin.h\ - localsinkthread.h - -FORMS += localsinkgui.ui - -LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase -LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui -LIBS += -L../../../swagger/$${build_subdir} -lswagger - -macx { - QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/ -} - -RESOURCES = ../../../sdrgui/resources/res.qrc - -CONFIG(MINGW32):DEFINES += USE_INTERNAL_TIMER=1 diff --git a/plugins/samplesource/localinput/CMakeLists.txt b/plugins/samplesource/localinput/CMakeLists.txt index 8afebed99..4e38e15f6 100644 --- a/plugins/samplesource/localinput/CMakeLists.txt +++ b/plugins/samplesource/localinput/CMakeLists.txt @@ -1,50 +1,57 @@ project(localinput) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - set(localinput_SOURCES - localinputgui.cpp - localinput.cpp - localinputsettings.cpp - localinputplugin.cpp -) + localinput.cpp + localinputsettings.cpp + localinputplugin.cpp + ) set(localinput_HEADERS - localinputgui.h - localinput.h - localinputsettings.h - localinputplugin.h -) + localinput.h + localinputsettings.h + localinputplugin.h + ) -set(localinput_FORMS - localinputgui.ui -) -add_definitions(${QT_DEFINITIONS}) -add_definitions(-DQT_PLUGIN) -add_definitions(-DQT_SHARED) +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client + ) -qt5_wrap_ui(localinput_FORMS_HEADERS ${localinput_FORMS}) - -add_library(inputlocal SHARED +if(NOT SERVER_MODE) + set(localinput_SOURCES ${localinput_SOURCES} - ${localinput_HEADERS_MOC} - ${localinput_FORMS_HEADERS} + localinputgui.cpp + + localinputgui.ui + ) + set(localinput_HEADERS + ${localinput_HEADERS} + localinputgui.h + ) + + set(TARGET_NAME inputlocal) + set(TARGET_LIB "Qt5::Widgets") + set(TARGET_LIB_GUI "sdrgui") + set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR}) +else() + set(TARGET_NAME inputlocalsrv) + set(TARGET_LIB "") + set(TARGET_LIB_GUI "") + set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR}) +endif() + +add_library(${TARGET_NAME} SHARED + ${localinput_SOURCES} + ) + +target_link_libraries(${TARGET_NAME} + Qt5::Core + ${TARGET_LIB} + sdrbase + ${TARGET_LIB_GUI} + swagger + ${CM256CC_LIBRARIES} ) -target_include_directories(inputlocal PUBLIC - . - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client -) - -target_link_libraries(inputlocal - ${QT_LIBRARIES} - sdrbase - sdrgui - swagger -) - -target_link_libraries(inputlocal Qt5::Core Qt5::Widgets) - -install(TARGETS inputlocal DESTINATION lib/plugins/samplesource) +install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER}) diff --git a/plugins/samplesource/localinput/localinput.pro b/plugins/samplesource/localinput/localinput.pro deleted file mode 100644 index 3ecfcea61..000000000 --- a/plugins/samplesource/localinput/localinput.pro +++ /dev/null @@ -1,58 +0,0 @@ -#-------------------------------------------------------- -# -# Pro file for Android and Windows builds with Qt Creator -# -#-------------------------------------------------------- - -TEMPLATE = lib -CONFIG += plugin - -QT += core gui widgets multimedia network opengl - -TARGET = inputlocal - -INCLUDEPATH += $$PWD -INCLUDEPATH += ../../../exports -INCLUDEPATH += ../../../sdrbase -INCLUDEPATH += ../../../sdrgui -INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client -macx:INCLUDEPATH += /opt/local/include - -DEFINES += USE_SSE2=1 -QMAKE_CXXFLAGS += -msse2 -DEFINES += USE_SSSE3=1 -QMAKE_CXXFLAGS += -mssse3 -DEFINES += USE_SSE4_1=1 -QMAKE_CXXFLAGS += -msse4.1 -QMAKE_CXXFLAGS += -std=c++11 - -CONFIG(Release):build_subdir = release -CONFIG(Debug):build_subdir = debug - -CONFIG(MINGW32):INCLUDEPATH += "C:\softs\boost_1_66_0" -CONFIG(MSVC):INCLUDEPATH += "C:\softs\boost_1_66_0" -CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_69_0" - -SOURCES += localinputgui.cpp\ - localinput.cpp\ - localinputsettings.cpp\ - localinputplugin.cpp - -HEADERS += localinputgui.h\ - localinput.h\ - localinputsettings.h\ - localinputplugin.h - -FORMS += localinputgui.ui - -LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase -LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui -LIBS += -L../../../swagger/$${build_subdir} -lswagger - -macx { - QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/ -} - -RESOURCES = ../../../sdrgui/resources/res.qrc - -CONFIG(MINGW32):DEFINES += USE_INTERNAL_TIMER=1