cmake: full refactor to remove qmake and use cmake on all platforms

2026-06-06 16:05:13 -04:00 · 2019-05-01 11:54:58 +02:00
parent 98e4b77dd9
commit dcfb7f6c97
171 changed files with 2126 additions and 5841 deletions
@@ -1,5 +1,11 @@
 project(plugins)

+include_directories(
+    ${CMAKE_SOURCE_DIR}/sdrbase
+    ${CMAKE_SOURCE_DIR}/exports
+    ${CMAKE_SOURCE_DIR}/sdrgui
+)
+
 add_subdirectory(channelrx)
 add_subdirectory(channeltx)
 add_subdirectory(samplesource)
@@ -1,14 +1,12 @@
 project(demod)

-add_subdirectory(demodlora)
+
 add_subdirectory(demodam)
 add_subdirectory(demodbfm)
 add_subdirectory(demodnfm)
 add_subdirectory(demodssb)
 add_subdirectory(udpsink)
 add_subdirectory(demodwfm)
-add_subdirectory(chanalyzer)
-add_subdirectory(demodatv)
 add_subdirectory(localsink)
 add_subdirectory(freqtracker)

@@ -16,28 +14,26 @@ if(LIBDSDCC_FOUND AND LIBMBE_FOUND)
    add_subdirectory(demoddsd)
 endif(LIBDSDCC_FOUND AND LIBMBE_FOUND)

-find_package(FFmpeg)
-if (FFMPEG_FOUND)
-	# You can only get FFmpeg version from the command line
-	EXECUTE_PROCESS(COMMAND ffmpeg -version COMMAND grep ffmpeg COMMAND cut -d\  -f3 COMMAND tr -d '\n' OUTPUT_VARIABLE FFMPEG_VERSION)
-	message(STATUS "FFmpeg version ${FFMPEG_VERSION} found")
-	if(FFMPEG_VERSION VERSION_GREATER "3.1")
-		message(STATUS "Include demoddatv")
-		add_subdirectory(demoddatv)
-	endif()
-endif()
-
-find_package(CM256cc)
 if(CM256CC_FOUND)
    add_subdirectory(remotesink)
 endif(CM256CC_FOUND)

-find_package(Codec2)
 if (CODEC2_FOUND)
    add_subdirectory(demodfreedv)
 endif(CODEC2_FOUND)

-if (BUILD_DEBIAN)
-    add_subdirectory(demoddsd)
-    add_subdirectory(remotesink)
-endif (BUILD_DEBIAN)
+if(NOT SERVER_MODE)
+    add_subdirectory(demodlora)
+    add_subdirectory(chanalyzer)
+    add_subdirectory(demodatv)
+
+    # At ffmpeg 3.1 !! TODO check more !!
+    # libavutil 55.27.100
+    # libavcodec 57.48.101
+    # libavformat 57.40.101
+    find_package(FFmpeg 57.48.101)
+    if (FFMPEG_FOUND)
+        message(STATUS "Include demoddatv")
+        add_subdirectory(demoddatv)
+    endif()
+endif()
@@ -1,12 +1,12 @@
 project(chanalyzer)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(chanalyzer_SOURCES
 	chanalyzer.cpp
 	chanalyzergui.cpp
 	chanalyzerplugin.cpp
 	chanalyzersettings.cpp
+
+	chanalyzergui.ui
 )

 set(chanalyzer_HEADERS
@@ -16,36 +16,20 @@ set(chanalyzer_HEADERS
 	chanalyzersettings.h
 )

-set(chanalyzer_FORMS
-	chanalyzergui.ui
-)
-
 include_directories(
-	.
 	${CMAKE_CURRENT_BINARY_DIR}
 	${Boost_INCLUDE_DIRS}
 )

-#include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-#qt5_wrap_cpp(chanalyzer_HEADERS_MOC ${chanalyzer_HEADERS})
-qt5_wrap_ui(chanalyzer_FORMS_HEADERS ${chanalyzer_FORMS})
-
 add_library(chanalyzer SHARED
 	${chanalyzer_SOURCES}
-	${chanalyzer_HEADERS_MOC}
-	${chanalyzer_FORMS_HEADERS}
 )

 target_link_libraries(chanalyzer
-	${QT_LIBRARIES}
+        Qt5::Core
+        Qt5::Widgets
 	sdrbase
 	sdrgui
 )

-target_link_libraries(chanalyzer Qt5::Core Qt5::Widgets)
-
-install(TARGETS chanalyzer DESTINATION lib/plugins/channelrx)
+install(TARGETS chanalyzer DESTINATION ${INSTALL_LIB_DIR}/plugins/channelrx)
@@ -1,54 +1,58 @@
 project(am)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(am_SOURCES
 	amdemod.cpp
-	amdemodgui.cpp
 	amdemodsettings.cpp
 	amdemodplugin.cpp
-	amdemodssbdialog.cpp
 )

 set(am_HEADERS
 	amdemod.h
-	amdemodgui.h
 	amdemodsettings.h
 	amdemodplugin.h
-	amdemodssbdialog.h
 )

-set(am_FORMS
-	amdemodgui.ui
-	amdemodssb.ui
-)

 include_directories(
-	.
 	${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client	
+        ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 )

-#include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(am_SOURCES
+        ${am_SOURCES}
+        amdemodgui.cpp
+        amdemodssbdialog.cpp

-#qt5_wrap_cpp(nfm_HEADERS_MOC ${nfm_HEADERS})
-qt5_wrap_ui(am_FORMS_HEADERS ${am_FORMS})
+        amdemodgui.ui
+        amdemodssb.ui
+    )
+    set(am_HEADERS
+        ${am_HEADERS}
+	amdemodgui.h
+        amdemodssbdialog.h
+    )

-add_library(demodam SHARED
+    set(TARGET_NAME demodam)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME demodamsrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
 	${am_SOURCES}
-	${am_HEADERS_MOC}
-	${am_FORMS_HEADERS}
 )

-target_link_libraries(demodam
-	${QT_LIBRARIES}
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
+	${TARGET_LIB_GUI}
 )

-target_link_libraries(demodam Qt5::Core Qt5::Widgets)
-
-install(TARGETS demodam DESTINATION lib/plugins/channelrx)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channelrx)
@@ -1,51 +1,35 @@
 project(atv)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(atv_SOURCES
 	atvdemod.cpp
 	atvdemodsettings.cpp
 	atvdemodgui.cpp
 	atvdemodplugin.cpp
+
+	atvdemodgui.ui
 )

 set(atv_HEADERS
 	atvdemod.h
-    atvdemodsettings.h
+        atvdemodsettings.h
 	atvdemodgui.h
 	atvdemodplugin.h
 )

-set(atv_FORMS
-	atvdemodgui.ui
-)
-
 include_directories(
-	.
 	${CMAKE_CURRENT_BINARY_DIR}
 	${Boost_INCLUDE_DIRS}
 )

-#include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-#qt5_wrap_cpp(nfm_HEADERS_MOC ${nfm_HEADERS})
-qt5_wrap_ui(atv_FORMS_HEADERS ${atv_FORMS})
-
 add_library(demodatv SHARED
 	${atv_SOURCES}
-	${atv_HEADERS_MOC}
-	${atv_FORMS_HEADERS}
 )

 target_link_libraries(demodatv
-	${QT_LIBRARIES}
+        Qt5::Core
+        Qt5::Widgets
 	sdrbase
 	sdrgui
 )

-target_link_libraries(demodatv Qt5::Core Qt5::Widgets)
-
-install(TARGETS demodatv DESTINATION lib/plugins/channelrx)
+install(TARGETS demodatv DESTINATION ${INSTALL_LIB_DIR}/plugins/channelrx)
@@ -1,10 +1,7 @@
 project(bfm)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(bfm_SOURCES
 	bfmdemod.cpp
-	bfmdemodgui.cpp
 	bfmdemodsettings.cpp
 	bfmplugin.cpp
 	rdsdemod.cpp
@@ -15,7 +12,6 @@ set(bfm_SOURCES

 set(bfm_HEADERS
 	bfmdemod.h
-	bfmdemodgui.h
 	bfmdemodsettings.h
 	bfmplugin.h
 	rdsdemod.h
@@ -24,40 +20,44 @@ set(bfm_HEADERS
 	rdstmc.h
 )

-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    set_source_files_properties(rdstmc.cpp PROPERTIES COMPILE_FLAGS -fno-var-tracking-assignments)
+include_directories(
+	${CMAKE_CURRENT_BINARY_DIR}
+        ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+        ${Boost_INCLUDE_DIRS}
+)
+
+if(NOT SERVER_MODE)
+    set(bfm_SOURCES
+        ${bfm_SOURCES}
+	bfmdemodgui.cpp
+
+	bfmdemodgui.ui
+    )
+    set(bfm_HEADERS
+        ${bfm_HEADERS}
+        bfmdemodgui.h
+    )
+
+    set(TARGET_NAME demodbfm)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME demodbfmsrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
 endif()

-set(bfm_FORMS
-	bfmdemodgui.ui
-)
-
-include_directories(
-	.
-	${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client	
-    ${Boost_INCLUDE_DIRS}
-)
-
-#include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-qt5_wrap_ui(bfm_FORMS_HEADERS ${bfm_FORMS})
-
-add_library(demodbfm SHARED
+add_library(${TARGET_NAME} SHARED
 	${bfm_SOURCES}
-	${bfm_HEADERS_MOC}
-	${bfm_FORMS_HEADERS}
 )

-target_link_libraries(demodbfm
-	${QT_LIBRARIES}
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
+        ${TARGET_LIB_GUI}
 )

-target_link_libraries(demodbfm Qt5::Core Qt5::Widgets)
-
-install(TARGETS demodbfm DESTINATION lib/plugins/channelrx)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channelrx)
@@ -1,27 +1,28 @@
 project(datv)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")

 set(datv_SOURCES
-	datvdemod.cpp
-	datvdemodgui.cpp
+    datvdemod.cpp
+    datvdemodgui.cpp
    datvdemodplugin.cpp
    datvdemodsettings.cpp
-	datvideostream.cpp
+    datvideostream.cpp
    datvideorender.cpp
    leansdr/dvb.cpp
    leansdr/filtergen.cpp
    leansdr/framework.cpp
    leansdr/math.cpp
    leansdr/sdr.cpp
+
+    datvdemodgui.ui
 )

 set(datv_HEADERS
-	datvdemod.h
-	datvdemodgui.h
-	datvdemodplugin.h
+    datvdemod.h
+    datvdemodgui.h
+    datvdemodplugin.h
    datvdemodsettings.h
-	datvideostream.h
+    datvideostream.h
    datvideorender.h
    leansdr/dvb.h
    leansdr/filtergen.h
@@ -30,46 +31,31 @@ set(datv_HEADERS
    leansdr/sdr.h
 )

-set(datv_FORMS
-	datvdemodgui.ui
-)
-
 include_directories(
-	.
-	${CMAKE_CURRENT_BINARY_DIR}
-	${AVCODEC_INCLUDE_DIRS}
-	${AVFORMAT_INCLUDE_DIRS}
-	${AVUTIL_INCLUDE_DIRS}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${AVCODEC_INCLUDE_DIRS}
+    ${AVFORMAT_INCLUDE_DIRS}
+    ${AVUTIL_INCLUDE_DIRS}
    ${SWSCALE_INCLUDE_DIRS}
    ${SWRESAMPLE_INCLUDE_DIRS}
 )

-#include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-#qt5_wrap_cpp(nfm_HEADERS_MOC ${nfm_HEADERS})
-qt5_wrap_ui(datv_FORMS_HEADERS ${datv_FORMS})
-
 add_library(demoddatv SHARED
-	${datv_SOURCES}
-	${datv_HEADERS_MOC}
-	${datv_FORMS_HEADERS}
+    ${datv_SOURCES}
 )

 target_link_libraries(demoddatv
-	${QT_LIBRARIES}
-	sdrbase
-	sdrgui
-	${AVCODEC_LIBRARIES}
-	${AVFORMAT_LIBRARIES}
-	${AVUTIL_LIBRARIES}
+    Qt5::Core
+    Qt5::Widgets
+    Qt5::Multimedia
+    Qt5::MultimediaWidgets
+    sdrbase
+    sdrgui
+    ${AVCODEC_LIBRARIES}
+    ${AVFORMAT_LIBRARIES}
+    ${AVUTIL_LIBRARIES}
    ${SWSCALE_LIBRARIES}
    ${SWRESAMPLE_LIBRARIES}
 )

-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 ${INSTALL_LIB_DIR}/plugins/channelrx)
@@ -1,82 +1,65 @@
 project(dsddemod)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(dsddemod_SOURCES
    dsddemod.cpp
-    dsddemodgui.cpp
    dsddemodplugin.cpp
    dsddemodbaudrates.cpp
    dsddemodsettings.cpp
    dsddecoder.cpp
-    dsdstatustextdialog.cpp
 )

 set(dsddemod_HEADERS
    dsddemod.h
-    dsddemodgui.h
    dsddemodplugin.h
    dsddemodbaudrates.h
    dsddemodsettings.h
    dsddecoder.h
-    dsdstatustextdialog.h
 )

-set(dsddemod_FORMS
-    dsddemodgui.ui
-    dsdstatustextdialog.ui
-)
-
-if (BUILD_DEBIAN)
 include_directories(
-    .
    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client	
-    ${LIBDSDCCSRC}/..
-    ${LIBMBELIBSRC}
-)
-else (BUILD_DEBIAN)
-include_directories(
-    .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client	
+    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
    ${LIBDSDCC_INCLUDE_DIR}
    ${LIBMBE_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)

-#include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(dsddemod_SOURCES
+        ${dsddemod_SOURCES}
+        dsddemodgui.cpp
+        dsdstatustextdialog.cpp

-qt5_wrap_ui(dsddemod_FORMS_HEADERS ${dsddemod_FORMS})
+        dsddemodgui.ui
+        dsdstatustextdialog.ui
+    )
+    set(dsddemod_HEADERS
+        ${dsddemod_HEADERS}
+        dsddemodgui.h
+        dsdstatustextdialog.h
+    )

-add_library(demoddsd SHARED
-    ${dsddemod_SOURCES}
-    ${dsddemod_HEADERS_MOC}
-    ${dsddemod_FORMS_HEADERS}
+    set(TARGET_NAME demoddsd)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME demoddsdsrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
+	${dsddemod_SOURCES}
 )

-if (BUILD_DEBIAN)
-target_link_libraries(demoddsd
-    ${QT_LIBRARIES}
-    sdrbase
-    sdrgui
-    dsdcc
-    mbelib
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
+	sdrbase
+	${TARGET_LIB_GUI}
+        ${LIBDSDCC_LIBRARIES}
+        ${LIBMBE_LIBRARY}
 )
-else (BUILD_DEBIAN)
-target_link_libraries(demoddsd
-    ${QT_LIBRARIES}
-    sdrbase
-    sdrgui
-    ${LIBDSDCC_LIBRARIES}
-    ${LIBMBE_LIBRARY}
-)
-endif (BUILD_DEBIAN)

-
-target_link_libraries(demoddsd Qt5::Core Qt5::Widgets)
-
-install(TARGETS demoddsd DESTINATION lib/plugins/channelrx)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channelrx)
@@ -1,54 +1,59 @@
 project(demodfreedv)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(freedv_SOURCES
 	freedvdemod.cpp
-	freedvdemodgui.cpp
 	freedvdemodsettings.cpp
 	freedvplugin.cpp
 )

 set(freedv_HEADERS
 	freedvdemod.h
-	freedvdemodgui.h
 	freedvdemodsettings.h
 	freedvplugin.h
 )

-set(freedv_FORMS
-	freedvdemodgui.ui
-)
-
 include_directories(
-	.
-	${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
-    ${CMAKE_SOURCE_DIR}/libfreedv	
-    ${CODEC2_INCLUDE_DIR}
+        ${CMAKE_CURRENT_BINARY_DIR}
+        ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+        ${CMAKE_SOURCE_DIR}/libfreedv
+        ${CODEC2_INCLUDE_DIR}
 )

-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(freedv_SOURCES
+        ${freedv_SOURCES}
+        freedvdemodgui.cpp

-qt5_wrap_ui(freedv_FORMS_HEADERS ${freedv_FORMS})
+	freedvdemodgui.ui
+    )
+    set(freedv_HEADERS
+        ${freedv_HEADERS}
+        freedvdemodgui.h
+    )

-add_library(demodfreedv SHARED
+    set(TARGET_NAME demodfreedv)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME demodfreedvsrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
 	${freedv_SOURCES}
-	${freedv_HEADERS_MOC}
-	${freedv_FORMS_HEADERS}
 )

-target_link_libraries(demodfreedv
-	${QT_LIBRARIES}
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
-	swagger
-	freedv
-	${CODEC2_LIBRARIES}
+	${TARGET_LIB_GUI}
+        swagger
+        freedv
+        ${CODEC2_LIBRARIES}
 )

-target_link_libraries(demodfreedv Qt5::Core Qt5::Widgets)
-
-install(TARGETS demodfreedv DESTINATION lib/plugins/channelrx)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channelrx)
@@ -1,12 +1,12 @@
 project(lora)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(lora_SOURCES
 	lorademod.cpp
 	lorademodgui.cpp
 	lorademodsettings.cpp
 	loraplugin.cpp
+
+	lorademodgui.ui
 )

 set(lora_HEADERS
@@ -16,35 +16,19 @@ set(lora_HEADERS
 	loraplugin.h
 )

-set(lora_FORMS
-	lorademodgui.ui
-)
-
 include_directories(
-	.
 	${CMAKE_CURRENT_BINARY_DIR}
 )

-#include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-#qt5_wrap_cpp(lora_HEADERS_MOC ${lora_HEADERS})
-qt5_wrap_ui(lora_FORMS_HEADERS ${lora_FORMS})
-
 add_library(demodlora SHARED
 	${lora_SOURCES}
-	${lora_HEADERS_MOC}
-	${lora_FORMS_HEADERS}
 )

 target_link_libraries(demodlora
-	${QT_LIBRARIES}
+        Qt5::Core
+        Qt5::Widgets
 	sdrbase
 	sdrgui
 )

-target_link_libraries(demodlora Qt5::Core Qt5::Widgets)
-
-install(TARGETS demodlora DESTINATION lib/plugins/channelrx)
+install(TARGETS demodlora DESTINATION ${INSTALL_LIB_DIR}/plugins/channelrx)
@@ -1,52 +1,55 @@
 project(nfm)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(nfm_SOURCES
 	nfmdemod.cpp
-	nfmdemodgui.cpp
 	nfmdemodsettings.cpp
 	nfmplugin.cpp
 )

 set(nfm_HEADERS
 	nfmdemod.h
-	nfmdemodgui.h
 	nfmdemodsettings.h
 	nfmplugin.h
 )

-set(nfm_FORMS
-	nfmdemodgui.ui
-)
-
 include_directories(
-	.
 	${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+        ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 )

-#include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(nfm_SOURCES
+        ${nfm_SOURCES}
+        nfmdemodgui.cpp

-#qt5_wrap_cpp(nfm_HEADERS_MOC ${nfm_HEADERS})
-qt5_wrap_ui(nfm_FORMS_HEADERS ${nfm_FORMS})
+	nfmdemodgui.ui
+    )
+    set(nfm_HEADERS
+        ${nfm_HEADERS}
+        nfmdemodgui.h
+    )

-add_library(demodnfm SHARED
+    set(TARGET_NAME demodnfm)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME demodnfmsrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
 	${nfm_SOURCES}
-	${nfm_HEADERS_MOC}
-	${nfm_FORMS_HEADERS}
 )

-target_link_libraries(demodnfm
-	${QT_LIBRARIES}
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
-	swagger
+	${TARGET_LIB_GUI}
+        swagger
 )

-target_link_libraries(demodnfm Qt5::Core Qt5::Widgets)
-
-install(TARGETS demodnfm DESTINATION lib/plugins/channelrx)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channelrx)
@@ -1,52 +1,55 @@
 project(ssb)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(ssb_SOURCES
 	ssbdemod.cpp
-	ssbdemodgui.cpp
 	ssbdemodsettings.cpp
 	ssbplugin.cpp
 )

 set(ssb_HEADERS
 	ssbdemod.h
-	ssbdemodgui.h
 	ssbdemodsettings.h
 	ssbplugin.h
 )

-set(ssb_FORMS
-	ssbdemodgui.ui
-)
-
 include_directories(
-	.
 	${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client	
+        ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 )

-#include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(ssb_SOURCES
+        ${ssb_SOURCES}
+        ssbdemodgui.cpp

-#qt5_wrap_cpp(ssb_HEADERS_MOC ${ssb_HEADERS})
-qt5_wrap_ui(ssb_FORMS_HEADERS ${ssb_FORMS})
+        ssbdemodgui.ui
+    )
+    set(ssb_HEADERS
+        ${ssb_HEADERS}
+        ssbdemodgui.h
+    )

-add_library(demodssb SHARED
+    set(TARGET_NAME demodssb)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME demodssbsrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
 	${ssb_SOURCES}
-	${ssb_HEADERS_MOC}
-	${ssb_FORMS_HEADERS}
 )

-target_link_libraries(demodssb
-	${QT_LIBRARIES}
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
-	swagger
+	${TARGET_LIB_GUI}
+        swagger
 )

-target_link_libraries(demodssb Qt5::Core Qt5::Widgets)
-
-install(TARGETS demodssb DESTINATION lib/plugins/channelrx)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channelrx)
@@ -1,51 +1,54 @@
 project(wfm)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(wfm_SOURCES
 	wfmdemod.cpp
-	wfmdemodgui.cpp
 	wfmdemodsettings.cpp
 	wfmplugin.cpp
 )

 set(wfm_HEADERS
 	wfmdemod.h
-	wfmdemodgui.h
 	wfmdemodsettings.h
 	wfmplugin.h
 )

-set(wfm_FORMS
-	wfmdemodgui.ui
-)
-
 include_directories(
-	.
 	${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client		
+        ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 )

-#include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(wfm_SOURCES
+        ${wfm_SOURCES}
+        wfmdemodgui.cpp

-#qt5_wrap_cpp(nfm_HEADERS_MOC ${nfm_HEADERS})
-qt5_wrap_ui(wfm_FORMS_HEADERS ${wfm_FORMS})
+	wfmdemodgui.ui
+    )
+    set(wfm_HEADERS
+        ${wfm_HEADERS}
+        wfmdemodgui.h
+    )

-add_library(demodwfm SHARED
+    set(TARGET_NAME demodwfm)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME demodwfmsrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
 	${wfm_SOURCES}
-	${wfm_HEADERS_MOC}
-	${wfm_FORMS_HEADERS}
 )

-target_link_libraries(demodwfm
-	${QT_LIBRARIES}
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
+	${TARGET_LIB_GUI}
 )

-target_link_libraries(demodwfm Qt5::Core Qt5::Widgets)
-
-install(TARGETS demodwfm DESTINATION lib/plugins/channelrx)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channelrx)
@@ -1,7 +1,5 @@
 project(remotesink)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 if (HAS_SSSE3)
    message(STATUS "RemoteSink: use SSSE3 SIMD" )
 elseif (HAS_NEON)
@@ -13,7 +11,6 @@ endif()

 set(remotesink_SOURCES
 	remotesink.cpp
-	remotesinkgui.cpp
 	remotesinksettings.cpp
 	remotesinkthread.cpp
 	remotesinkplugin.cpp
@@ -21,63 +18,51 @@ set(remotesink_SOURCES

 set(remotesink_HEADERS
 	remotesink.h
-	remotesinkgui.h
 	remotesinksettings.h
 	remotesinkthread.h
 	remotesinkplugin.h
 )

-set(remotesink_FORMS
-	remotesinkgui.ui
-)
-
-#include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-qt5_wrap_ui(remotesink_FORMS_HEADERS ${remotesink_FORMS})
-
-add_library(remotesink SHARED
-	${remotesink_SOURCES}
-	${remotesink_HEADERS_MOC}
-	${remotesink_FORMS_HEADERS}
-)
-
-if (BUILD_DEBIAN)
-target_include_directories(remotesink PUBLIC
-    .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
-    ${LIBCM256CCSRC}/..
-)
-else (BUILD_DEBIAN)
-target_include_directories(remotesink PUBLIC
-    .
+include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
    ${CM256CC_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)

-if (BUILD_DEBIAN)
-target_link_libraries(remotesink
-    ${QT_LIBRARIES}
-    cm256cc
-    sdrbase
-    sdrgui
-    swagger
+if(NOT SERVER_MODE)
+    set(remotesink_SOURCES
+        ${remotesink_SOURCES}
+        remotesinkgui.cpp
+
+	remotesinkgui.ui
+    )
+    set(remotesink_HEADERS
+        ${remotesink_HEADERS}
+        remotesinkgui.h
+    )
+
+    set(TARGET_NAME remotesink)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME remotesinksrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
+	${remotesink_SOURCES}
 )
-else (BUILD_DEBIAN)
-target_link_libraries(remotesink
-    ${QT_LIBRARIES}
-    ${CM256CC_LIBRARIES}
-    sdrbase
-    sdrgui
-    swagger
+
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
+	sdrbase
+	${TARGET_LIB_GUI}
+        ${CM256CC_LIBRARIES}
+        swagger
 )
-endif (BUILD_DEBIAN)

-target_link_libraries(remotesink Qt5::Core Qt5::Widgets)
-
-install(TARGETS remotesink DESTINATION lib/plugins/channelrx)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channelrx)
@@ -1,50 +1,55 @@
 project(udpsink)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(udpsink_SOURCES
 	udpsink.cpp
-	udpsinkgui.cpp
 	udpsinkplugin.cpp
 	udpsinksettings.cpp
 )

 set(udpsink_HEADERS
 	udpsink.h
-	udpsinkgui.h
 	udpsinkplugin.h
 	udpsinksettings.h
 )

-set(udpsink_FORMS
-	udpsinkgui.ui
-)
-
 include_directories(
-	.
 	${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client			
+        ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 )

-#include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(udpsink_SOURCES
+        ${udpsink_SOURCES}
+        udpsinkgui.cpp

-qt5_wrap_ui(udpsink_FORMS_HEADERS ${udpsink_FORMS})
+	udpsinkgui.ui
+    )
+    set(udpsink_HEADERS
+        ${udpsink_HEADERS}
+        udpsinkgui.h
+    )

-add_library(udpsink SHARED
+    set(TARGET_NAME udpsink)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME udpsinksrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
 	${udpsink_SOURCES}
-	${udpsink_HEADERS_MOC}
-	${udpsink_FORMS_HEADERS}
 )

-target_link_libraries(udpsink
-	${QT_LIBRARIES}
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
+        Qt5::Network
 	sdrbase
-	sdrgui
+	${TARGET_LIB_GUI}
 )

-target_link_libraries(udpsink Qt5::Core Qt5::Widgets Qt5::Network)
-
-install(TARGETS udpsink DESTINATION lib/plugins/channelrx)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channelrx)
@@ -7,21 +7,14 @@ add_subdirectory(modwfm)
 add_subdirectory(udpsource)
 add_subdirectory(localsource)

-find_package(CM256cc)
 if(CM256CC_FOUND)
    add_subdirectory(remotesource)
 endif(CM256CC_FOUND)

-find_package(OpenCV)
 if (OpenCV_FOUND)
    add_subdirectory(modatv)
 endif()

-if (BUILD_DEBIAN)
-    add_subdirectory(remotesource)
-endif (BUILD_DEBIAN)
-
-find_package(Codec2)
 if (CODEC2_FOUND)
    add_subdirectory(modfreedv)
-endif(CODEC2_FOUND)
+endif(CODEC2_FOUND)
@@ -1,51 +1,55 @@
 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
+        ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 )

-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(modam_SOURCES
+        ${modam_SOURCES}
+        ammodgui.cpp

-qt5_wrap_ui(modam_FORMS_HEADERS ${modam_FORMS})
+        ammodgui.ui
+    )
+    set(modam_HEADERS
+        ${modam_HEADERS}
+        ammodgui.h
+    )

-add_library(modam SHARED
+    set(TARGET_NAME modam)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME modamsrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
 	${modam_SOURCES}
-	${modam_HEADERS_MOC}
-	${modam_FORMS_HEADERS}
 )

-target_link_libraries(modam
-	${QT_LIBRARIES}
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
-	swagger
+	${TARGET_LIB_GUI}
+        swagger
 )

-target_link_libraries(modam Qt5::Core Qt5::Widgets)
-
-install(TARGETS modam DESTINATION lib/plugins/channeltx)
-
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channeltx)
@@ -1,54 +1,57 @@
 project(modatv)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(modatv_SOURCES
 	atvmod.cpp
-	atvmodgui.cpp
 	atvmodplugin.cpp
 	atvmodsettings.cpp
 )

 set(modatv_HEADERS
 	atvmod.h
-	atvmodgui.h
 	atvmodplugin.h
 	atvmodsettings.h
 )

-set(modatv_FORMS
-	atvmodgui.ui
-)
-
-# OpenCV variables defined in /usr/share/OpenCV/OpenCVConfig.cmake (Ubuntu)
-
 include_directories(
-	.
 	${OpenCV_INCLUDE_DIRS}
 	${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(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(modatv_SOURCES
+        ${modatv_SOURCES}
+        atvmodgui.cpp

-qt5_wrap_ui(modatv_FORMS_HEADERS ${modatv_FORMS})
+        atvmodgui.ui
+    )
+    set(modatv_HEADERS
+        ${modatv_HEADERS}
+        atvmodgui.h
+    )

-add_library(modatv SHARED
+    set(TARGET_NAME modatv)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME modatvsrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
 	${modatv_SOURCES}
-	${modatv_HEADERS_MOC}
-	${modatv_FORMS_HEADERS}
 )

-target_link_libraries(modatv
-    ${OpenCV_LIBS}
-	${QT_LIBRARIES}
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
-	swagger
+	${TARGET_LIB_GUI}
+        swagger
+        ${OpenCV_LIBS}
 )

-target_link_libraries(modatv Qt5::Core Qt5::Widgets)
-
-install(TARGETS modatv DESTINATION lib/plugins/channeltx)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channeltx)
@@ -1,54 +1,59 @@
 project(modfreedv)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(modfreedv_SOURCES
    freedvmod.cpp
-    freedvmodgui.cpp
    freedvmodplugin.cpp
    freedvmodsettings.cpp
 )

 set(modfreedv_HEADERS
    freedvmod.h
-    freedvmodgui.h
    freedvmodplugin.h
    freedvmodsettings.h
 )

-set(modfreedv_FORMS
-    freedvmodgui.ui
-)
-
 include_directories(
-    .
    ${CMAKE_CURRENT_BINARY_DIR}
    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
    ${CMAKE_SOURCE_DIR}/libfreedv
    ${CODEC2_INCLUDE_DIR}
 )

-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(modfreedv_SOURCES
+        ${modfreedv_SOURCES}
+        freedvmodgui.cpp

-qt5_wrap_ui(modfreedv_FORMS_HEADERS ${modfreedv_FORMS})
+        freedvmodgui.ui
+    )
+    set(modfreedv_HEADERS
+        ${modfreedv_HEADERS}
+        freedvmodgui.h
+    )

-add_library(modfreedv SHARED
-    ${modfreedv_SOURCES}
-    ${modfreedv_HEADERS_MOC}
-    ${modfreedv_FORMS_HEADERS}
+    set(TARGET_NAME modfreedv)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME modfreedvsrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
+	${modfreedv_SOURCES}
 )

-target_link_libraries(modfreedv
-    ${QT_LIBRARIES}
-    sdrbase
-    sdrgui
-    swagger
-	freedv    
-    ${CODEC2_LIBRARIES}
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
+	sdrbase
+	${TARGET_LIB_GUI}
+        swagger
+        freedv
+        ${CODEC2_LIBRARIES}
 )

-target_link_libraries(modfreedv Qt5::Core Qt5::Widgets)
-
-install(TARGETS modfreedv DESTINATION lib/plugins/channeltx)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channeltx)
@@ -1,50 +1,55 @@
 project(modnfm)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(modnfm_SOURCES
 	nfmmod.cpp
-	nfmmodgui.cpp
 	nfmmodplugin.cpp
 	nfmmodsettings.cpp
 )

 set(modnfm_HEADERS
 	nfmmod.h
-	nfmmodgui.h
 	nfmmodplugin.h
 	nfmmodsettings.h
 )

-set(modnfm_FORMS
-	nfmmodgui.ui
-)
-
 include_directories(
-	.
 	${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(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(modnfm_SOURCES
+        ${modnfm_SOURCES}
+        nfmmodgui.cpp

-qt5_wrap_ui(modnfm_FORMS_HEADERS ${modnfm_FORMS})
+        nfmmodgui.ui
+    )
+    set(modnfm_HEADERS
+        ${modnfm_HEADERS}
+        nfmmodgui.h
+    )

-add_library(modnfm SHARED
+    set(TARGET_NAME modnfm)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME modnfmsrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
 	${modnfm_SOURCES}
-	${modnfm_HEADERS_MOC}
-	${modnfm_FORMS_HEADERS}
 )

-target_link_libraries(modnfm
-	${QT_LIBRARIES}
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
-	swagger
+	${TARGET_LIB_GUI}
+        swagger
 )

-target_link_libraries(modnfm Qt5::Core Qt5::Widgets)
-
-install(TARGETS modnfm DESTINATION lib/plugins/channeltx)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channeltx)
@@ -1,50 +1,55 @@
 project(modssb)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(modssb_SOURCES
    ssbmod.cpp
-    ssbmodgui.cpp
    ssbmodplugin.cpp
    ssbmodsettings.cpp
 )

 set(modssb_HEADERS
    ssbmod.h
-    ssbmodgui.h
    ssbmodplugin.h
    ssbmodsettings.h
 )

-set(modssb_FORMS
-    ssbmodgui.ui
-)
-
 include_directories(
-    .
    ${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(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(modssb_SOURCES
+        ${modssb_SOURCES}
+        ssbmodgui.cpp

-qt5_wrap_ui(modssb_FORMS_HEADERS ${modssb_FORMS})
+        ssbmodgui.ui
+    )
+    set(modssb_HEADERS
+        ${modssb_HEADERS}
+        ssbmodgui.h
+    )

-add_library(modssb SHARED
-    ${modssb_SOURCES}
-    ${modssb_HEADERS_MOC}
-    ${modssb_FORMS_HEADERS}
+    set(TARGET_NAME modssb)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME modssbsrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
+	${modssb_SOURCES}
 )

-target_link_libraries(modssb
-    ${QT_LIBRARIES}
-    sdrbase
-    sdrgui
-    swagger
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
+	sdrbase
+	${TARGET_LIB_GUI}
+        swagger
 )

-target_link_libraries(modssb Qt5::Core Qt5::Widgets)
-
-install(TARGETS modssb DESTINATION lib/plugins/channeltx)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channeltx)
@@ -1,50 +1,55 @@
 project(modwfm)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(modwfm_SOURCES
 	wfmmod.cpp
-	wfmmodgui.cpp
 	wfmmodplugin.cpp
 	wfmmodsettings.cpp
 )

 set(modwfm_HEADERS
 	wfmmod.h
-	wfmmodgui.h
 	wfmmodplugin.h
 	wfmmodsettings.h
 )

-set(modwfm_FORMS
-	wfmmodgui.ui
-)
-
 include_directories(
-	.
 	${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(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(modwfm_SOURCES
+        ${modwfm_SOURCES}
+        wfmmodgui.cpp

-qt5_wrap_ui(modwfm_FORMS_HEADERS ${modwfm_FORMS})
+        wfmmodgui.ui
+    )
+    set(modwfm_HEADERS
+        ${modwfm_HEADERS}
+        wfmmodgui.h
+    )

-add_library(modwfm SHARED
+    set(TARGET_NAME modwfm)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME modwfmsrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
 	${modwfm_SOURCES}
-	${modwfm_HEADERS_MOC}
-	${modwfm_FORMS_HEADERS}
 )

-target_link_libraries(modwfm
-	${QT_LIBRARIES}
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
-	swagger
+	${TARGET_LIB_GUI}
+        swagger
 )

-target_link_libraries(modwfm Qt5::Core Qt5::Widgets)
-
-install(TARGETS modwfm DESTINATION lib/plugins/channeltx)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channeltx)
@@ -1,7 +1,5 @@
 project(remotesource)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 if (HAS_SSSE3)
    message(STATUS "RemoteSource: use SSSE3 SIMD" )
 elseif (HAS_NEON)
@@ -14,7 +12,6 @@ endif()
 set(remotesource_SOURCES
 	remotesource.cpp
 	remotesourcethread.cpp
-	remotesourcegui.cpp
 	remotesourceplugin.cpp
 	remotesourcesettings.cpp
 )
@@ -22,62 +19,51 @@ set(remotesource_SOURCES
 set(remotesource_HEADERS
 	remotesource.h
 	remotesourcethread.h
-	remotesourcegui.h
 	remotesourceplugin.h
 	remotesourcesettings.h
 )

-set(remotesource_FORMS
-	remotesourcegui.ui
-)
-
-#include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-qt5_wrap_ui(remotesource_FORMS_HEADERS ${remotesource_FORMS})
-
-add_library(remotesource SHARED
-	${remotesource_SOURCES}
-	${remotesource_HEADERS_MOC}
-	${remotesource_FORMS_HEADERS}
-)
-
-if (BUILD_DEBIAN)
-target_include_directories(remotesource PUBLIC
-    .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
-    ${LIBCM256CCSRC}/..
-)
-else (BUILD_DEBIAN)
-target_include_directories(remotesource PUBLIC
-    .
+include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
    ${CM256CC_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)

-if (BUILD_DEBIAN)
-target_link_libraries(remotesource
-    ${QT_LIBRARIES}
-    cm256cc
-    sdrbase
-    sdrgui
-    swagger
+if(NOT SERVER_MODE)
+    set(remotesource_SOURCES
+        ${remotesource_SOURCES}
+        remotesourcegui.cpp
+
+        remotesourcegui.ui
+    )
+    set(remotesource_HEADERS
+        ${remotesource_HEADERS}
+        remotesourcegui.h
+    )
+
+    set(TARGET_NAME remotesource)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME remotesourcesrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
+	${remotesource_SOURCES}
 )
-else (BUILD_DEBIAN)
-target_link_libraries(remotesource
-    ${QT_LIBRARIES}
-    ${CM256CC_LIBRARIES}
-    sdrbase
-    sdrgui
-    swagger
+
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
+        Qt5::Network
+	sdrbase
+	${TARGET_LIB_GUI}
+        swagger
+        ${CM256CC_LIBRARIES}
 )
-endif (BUILD_DEBIAN)

-target_link_libraries(remotesource Qt5::Core Qt5::Widgets Qt5::Network)
-
-install(TARGETS remotesource DESTINATION lib/plugins/channeltx)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channeltx)
@@ -1,10 +1,7 @@
 project(udpsource)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(udpsource_SOURCES
 	udpsource.cpp
-	udpsourcegui.cpp
 	udpsourceplugin.cpp
 	udpsourceudphandler.cpp
 	udpsourcemsg.cpp
@@ -13,43 +10,51 @@ set(udpsource_SOURCES

 set(udpsource_HEADERS
 	udpsource.h
-	udpsourcegui.h
 	udpsourceplugin.h
 	udpsourceudphandler.h
 	udpsourcemsg.h
 	udpsourcesettings.h
 )

-set(udpsource_FORMS
-	udpsourcegui.ui
-)
-
 include_directories(
-	.
 	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 )

-#include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(udpsource_SOURCES
+        ${udpsource_SOURCES}
+        udpsourcegui.cpp

-qt5_wrap_ui(udpsource_FORMS_HEADERS ${udpsource_FORMS})
+        udpsourcegui.ui
+    )
+    set(udpsource_HEADERS
+        ${udpsource_HEADERS}
+        udpsourcegui.h
+    )

-add_library(udpsource SHARED
+    set(TARGET_NAME udpsource)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME udpsourcesrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
 	${udpsource_SOURCES}
-	${udpsource_HEADERS_MOC}
-	${udpsource_FORMS_HEADERS}
 )

-target_link_libraries(udpsource
-	${QT_LIBRARIES}
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
+        Qt5::Network
 	sdrbase
-	sdrgui
-	swagger
+	${TARGET_LIB_GUI}
+        swagger
 )

-target_link_libraries(udpsource Qt5::Core Qt5::Widgets Qt5::Network)
-
-install(TARGETS udpsource DESTINATION lib/plugins/channeltx)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channeltx)
@@ -0,0 +1,3 @@
+<h1>Plugins for SDRangel server</h1>
+
+This is a build only subdirectory using the same structure and sources as in the `plugins` subdirectory. The plugins here are compiled without GUI and reference to Qt Widgets and are to be used with the server (headless) version of SDRangel through the `MainCore` class.
@@ -1,53 +1,33 @@
 project(samplesink)

-find_package(LibUSB)
-
-find_package(LibBLADERF)
-if(LIBUSB_FOUND AND LIBBLADERF_FOUND)
-    add_subdirectory(bladerf1output)
-    add_subdirectory(bladerf2output)
-endif(LIBUSB_FOUND AND LIBBLADERF_FOUND)
-
-find_package(LibHACKRF)
-if(LIBUSB_FOUND AND LIBHACKRF_FOUND)
-    add_subdirectory(hackrfoutput)
-endif(LIBUSB_FOUND AND LIBHACKRF_FOUND)
-
-find_package(LimeSuite)
-if(LIBUSB_FOUND AND LIMESUITE_FOUND)
-    add_subdirectory(limesdroutput)
-endif(LIBUSB_FOUND AND LIMESUITE_FOUND)
-
-find_package(LibIIO)
-if(LIBUSB_FOUND AND LIBIIO_FOUND)
-    add_subdirectory(plutosdroutput)
-endif(LIBUSB_FOUND AND LIBIIO_FOUND)
-
-find_package(CM256cc)
-if(CM256CC_FOUND)
-    add_subdirectory(remoteoutput)
-endif(CM256CC_FOUND)
-
-find_package(SoapySDR)
-if(SOAPYSDR_FOUND)
-	add_subdirectory(soapysdroutput)
-endif()
-
-find_package(LibXTRX)
-if(LIBXTRX_FOUND)
-	add_subdirectory(xtrxoutput)
-endif(LIBXTRX_FOUND)
-
-if (BUILD_DEBIAN)
-    add_subdirectory(bladerf1output)
-    add_subdirectory(bladerf2output)
-    add_subdirectory(hackrfoutput)
-    add_subdirectory(limesdroutput)
-    add_subdirectory(plutosdroutput)
-    add_subdirectory(remoteoutput)
-    add_subdirectory(soapysdroutput)
-endif (BUILD_DEBIAN)
-
 add_subdirectory(filesink)
 add_subdirectory(localoutput)

+if(CM256CC_FOUND)
+    add_subdirectory(remoteoutput)
+endif(CM256CC_FOUND)
+
+if(ENABLE_BLADERF AND LIBBLADERF_FOUND)
+    add_subdirectory(bladerf1output)
+    add_subdirectory(bladerf2output)
+endif()
+
+if(ENABLE_HACKRF AND LIBHACKRF_FOUND)
+    add_subdirectory(hackrfoutput)
+endif()
+
+if(ENABLE_LIMESUITE AND LIMESUITE_FOUND)
+    add_subdirectory(limesdroutput)
+endif()
+
+if(ENABLE_XTRX AND LIBXTRX_FOUND)
+	add_subdirectory(xtrxoutput)
+endif()
+
+if(ENABLE_IIO AND LIBIIO_FOUND)
+    add_subdirectory(plutosdroutput)
+endif()
+
+if(ENABLE_SOAPYSDR AND SOAPYSDR_FOUND)
+    add_subdirectory(soapysdroutput)
+endif()
@@ -1,9 +1,6 @@
 project(bladerf1output)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(bladerf1output_SOURCES
-	bladerf1outputgui.cpp
 	bladerf1output.cpp
 	bladerf1outputplugin.cpp
 	bladerf1outputsettings.cpp
@@ -11,70 +8,54 @@ set(bladerf1output_SOURCES
 )

 set(bladerf1output_HEADERS
-	bladerf1outputgui.h
 	bladerf1output.h
 	bladerf1soutputplugin.h
 	bladerf1outputsettings.h
 	bladerf1outputthread.h
 )

-set(bladerf1output_FORMS
-	bladerf1outputgui.ui
-)
-
-if (BUILD_DEBIAN)
 include_directories(
-    .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
-    ${CMAKE_SOURCE_DIR}/devices
-    ${LIBBLADERFLIBSRC}/include
-    ${LIBBLADERFLIBSRC}/src
-)
-else (BUILD_DEBIAN)
-include_directories(
-	.
 	${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client	
+        ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 	${CMAKE_SOURCE_DIR}/devices
 	${LIBBLADERF_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)

-#include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(bladerf1output_SOURCES
+        ${bladerf1output_SOURCES}
+        bladerf1outputgui.cpp

-#qt4_wrap_cpp(bladerf1output_HEADERS_MOC ${bladerf1output_HEADERS})
-qt5_wrap_ui(bladerf1output_FORMS_HEADERS ${bladerf1output_FORMS})
+        bladerf1outputgui.ui
+    )
+    set(bladerf1output_HEADERS
+        ${bladerf1output_HEADERS}
+        bladerf1outputgui.h
+    )

-add_library(outputbladerf1 SHARED
+    set(TARGET_NAME outputbladerf1)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME outputbladerf1srv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
 	${bladerf1output_SOURCES}
-	${bladerf1output_HEADERS_MOC}
-	${bladerf1output_FORMS_HEADERS}
 )

-if (BUILD_DEBIAN)
-target_link_libraries(outputbladerf1
-    ${QT_LIBRARIES}
-    bladerf
-    sdrbase
-    sdrgui
-    swagger
-    bladerf1device
-)
-else (BUILD_DEBIAN)
-target_link_libraries(outputbladerf1
-	${QT_LIBRARIES}
-	${LIBBLADERF_LIBRARIES}
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
-	swagger
-	bladerf1device
+	${TARGET_LIB_GUI}
+        swagger
+        ${LIBBLADERF_LIBRARIES}
+        bladerf1device
 )
-endif (BUILD_DEBIAN)

-target_link_libraries(outputbladerf1 Qt5::Core Qt5::Widgets)
-
-install(TARGETS outputbladerf1 DESTINATION lib/plugins/samplesink)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesink)
@@ -1,9 +1,6 @@
 project(bladerf2output)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(bladerf2output_SOURCES
-	bladerf2outputgui.cpp
 	bladerf2output.cpp
 	bladerf2outputplugin.cpp
 	bladerf2outputsettings.cpp
@@ -11,70 +8,54 @@ set(bladerf2output_SOURCES
 )

 set(bladerf2output_HEADERS
-	bladerf2outputgui.h
 	bladerf2output.h
 	bladerf2outputplugin.h
 	bladerf2outputsettings.h
 	bladerf2outputthread.h
 )

-set(bladerf2output_FORMS
-	bladerf2outputgui.ui
-)
-
-if (BUILD_DEBIAN)
 include_directories(
-    .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
-    ${CMAKE_SOURCE_DIR}/devices
-    ${LIBBLADERFLIBSRC}/include
-    ${LIBBLADERFLIBSRC}/src
-)
-else (BUILD_DEBIAN)
-include_directories(
-	.
 	${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client	
+        ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 	${CMAKE_SOURCE_DIR}/devices
 	${LIBBLADERF_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)

-#include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(bladerf2output_SOURCES
+        ${bladerf2output_SOURCES}
+        bladerf2outputgui.cpp

-#qt4_wrap_cpp(bladerf2output_HEADERS_MOC ${bladerf2output_HEADERS})
-qt5_wrap_ui(bladerf2output_FORMS_HEADERS ${bladerf2output_FORMS})
+        bladerf2outputgui.ui
+    )
+    set(bladerf2output_HEADERS
+        ${bladerf2output_HEADERS}
+        bladerf2outputgui.h
+    )

-add_library(outputbladerf2 SHARED
+    set(TARGET_NAME outputbladerf2)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME outputbladerf2srv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
 	${bladerf2output_SOURCES}
-	${bladerf2output_HEADERS_MOC}
-	${bladerf2output_FORMS_HEADERS}
 )

-if (BUILD_DEBIAN)
-target_link_libraries(outputbladerf2
-    ${QT_LIBRARIES}
-    bladerf
-    sdrbase
-    sdrgui
-    swagger
-    bladerf2device
-)
-else (BUILD_DEBIAN)
-target_link_libraries(outputbladerf2
-	${QT_LIBRARIES}
-	${LIBBLADERF_LIBRARIES}
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
-	swagger
-	bladerf2device
+	${TARGET_LIB_GUI}
+        swagger
+        ${LIBBLADERF_LIBRARIES}
+        bladerf2device
 )
-endif (BUILD_DEBIAN)

-target_link_libraries(outputbladerf2 Qt5::Core Qt5::Widgets)
-
-install(TARGETS outputbladerf2 DESTINATION lib/plugins/samplesink)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesink)
@@ -1,9 +1,6 @@
 project(filesink)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(filesink_SOURCES
-	filesinkgui.cpp
 	filesinkoutput.cpp
 	filesinkplugin.cpp
 	filesinksettings.cpp
@@ -11,42 +8,50 @@ set(filesink_SOURCES
 )

 set(filesink_HEADERS
-	filesinkgui.h
 	filesinkoutput.h
 	filesinkplugin.h
 	filesinksettings.h
 	filesinkthread.h
 )

-set(filesink_FORMS
-	filesinkgui.ui
-)
-
 include_directories(
-	.
 	${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(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(filesink_SOURCES
+        ${filesink_SOURCES}
+        filesinkgui.cpp

-qt5_wrap_ui(filesink_FORMS_HEADERS ${filesink_FORMS})
+        filesinkgui.ui
+    )
+    set(filesink_HEADERS
+        ${filesink_HEADERS}
+        filesinkgui.h
+    )

-add_library(outputfilesink SHARED
+    set(TARGET_NAME outputfilesink)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME outputfilesinksrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
 	${filesink_SOURCES}
-	${filesink_HEADERS_MOC}
-	${filesink_FORMS_HEADERS}
 )

-target_link_libraries(outputfilesink
-	${QT_LIBRARIES}
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
-	swagger
+	${TARGET_LIB_GUI}
+        swagger
 )

-target_link_libraries(outputfilesink Qt5::Core Qt5::Widgets)
-
-install(TARGETS outputfilesink DESTINATION lib/plugins/samplesink)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesink)
@@ -1,9 +1,6 @@
 project(hackrfoutput)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(hackrfoutput_SOURCES
-    hackrfoutputgui.cpp
    hackrfoutput.cpp
    hackrfoutputplugin.cpp
    hackrfoutputsettings.cpp
@@ -11,71 +8,54 @@ set(hackrfoutput_SOURCES
 )

 set(hackrfoutput_HEADERS
-    hackrfoutputgui.h
    hackrfoutput.h
    hackrfoutputplugin.h
    hackrfoutputsettings.h
    hackrfoutputthread.h
 )

-set(hackrfoutput_FORMS
-    hackrfoutputgui.ui
-)
-
-if (BUILD_DEBIAN)
 include_directories(
-        .
    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
-    ${CMAKE_SOURCE_DIR}/devices    
-    ${LIBHACKRFSRC}
-    ${LIBHACKRFSRC}/libhackrf/src
-)
-else (BUILD_DEBIAN)
-include_directories(
-        .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
-    ${CMAKE_SOURCE_DIR}/devices    
+    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+    ${CMAKE_SOURCE_DIR}/devices
    ${LIBHACKRF_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)

-#include(${QT_USE_FILE})
-#add_definitions(${QT_DEFINITIONS})
-add_definitions("${QT_DEFINITIONS} -DLIBHACKRF_DYN_RATES")
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(hackrfoutput_SOURCES
+        ${hackrfoutput_SOURCES}
+        hackrfoutputgui.cpp

-#qt4_wrap_cpp(hackrfoutput_HEADERS_MOC ${hackrfoutput_HEADERS})
-qt5_wrap_ui(hackrfoutput_FORMS_HEADERS ${hackrfoutput_FORMS})
+        hackrfoutputgui.ui
+    )
+    set(hackrfoutput_HEADERS
+        ${hackrfoutput_HEADERS}
+        hackrfoutputgui.h
+    )

-add_library(outputhackrf SHARED
-    ${hackrfoutput_SOURCES}
-    ${hackrfoutput_HEADERS_MOC}
-    ${hackrfoutput_FORMS_HEADERS}
+    set(TARGET_NAME outputhackrf)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME outputhackrfsrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
+	${hackrfoutput_SOURCES}
 )

-if (BUILD_DEBIAN)
-target_link_libraries(outputhackrf
-    ${QT_LIBRARIES}
-    hackrf
-    sdrbase
-    sdrgui
-    swagger
-    hackrfdevice
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
+	sdrbase
+	${TARGET_LIB_GUI}
+        swagger
+        ${LIBHACKRF_LIBRARIES}
+        hackrfdevice
 )
-else (BUILD_DEBIAN)
-target_link_libraries(outputhackrf
-    ${QT_LIBRARIES}
-    ${LIBHACKRF_LIBRARIES}
-    sdrbase
-    sdrgui
-    swagger
-    hackrfdevice
-)
-endif (BUILD_DEBIAN)

-target_link_libraries(outputhackrf Qt5::Core Qt5::Widgets)
-
-install(TARGETS outputhackrf DESTINATION lib/plugins/samplesink)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesink)
@@ -1,9 +1,6 @@
 project(limesdroutput)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(limesdroutput_SOURCES
-	limesdroutputgui.cpp
 	limesdroutput.cpp
 	limesdroutputplugin.cpp
 	limesdroutputsettings.cpp
@@ -11,77 +8,54 @@ set(limesdroutput_SOURCES
 )

 set(limesdroutput_HEADERS
-	limesdroutputgui.h
 	limesdroutput.h
 	limesdroutputplugin.h
 	limesdroutputsettings.h
 	limesdroutputthread.h
 )

-set(limesdroutput_FORMS
-	limesdroutputgui.ui
-)
-
-if (BUILD_DEBIAN)
 include_directories(
-        .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
-    ${CMAKE_SOURCE_DIR}/devices    
-    ${LIBLIMESUITESRC}/src
-    ${LIBLIMESUITESRC}/src/ADF4002
-    ${LIBLIMESUITESRC}/src/ConnectionRegistry
-    ${LIBLIMESUITESRC}/src/FPGA_common
-    ${LIBLIMESUITESRC}/src/GFIR
-    ${LIBLIMESUITESRC}/src/lms7002m
-    ${LIBLIMESUITESRC}/src/lms7002m_mcu
-    ${LIBLIMESUITESRC}/src/Si5351C
-    ${LIBLIMESUITESRC}/src/protocols
-)
-else (BUILD_DEBIAN)
-include_directories(
-	.
 	${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+        ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 	${CMAKE_SOURCE_DIR}/devices
 	${LIMESUITE_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)

-#include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(limesdroutput_SOURCES
+        ${limesdroutput_SOURCES}
+        limesdroutputgui.cpp

-#qt4_wrap_cpp(limesdroutput_HEADERS_MOC ${limesdroutput_HEADERS})
-qt5_wrap_ui(limesdroutput_FORMS_HEADERS ${limesdroutput_FORMS})
+        limesdroutputgui.ui
+    )
+    set(limesdroutput_HEADERS
+        ${limesdroutput_HEADERS}
+        limesdroutputgui.h
+    )

-add_library(outputlimesdr SHARED
+    set(TARGET_NAME outputlimesdr)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME outputlimesdrsrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
 	${limesdroutput_SOURCES}
-	${limesdroutput_HEADERS_MOC}
-	${limesdroutput_FORMS_HEADERS}
 )

-if (BUILD_DEBIAN)
-target_link_libraries(outputlimesdr
-    ${QT_LIBRARIES}
-    limesuite
-    sdrbase
-    sdrgui
-    swagger
-    limesdrdevice
-)
-else (BUILD_DEBIAN)
-target_link_libraries(outputlimesdr
-	${QT_LIBRARIES}
-	${LIMESUITE_LIBRARY}
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
-	swagger
-	limesdrdevice
+	${TARGET_LIB_GUI}
+        swagger
+        ${LIMESUITE_LIBRARY}
+        limesdrdevice
 )
-endif (BUILD_DEBIAN)

-target_link_libraries(outputlimesdr Qt5::Core Qt5::Widgets)
-
-install(TARGETS outputlimesdr DESTINATION lib/plugins/samplesink)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesink)
@@ -1,9 +1,6 @@
 project(plutosdroutput)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(plutosdroutput_SOURCES
-    plutosdroutputgui.cpp
    plutosdroutput.cpp
    plutosdroutputplugin.cpp
    plutosdroutputsettings.cpp
@@ -11,69 +8,54 @@ set(plutosdroutput_SOURCES
 )

 set(plutosdroutput_HEADERS
-    plutosdroutputgui.h
    plutosdroutput.h
    plutosdroutputplugin.h
    plutosdroutputsettings.h
    plutosdroutputthread.h
 )

-set(plutosdroutput_FORMS
-    plutosdroutputgui.ui
-)
-
-if (BUILD_DEBIAN)
 include_directories(
-    .
    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
-    ${CMAKE_SOURCE_DIR}/devices    
-    ${LIBIIOSRC}
-)
-else (BUILD_DEBIAN)
-include_directories(
-        .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
-    ${CMAKE_SOURCE_DIR}/devices    
+    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+    ${CMAKE_SOURCE_DIR}/devices
    ${LIBIIO_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)

-#include(${QT_USE_FILE})
-#add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(plutosdroutput_SOURCES
+        ${plutosdroutput_SOURCES}
+        plutosdroutputgui.cpp

-#qt4_wrap_cpp(plutosdroutput_HEADERS_MOC ${plutosdroutput_HEADERS})
-qt5_wrap_ui(plutosdroutput_FORMS_HEADERS ${plutosdroutput_FORMS})
+        plutosdroutputgui.ui
+    )
+    set(plutosdroutput_HEADERS
+        ${plutosdroutput_HEADERS}
+        plutosdroutputgui.h
+    )

-add_library(outputplutosdr SHARED
-    ${plutosdroutput_SOURCES}
-    ${plutosdroutput_HEADERS_MOC}
-    ${plutosdroutput_FORMS_HEADERS}
+    set(TARGET_NAME outputplutosdr)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME outputplutosdrsrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
+	${plutosdroutput_SOURCES}
 )

-if (BUILD_DEBIAN)
-target_link_libraries(outputplutosdr
-    ${QT_LIBRARIES}
-    iio
-    sdrbase
-    sdrgui
-    swagger
-    plutosdrdevice
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
+	sdrbase
+	${TARGET_LIB_GUI}
+        swagger
+        ${LIBIIO_LIBRARIES}
+        plutosdrdevice
 )
-else (BUILD_DEBIAN)
-target_link_libraries(outputplutosdr
-    ${QT_LIBRARIES}
-    ${LIBIIO_LIBRARIES}
-    sdrbase
-    sdrgui
-    swagger
-    plutosdrdevice
-)
-endif (BUILD_DEBIAN)

-qt5_use_modules(outputplutosdr Core Widgets)
-
-install(TARGETS outputplutosdr DESTINATION lib/plugins/samplesink)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesink)
@@ -1,7 +1,5 @@
 project(remoteoutput)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 if (HAS_SSSE3)
    message(STATUS "RemoteFEC: use SSSE3 SIMD" )
 elseif (HAS_NEON)
@@ -12,76 +10,63 @@ else()
 endif()

 set(remoteoutput_SOURCES
-	remoteoutputgui.cpp
 	remoteoutput.cpp
 	remoteoutputplugin.cpp
 	remoteoutputsettings.cpp
 	remoteoutputthread.cpp
-    udpsinkfec.cpp
-    udpsinkfecworker.cpp
+        udpsinkfec.cpp
+        udpsinkfecworker.cpp
 )

 set(remoteoutput_HEADERS
-	remoteoutputgui.h
 	remoteoutput.h
 	remoteoutputplugin.h
 	remoteoutputsettings.h
 	remoteoutputthread.h
-    udpsinkfec.h
-    udpsinkfecworker.h
+        udpsinkfec.h
+        udpsinkfecworker.h
 )

-set(remoteoutput_FORMS
-	remoteoutputgui.ui
-)
-
-if (BUILD_DEBIAN)
 include_directories(
-    .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
-    ${LIBCM256CCSRC}/..
-)
-else (BUILD_DEBIAN)
-include_directories(
-	.
-	${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+        ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 	${CMAKE_SOURCE_DIR}/devices
-    ${CM256CC_INCLUDE_DIR}
+        ${CM256CC_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)

-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(remoteoutput_SOURCES
+        ${remoteoutput_SOURCES}
+        remoteoutputgui.cpp

-qt5_wrap_ui(remoteoutput_FORMS_HEADERS ${remoteoutput_FORMS})
+        remoteoutputgui.ui
+    )
+    set(remoteoutput_HEADERS
+        ${remoteoutput_HEADERS}
+        remoteoutputgui.h
+    )

-add_library(outputremote SHARED
+    set(TARGET_NAME outputremote)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
+else()
+    set(TARGET_NAME outputremotesrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
+endif()
+
+add_library(${TARGET_NAME} SHARED
 	${remoteoutput_SOURCES}
-	${remoteoutput_HEADERS_MOC}
-	${remoteoutput_FORMS_HEADERS}
 )

-if (BUILD_DEBIAN)
-target_link_libraries(outputremote
-    ${QT_LIBRARIES}
-    sdrbase
-    sdrgui
-    swagger
-    cm256cc
-)
-else (BUILD_DEBIAN)
-target_link_libraries(outputremote
-	${QT_LIBRARIES}
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
-	swagger
-    ${CM256CC_LIBRARIES}
+	${TARGET_LIB_GUI}
+        swagger
+        ${CM256CC_LIBRARIES}
 )
-endif (BUILD_DEBIAN)

-target_link_libraries(outputremote Qt5::Core Qt5::Widgets)
-
-install(TARGETS outputremote DESTINATION lib/plugins/samplesink)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER})
@@ -1,9 +1,6 @@
 project(soapysdroutput)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(soapysdroutput_SOURCES
-	soapysdroutputgui.cpp
 	soapysdroutput.cpp
 	soapysdroutputplugin.cpp
 	soapysdroutputsettings.cpp
@@ -11,68 +8,54 @@ set(soapysdroutput_SOURCES
 )

 set(soapysdroutput_HEADERS
-	soapysdroutputgui.h
 	soapysdroutput.h
 	soapysdroutputplugin.h
 	soapysdroutputsettings.h
 	soapysdroutputthread.h
 )

-set(soapysdroutput_FORMS
-	soapysdroutputgui.ui
-)
-
-if (BUILD_DEBIAN)
 include_directories(
-    .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
-    ${CMAKE_SOURCE_DIR}/devices
-    ${SOAPYSDR_SOURCE_DIR}/include
-    ${SOAPYSDR_SOURCE_DIR}/src
-)
-else (BUILD_DEBIAN)
-include_directories(
-	.
 	${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client	
+        ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 	${CMAKE_SOURCE_DIR}/devices
 	${SOAPYSDR_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)

-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(soapysdroutput_SOURCES
+        ${soapysdroutput_SOURCES}
+        soapysdroutputgui.cpp

-qt5_wrap_ui(soapysdroutput_FORMS_HEADERS ${soapysdroutput_FORMS})
+        soapysdroutputgui.ui
+    )
+    set(soapysdroutput_HEADERS
+        ${soapysdroutput_HEADERS}
+        soapysdroutputgui.h
+    )

-add_library(outputsoapysdr SHARED
+    set(TARGET_NAME outputsoapysdr)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME outputsoapysdrsrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
 	${soapysdroutput_SOURCES}
-	${soapysdroutput_HEADERS_MOC}
-	${soapysdroutput_FORMS_HEADERS}
 )

-if (BUILD_DEBIAN)
-target_link_libraries(outputsoapysdr
-    ${QT_LIBRARIES}
-    SoapySDR
-    sdrbase
-    sdrgui
-    swagger
-    soapysdrdevice
-)
-else (BUILD_DEBIAN)
-target_link_libraries(outputsoapysdr
-	${QT_LIBRARIES}
-	${SOAPYSDR_LIBRARY}
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
-	swagger
-	soapysdrdevice
+	${TARGET_LIB_GUI}
+        swagger
+        ${SOAPYSDR_LIBRARY}
+        soapysdrdevice
 )
-endif (BUILD_DEBIAN)

-target_link_libraries(outputsoapysdr Qt5::Core Qt5::Widgets)
-
-install(TARGETS outputsoapysdr DESTINATION lib/plugins/samplesink)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesink)
@@ -1,9 +1,6 @@
 project(xtrxoutput)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(xtrxoutput_SOURCES
-	xtrxoutputgui.cpp
 	xtrxoutput.cpp
 	xtrxoutputplugin.cpp
 	xtrxoutputsettings.cpp
@@ -11,46 +8,54 @@ set(xtrxoutput_SOURCES
 )

 set(xtrxoutput_HEADERS
-	xtrxoutputgui.h
 	xtrxoutput.h
 	xtrxoutputplugin.h
 	xtrxoutputsettings.h
 	xtrxoutputthread.h
 )

-set(xtrxoutput_FORMS
-	xtrxoutputgui.ui
-)
-
 include_directories(
-	.
 	${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+        ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 	${CMAKE_SOURCE_DIR}/devices
 	${LIBXTRX_INCLUDE_DIRS}
 )

-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(xtrxoutput_SOURCES
+        ${xtrxoutput_SOURCES}
+        xtrxoutputgui.cpp

-qt5_wrap_ui(xtrxoutput_FORMS_HEADERS ${xtrxoutput_FORMS})
+        xtrxoutputgui.ui
+    )
+    set(xtrxoutput_HEADERS
+        ${xtrxoutput_HEADERS}
+        xtrxoutputgui.h
+    )

-add_library(outputxtrx SHARED
+    set(TARGET_NAME outputxtrx)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME outputxtrxsrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
 	${xtrxoutput_SOURCES}
-	${xtrxoutput_HEADERS_MOC}
-	${xtrxoutput_FORMS_HEADERS}
 )

-target_link_libraries(outputxtrx
-	${QT_LIBRARIES}
-    ${LIBXTRX_LIBRARY}
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
-	swagger
-	xtrxdevice
+	${TARGET_LIB_GUI}
+        swagger
+        ${LIBXTRX_LIBRARY}
+        xtrxdevice
 )

-target_link_libraries(outputxtrx Qt5::Core Qt5::Widgets)
-
-install(TARGETS outputxtrx DESTINATION lib/plugins/samplesink)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesink)
@@ -1,106 +1,60 @@
 project(samplesource)

-find_package(LibUSB)
+add_subdirectory(filesource)
+add_subdirectory(testsource)
+add_subdirectory(localinput)

-if(V4L-RTL)
-    FIND_LIBRARY (LIBV4L2 v4l2)
-    FIND_PATH (LIBV4L2H libv4l2.h)
-#   add_subdirectory(v4l-rtl)
-endif()
-if(V4L-MSI)
-    FIND_LIBRARY (LIBV4L2 v4l2)
-    FIND_PATH (LIBV4L2H libv4l2.h)
-#   add_subdirectory(v4l-msi)
-endif()
-
-find_package(LibAIRSPY)
-if(LIBUSB_FOUND AND LIBAIRSPY_FOUND)
-    add_subdirectory(airspy)
-endif(LIBUSB_FOUND AND LIBAIRSPY_FOUND)
-
-find_package(LibAIRSPYHF)
-if(LIBUSB_FOUND AND LIBAIRSPYHF_FOUND)
-    add_subdirectory(airspyhf)
-endif(LIBUSB_FOUND AND LIBAIRSPYHF_FOUND)
-
-find_package(LibBLADERF)
-if(LIBUSB_FOUND AND LIBBLADERF_FOUND)
-    add_subdirectory(bladerf1input)
-    add_subdirectory(bladerf2input)
-endif(LIBUSB_FOUND AND LIBBLADERF_FOUND)
-
-if(LIBUSB_FOUND)
-    add_subdirectory(fcdpro)
-    add_subdirectory(fcdproplus)
-endif(LIBUSB_FOUND)
-
-find_package(LibHACKRF)
-if(LIBUSB_FOUND AND LIBHACKRF_FOUND)
-    add_subdirectory(hackrfinput)
-endif(LIBUSB_FOUND AND LIBHACKRF_FOUND)
-
-find_package(LimeSuite)
-if(LIBUSB_FOUND AND LIMESUITE_FOUND)
-    add_subdirectory(limesdrinput)
-endif(LIBUSB_FOUND AND LIMESUITE_FOUND)
-
-find_package(LibPerseus)
-if(LIBUSB_FOUND AND RX_SAMPLE_24BIT AND LIBPERSEUS_FOUND)
-    message(STATUS "Add Persesus plugin")
-    add_subdirectory(perseus)
-endif(LIBUSB_FOUND AND RX_SAMPLE_24BIT AND LIBPERSEUS_FOUND)
-
-find_package(LibXTRX)
-if(LIBXTRX_FOUND)
-	add_subdirectory(xtrxinput)
-endif(LIBXTRX_FOUND)
-
-find_package(LibIIO)
-if(LIBUSB_FOUND AND LIBIIO_FOUND)
-    add_subdirectory(plutosdrinput)
-endif(LIBUSB_FOUND AND LIBIIO_FOUND)
-
-find_package(LibRTLSDR)
-if(LIBUSB_FOUND AND LIBRTLSDR_FOUND)
-    add_subdirectory(rtlsdr)
-endif(LIBUSB_FOUND AND LIBRTLSDR_FOUND)
-
-find_package(CM256cc)
 if(CM256CC_FOUND)
    add_subdirectory(remoteinput)
 endif(CM256CC_FOUND)

-find_package(LibMiriSDR)
-if(LIBUSB_FOUND AND LIBMIRISDR_FOUND)
-    add_subdirectory(sdrplay)
-    message(STATUS "LibMiriSDR found")
-else(LIBUSB_FOUND AND LIBMIRISDR_FOUND)
-    message(STATUS "LibMiriSDR NOT found")
-endif(LIBUSB_FOUND AND LIBMIRISDR_FOUND)
-
-find_package(SoapySDR)
-if(SOAPYSDR_FOUND)
-	add_subdirectory(soapysdrinput)
-	message(STATUS "SoapySDR found")
-else()
-	message(STATUS "SoapySDR not found")
+if(ENABLE_AIRSPY AND LIBAIRSPY_FOUND)
+    add_subdirectory(airspy)
 endif()

-if (BUILD_DEBIAN)
-    add_subdirectory(airspy)
+if(ENABLE_AIRSPYHF AND LIBAIRSPYHF_FOUND)
    add_subdirectory(airspyhf)
+endif()
+
+if(ENABLE_BLADERF AND LIBBLADERF_FOUND)
    add_subdirectory(bladerf1input)
    add_subdirectory(bladerf2input)
-    add_subdirectory(hackrfinput)
-    add_subdirectory(limesdrinput)
-    add_subdirectory(perseus)
-    add_subdirectory(plutosdrinput)
-    add_subdirectory(rtlsdr)
-    add_subdirectory(remoteinput)
-    add_subdirectory(sdrplay)
-    add_subdirectory(soapysdrinput)
-endif (BUILD_DEBIAN)
+endif()
+
+if(ENABLE_FUNCUBE AND UNIX AND LIBUSB_FOUND)
+    add_subdirectory(fcdpro)
+    add_subdirectory(fcdproplus)
+endif()
+
+if(ENABLE_HACKRF AND LIBHACKRF_FOUND)
+    add_subdirectory(hackrfinput)
+endif()
+
+if(ENABLE_LIMESUITE AND LIMESUITE_FOUND)
+    add_subdirectory(limesdrinput)
+endif()
+
+if(ENABLE_MIRISDR AND LIBMIRISDR_FOUND)
+    add_subdirectory(sdrplay)
+endif()
+
+if(ENABLE_PERSEUS AND LIBPERSEUS_FOUND AND RX_SAMPLE_24BIT)
+    add_subdirectory(perseus)
+endif()
+
+if(ENABLE_XTRX AND LIBXTRX_FOUND)
+    add_subdirectory(xtrxinput)
+endif()
+
+if(ENABLE_IIO AND LIBIIO_FOUND)
+    add_subdirectory(plutosdrinput)
+endif()
+
+if(ENABLE_RTLSDR AND LIBRTLSDR_FOUND)
+    add_subdirectory(rtlsdr)
+endif()
+
+if(ENABLE_SOAPYSDR AND SOAPYSDR_FOUND)
+    add_subdirectory(soapysdrinput)
+endif()

-add_subdirectory(filesource)
-add_subdirectory(localinput)
-add_subdirectory(testsource)
@@ -1,9 +1,6 @@
 project(airspy)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(airspy_SOURCES
-    airspygui.cpp
    airspyinput.cpp
    airspyplugin.cpp
    airspysettings.cpp
@@ -11,68 +8,52 @@ set(airspy_SOURCES
 )

 set(airspy_HEADERS
-    airspygui.h
    airspyinput.h
    airspyplugin.h
    airspysettings.h
    airspythread.h
 )

-set(airspy_FORMS
-    airspygui.ui
-)
-
-if (BUILD_DEBIAN)
 include_directories(
-    .
    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client        
-    ${LIBAIRSPYSRC}
-    ${LIBAIRSPYSRC}/libairspy/src
-)
-else (BUILD_DEBIAN)
-include_directories(
-    .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client        
+    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
    ${LIBAIRSPY_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)

-#include(${QT_USE_FILE})
-#add_definitions(${QT_DEFINITIONS})
-add_definitions("${QT_DEFINITIONS} -DLIBAIRSPY_DYN_RATES")
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(airspy_SOURCES
+        ${airspy_SOURCES}
+        airspygui.cpp

-#qt4_wrap_cpp(airspy_HEADERS_MOC ${airspy_HEADERS})
-qt5_wrap_ui(airspy_FORMS_HEADERS ${airspy_FORMS})
+        airspygui.ui
+    )
+    set(airspy_HEADERS
+        ${airspy_HEADERS}
+        airspygui.h
+    )

-add_library(inputairspy SHARED
-    ${airspy_SOURCES}
-    ${airspy_HEADERS_MOC}
-    ${airspy_FORMS_HEADERS}
+    set(TARGET_NAME inputairspy)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME inputairspysrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
+	${airspy_SOURCES}
 )

-if (BUILD_DEBIAN)
-target_link_libraries(inputairspy
-    ${QT_LIBRARIES}
-    airspy
-    sdrbase
-    sdrgui
-    swagger
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
+	sdrbase
+	${TARGET_LIB_GUI}
+        swagger
+        ${LIBAIRSPY_LIBRARIES}
 )
-else (BUILD_DEBIAN)
-target_link_libraries(inputairspy
-    ${QT_LIBRARIES}
-    ${LIBAIRSPY_LIBRARIES}
-    sdrbase
-    sdrgui
-    swagger
-)
-endif (BUILD_DEBIAN)

-
-target_link_libraries(inputairspy Qt5::Core Qt5::Widgets)
-
-install(TARGETS inputairspy DESTINATION lib/plugins/samplesource)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesource)
@@ -1,9 +1,6 @@
 project(airspyhf)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(airspyhf_SOURCES
-    airspyhfgui.cpp
    airspyhfinput.cpp
    airspyhfplugin.cpp
    airspyhfsettings.cpp
@@ -11,68 +8,52 @@ set(airspyhf_SOURCES
 )

 set(airspyhf_HEADERS
-    airspyhfgui.h
    airspyhfinput.h
    airspyhfplugin.h
    airspyhfsettings.h
    airspyhfthread.h
 )

-set(airspyhf_FORMS
-    airspyhfgui.ui
-)
-
-if (BUILD_DEBIAN)
 include_directories(
-    .
    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client        
-    ${LIBAIRSPYHFSRC}
-    ${LIBAIRSPYHFSRC}/libairspyhf/src
-)
-else (BUILD_DEBIAN)
-include_directories(
-    .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client        
+    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
    ${LIBAIRSPYHF_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)

-#include(${QT_USE_FILE})
-#add_definitions(${QT_DEFINITIONS})
-add_definitions("${QT_DEFINITIONS} -DLIBAIRSPY_DYN_RATES")
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(airspyhf_SOURCES
+        ${airspyhf_SOURCES}
+        airspyhfgui.cpp

-#qt4_wrap_cpp(airspyhf_HEADERS_MOC ${airspyhf_HEADERS})
-qt5_wrap_ui(airspyhf_FORMS_HEADERS ${airspyhf_FORMS})
+        airspyhfgui.ui
+    )
+    set(airspyhf_HEADERS
+        ${airspyhf_HEADERS}
+        airspyhfgui.h
+    )

-add_library(inputairspyhf SHARED
-    ${airspyhf_SOURCES}
-    ${airspyhf_HEADERS_MOC}
-    ${airspyhf_FORMS_HEADERS}
+    set(TARGET_NAME inputairspyhf)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME inputairspyhfsrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
+	${airspyhf_SOURCES}
 )

-if (BUILD_DEBIAN)
-target_link_libraries(inputairspyhf
-    ${QT_LIBRARIES}
-    airspyhf
-    sdrbase
-    sdrgui
-    swagger
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
+	sdrbase
+	${TARGET_LIB_GUI}
+        swagger
+        ${LIBAIRSPYHF_LIBRARIES}
 )
-else (BUILD_DEBIAN)
-target_link_libraries(inputairspyhf
-    ${QT_LIBRARIES}
-    ${LIBAIRSPYHF_LIBRARIES}
-    sdrbase
-    sdrgui
-    swagger
-)
-endif (BUILD_DEBIAN)

-
-qt5_use_modules(inputairspyhf Core Widgets)
-
-install(TARGETS inputairspyhf DESTINATION lib/plugins/samplesource)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesource)
@@ -1,9 +1,6 @@
 project(bladerf1input)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(bladerf1input_SOURCES
-	bladerf1inputgui.cpp
 	bladerf1input.cpp
 	bladerf1inputplugin.cpp
 	bladerf1inputsettings.cpp
@@ -11,70 +8,54 @@ set(bladerf1input_SOURCES
 )

 set(bladerf1input_HEADERS
-	bladerf1inputgui.h
 	bladerf1input.h
 	bladerf1inputplugin.h
 	bladerf1inputsettings.h
 	bladerf1inputthread.h
 )

-set(bladerf1input_FORMS
-	bladerf1inputgui.ui
-)
-
-if (BUILD_DEBIAN)
 include_directories(
-    .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
-    ${CMAKE_SOURCE_DIR}/devices
-    ${LIBBLADERFLIBSRC}/include
-    ${LIBBLADERFLIBSRC}/src
-)
-else (BUILD_DEBIAN)
-include_directories(
-	.
 	${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+        ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 	${CMAKE_SOURCE_DIR}/devices
 	${LIBBLADERF_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)

-#include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(bladerf1input_SOURCES
+        ${bladerf1input_SOURCES}
+        bladerf1inputgui.cpp

-#qt4_wrap_cpp(bladerf1input_HEADERS_MOC ${bladerf1input_HEADERS})
-qt5_wrap_ui(bladerf1input_FORMS_HEADERS ${bladerf1input_FORMS})
+        bladerf1inputgui.ui
+    )
+    set(bladerf1input_HEADERS
+        ${bladerf1input_HEADERS}
+        bladerf1inputgui.h
+    )

-add_library(inputbladerf1 SHARED
+    set(TARGET_NAME inputbladerf1)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME inputbladerf1srv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
 	${bladerf1input_SOURCES}
-	${bladerf1input_HEADERS_MOC}
-	${bladerf1input_FORMS_HEADERS}
 )

-if (BUILD_DEBIAN)
-target_link_libraries(inputbladerf1
-    ${QT_LIBRARIES}
-    bladerf
-    sdrbase
-    sdrgui
-    swagger
-    bladerf1device
-)
-else (BUILD_DEBIAN)
-target_link_libraries(inputbladerf1
-	${QT_LIBRARIES}
-	${LIBBLADERF_LIBRARIES}
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
-	swagger
-	bladerf1device
+	${TARGET_LIB_GUI}
+        swagger
+        ${LIBBLADERF_LIBRARIES}
+        bladerf1device
 )
-endif (BUILD_DEBIAN)

-target_link_libraries(inputbladerf1 Qt5::Core Qt5::Widgets)
-
-install(TARGETS inputbladerf1 DESTINATION lib/plugins/samplesource)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesource)
@@ -1,9 +1,6 @@
 project(bladerf2input)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(bladerf2input_SOURCES
-	bladerf2inputgui.cpp
 	bladerf2input.cpp
 	bladerf2inputplugin.cpp
 	bladerf2inputsettings.cpp
@@ -11,69 +8,54 @@ set(bladerf2input_SOURCES
 )

 set(bladerf2input_HEADERS
-	bladerf2inputgui.h
 	bladerf2input.h
 	bladerf2inputplugin.h
 	bladerf2inputsettings.h
 	bladerf2inputthread.h
 )

-set(bladerf2input_FORMS
-	bladerf2inputgui.ui
-)
-
-if (BUILD_DEBIAN)
 include_directories(
-    .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
-    ${CMAKE_SOURCE_DIR}/devices
-    ${LIBBLADERFLIBSRC}/include
-    ${LIBBLADERFLIBSRC}/src
-)
-else (BUILD_DEBIAN)
-include_directories(
-	.
 	${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+        ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 	${CMAKE_SOURCE_DIR}/devices
 	${LIBBLADERF_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)

-#include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(bladerf2input_SOURCES
+        ${bladerf2input_SOURCES}
+        bladerf2inputgui.cpp

-qt5_wrap_ui(bladerf2input_FORMS_HEADERS ${bladerf2input_FORMS})
+        bladerf2inputgui.ui
+    )
+    set(bladerf2input_HEADERS
+        ${bladerf2input_HEADERS}
+        bladerf2inputgui.h
+    )

-add_library(inputbladerf2 SHARED
+    set(TARGET_NAME inputbladerf2)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME inputbladerf2srv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
 	${bladerf2input_SOURCES}
-	${bladerf2input_HEADERS_MOC}
-	${bladerf2input_FORMS_HEADERS}
 )

-if (BUILD_DEBIAN)
-target_link_libraries(inputbladerf2
-    ${QT_LIBRARIES}
-    bladerf
-    sdrbase
-    sdrgui
-    swagger
-    bladerf2device
-)
-else (BUILD_DEBIAN)
-target_link_libraries(inputbladerf2
-	${QT_LIBRARIES}
-	${LIBBLADERF_LIBRARIES}
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
-	swagger
-	bladerf2device
+	${TARGET_LIB_GUI}
+        swagger
+        ${LIBBLADERF_LIBRARIES}
+        bladerf2device
 )
-endif (BUILD_DEBIAN)

-target_link_libraries(inputbladerf2 Qt5::Core Qt5::Widgets)
-
-install(TARGETS inputbladerf2 DESTINATION lib/plugins/samplesource)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesource)
@@ -1,9 +1,6 @@
 project(fcdpro)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(fcdpro_SOURCES
-	fcdprogui.cpp
 	fcdproinput.cpp
 	fcdproplugin.cpp
 	fcdprosettings.cpp
@@ -11,48 +8,54 @@ set(fcdpro_SOURCES
 )

 set(fcdpro_HEADERS
-	fcdprogui.h
 	fcdproinput.h
 	fcdproplugin.h
 	fcdprosettings.h
 	fcdprothread.h
 )

-set(fcdpro_FORMS
-	fcdprogui.ui
-)
-
 include_directories(
-	.
 	${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
-	${CMAKE_SOURCE_DIR}/fcdhid
+        ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+        ${CMAKE_SOURCE_DIR}/fcdhid
 	${CMAKE_SOURCE_DIR}/fcdlib
 )

-#include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(fcdpro_SOURCES
+        ${fcdpro_SOURCES}
+        fcdprogui.cpp

-#qt4_wrap_cpp(fcdpro_HEADERS_MOC ${fcdpro_HEADERS})
-qt5_wrap_ui(fcdpro_FORMS_HEADERS ${fcdpro_FORMS})
+        fcdprogui.ui
+    )
+    set(fcdpro_HEADERS
+        ${fcdpro_HEADERS}
+        fcdprogui.h
+    )

-add_library(inputfcdpro SHARED
+    set(TARGET_NAME inputfcdpro)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME inputfcdprosrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
 	${fcdpro_SOURCES}
-	${fcdpro_HEADERS_MOC}
-	${fcdpro_FORMS_HEADERS}
 )

-target_link_libraries(inputfcdpro
-	${QT_LIBRARIES}
-	fcdhid
-	fcdlib
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
-	swagger
+	${TARGET_LIB_GUI}
+        swagger
+        fcdhid
+        fcdlib
 )

-target_link_libraries(inputfcdpro Qt5::Core Qt5::Widgets)
-
-install(TARGETS inputfcdpro DESTINATION lib/plugins/samplesource)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesource)
@@ -1,9 +1,6 @@
 project(fcdproplus)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(fcdproplus_SOURCES
-	fcdproplusgui.cpp
 	fcdproplusinput.cpp
 	fcdproplusplugin.cpp
 	fcdproplussettings.cpp
@@ -11,48 +8,54 @@ set(fcdproplus_SOURCES
 )

 set(fcdproplus_HEADERS
-	fcdproplusgui.h
 	fcdproplusinput.h
 	fcdproplusplugin.h
 	fcdproplussettings.h
 	fcdproplusthread.h
 )

-set(fcdproplus_FORMS
-	fcdproplusgui.ui
-)
-
 include_directories(
-	.
 	${CMAKE_CURRENT_BINARY_DIR}
-        ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
+        ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 	${CMAKE_SOURCE_DIR}/fcdhid
 	${CMAKE_SOURCE_DIR}/fcdlib
 )

-#include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(fcdproplus_SOURCES
+        ${fcdproplus_SOURCES}
+        fcdproplusgui.cpp

-#qt4_wrap_cpp(fcdproplus_HEADERS_MOC ${fcdproplus_HEADERS})
-qt5_wrap_ui(fcdproplus_FORMS_HEADERS ${fcdproplus_FORMS})
+        fcdproplusgui.ui
+    )
+    set(fcdproplus_HEADERS
+        ${fcdproplus_HEADERS}
+        fcdproplusgui.h
+    )

-add_library(inputfcdproplus SHARED
+    set(TARGET_NAME inputfcdproplus)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME inputfcdproplussrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
 	${fcdproplus_SOURCES}
-	${fcdproplus_HEADERS_MOC}
-	${fcdproplus_FORMS_HEADERS}
 )

-target_link_libraries(inputfcdproplus
-	${QT_LIBRARIES}
-	fcdhid
-	fcdlib
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
-	swagger
+	${TARGET_LIB_GUI}
+        swagger
+        fcdhid
+        fcdlib
 )

-target_link_libraries(inputfcdproplus Qt5::Core Qt5::Widgets)
-
-install(TARGETS inputfcdproplus DESTINATION lib/plugins/samplesource)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesource)
@@ -1,9 +1,6 @@
 project(filesource)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(filesource_SOURCES
-	filesourcegui.cpp
 	filesourceinput.cpp
 	filesourceplugin.cpp
 	filesourcethread.cpp
@@ -11,44 +8,50 @@ set(filesource_SOURCES
 )

 set(filesource_HEADERS
-	filesourcegui.h
 	filesourceinput.h
 	filesourceplugin.h
 	filesourcethread.h
 	filesourcesettings.h
 )

-set(filesource_FORMS
-	filesourcegui.ui
-)
-
 include_directories(
-	.
 	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 )

-#include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(filesource_SOURCES
+        ${filesource_SOURCES}
+        filesourcegui.cpp

-#qt4_wrap_cpp(filesource_HEADERS_MOC ${filesource_HEADERS})
-qt5_wrap_ui(filesource_FORMS_HEADERS ${filesource_FORMS})
+        filesourcegui.ui
+    )
+    set(filesource_HEADERS
+        ${filesource_HEADERS}
+        filesourcegui.h
+    )

-add_library(inputfilesource SHARED
+    set(TARGET_NAME inputfilesource)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME inputfilesourcesrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
 	${filesource_SOURCES}
-	${filesource_HEADERS_MOC}
-	${filesource_FORMS_HEADERS}
 )

-target_link_libraries(inputfilesource
-	${QT_LIBRARIES}
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
-	swagger
+	${TARGET_LIB_GUI}
+        swagger
 )

-target_link_libraries(inputfilesource Qt5::Core Qt5::Widgets)
-
-install(TARGETS inputfilesource DESTINATION lib/plugins/samplesource)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesource)
@@ -1,9 +1,6 @@
 project(hackrfinput)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(hackrfinput_SOURCES
-    hackrfinputgui.cpp
    hackrfinput.cpp
    hackrfinputplugin.cpp
    hackrfinputsettings.cpp
@@ -11,71 +8,54 @@ set(hackrfinput_SOURCES
 )

 set(hackrfinput_HEADERS
-    hackrfinputgui.h
    hackrfinput.h
    hackrfinputplugin.h
    hackrfinputsettings.h
    hackrfinputthread.h
 )

-set(hackrfinput_FORMS
-    hackrfinputgui.ui
-)
-
-if (BUILD_DEBIAN)
 include_directories(
-        .
    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
-    ${CMAKE_SOURCE_DIR}/devices    
-    ${LIBHACKRFSRC}
-    ${LIBHACKRFSRC}/libhackrf/src
-)
-else (BUILD_DEBIAN)
-include_directories(
-        .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
-    ${CMAKE_SOURCE_DIR}/devices    
+    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+    ${CMAKE_SOURCE_DIR}/devices
    ${LIBHACKRF_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)

-#include(${QT_USE_FILE})
-#add_definitions(${QT_DEFINITIONS})
-add_definitions("${QT_DEFINITIONS} -DLIBHACKRF_DYN_RATES")
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(hackrfinput_SOURCES
+        ${hackrfinput_SOURCES}
+        hackrfinputgui.cpp

-#qt4_wrap_cpp(hackrfinput_HEADERS_MOC ${hackrfinput_HEADERS})
-qt5_wrap_ui(hackrfinput_FORMS_HEADERS ${hackrfinput_FORMS})
+        hackrfinputgui.ui
+    )
+    set(hackrfinput_HEADERS
+        ${hackrfinput_HEADERS}
+        hackrfinputgui.h
+    )

-add_library(inputhackrf SHARED
-    ${hackrfinput_SOURCES}
-    ${hackrfinput_HEADERS_MOC}
-    ${hackrfinput_FORMS_HEADERS}
+    set(TARGET_NAME inputhackrf)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME inputhackrfsrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
+	${hackrfinput_SOURCES}
 )

-if (BUILD_DEBIAN)
-target_link_libraries(inputhackrf
-    ${QT_LIBRARIES}
-    hackrf
-    sdrbase
-    sdrgui
-    swagger
-    hackrfdevice
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
+	sdrbase
+	${TARGET_LIB_GUI}
+        swagger
+        ${LIBHACKRF_LIBRARIES}
+        hackrfdevice
 )
-else (BUILD_DEBIAN)
-target_link_libraries(inputhackrf
-    ${QT_LIBRARIES}
-    ${LIBHACKRF_LIBRARIES}
-    sdrbase
-    sdrgui
-    swagger
-    hackrfdevice
-)
-endif (BUILD_DEBIAN)

-target_link_libraries(inputhackrf Qt5::Core Qt5::Widgets)
-
-install(TARGETS inputhackrf DESTINATION lib/plugins/samplesource)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesource)
@@ -1,9 +1,6 @@
 project(limesdrinput)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(limesdrinput_SOURCES
-	limesdrinputgui.cpp
 	limesdrinput.cpp
 	limesdrinputplugin.cpp
 	limesdrinputsettings.cpp
@@ -11,77 +8,54 @@ set(limesdrinput_SOURCES
 )

 set(limesdrinput_HEADERS
-	limesdrinputgui.h
 	limesdrinput.h
 	limesdrinputplugin.h
 	limesdrinputsettings.h
 	limesdrinputthread.h
 )

-set(limesdrinput_FORMS
-	limesdrinputgui.ui
-)
-
-if (BUILD_DEBIAN)
 include_directories(
-        .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
-    ${CMAKE_SOURCE_DIR}/devices    
-    ${LIBLIMESUITESRC}/src
-    ${LIBLIMESUITESRC}/src/ADF4002
-    ${LIBLIMESUITESRC}/src/ConnectionRegistry
-    ${LIBLIMESUITESRC}/src/FPGA_common
-    ${LIBLIMESUITESRC}/src/GFIR
-    ${LIBLIMESUITESRC}/src/lms7002m
-    ${LIBLIMESUITESRC}/src/lms7002m_mcu
-    ${LIBLIMESUITESRC}/src/Si5351C
-    ${LIBLIMESUITESRC}/src/protocols
-)
-else (BUILD_DEBIAN)
-include_directories(
-	.
 	${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client	
+        ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 	${CMAKE_SOURCE_DIR}/devices
 	${LIMESUITE_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)

-#include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(limesdrinput_SOURCES
+        ${limesdrinput_SOURCES}
+        limesdrinputgui.cpp

-#qt4_wrap_cpp(limesdrinput_HEADERS_MOC ${limesdrinput_HEADERS})
-qt5_wrap_ui(limesdrinput_FORMS_HEADERS ${limesdrinput_FORMS})
+        limesdrinputgui.ui
+    )
+    set(limesdrinput_HEADERS
+        ${limesdrinput_HEADERS}
+        limesdrinputgui.h
+    )

-add_library(inputlimesdr SHARED
+    set(TARGET_NAME inputlimesdr)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME inputlimesdrsrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
 	${limesdrinput_SOURCES}
-	${limesdrinput_HEADERS_MOC}
-	${limesdrinput_FORMS_HEADERS}
 )

-if (BUILD_DEBIAN)
-target_link_libraries(inputlimesdr
-    ${QT_LIBRARIES}
-    limesuite
-    sdrbase
-    sdrgui
-    swagger
-    limesdrdevice
-)
-else (BUILD_DEBIAN)
-target_link_libraries(inputlimesdr
-	${QT_LIBRARIES}
-	${LIMESUITE_LIBRARY}
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
-	swagger
-	limesdrdevice
+	${TARGET_LIB_GUI}
+        swagger
+        ${LIMESUITE_LIBRARY}
+        limesdrdevice
 )
-endif (BUILD_DEBIAN)

-target_link_libraries(inputlimesdr Qt5::Core Qt5::Widgets)
-
-install(TARGETS inputlimesdr DESTINATION lib/plugins/samplesource)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesource)
@@ -1,9 +1,6 @@
 project(perseus)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(perseus_SOURCES
-    perseusgui.cpp
    perseusinput.cpp
    perseusplugin.cpp
    perseussettings.cpp
@@ -11,72 +8,54 @@ set(perseus_SOURCES
 )

 set(perseus_HEADERS
-    perseusgui.h
    perseusinput.h
    perseusplugin.h
    perseussettings.h
    perseusthread.h
 )

-set(perseus_FORMS
-    perseusgui.ui
-)
-
-if (BUILD_DEBIAN)
 include_directories(
-    .
    ${CMAKE_CURRENT_BINARY_DIR}
    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
-    ${CMAKE_SOURCE_DIR}/devices        
-    ${LIBPERSEUSSRC}
-    ${LIBPERSEUSSRC}/libperseus/src
-)
-else (BUILD_DEBIAN)
-include_directories(
-    .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
-    ${CMAKE_SOURCE_DIR}/devices        
+    ${CMAKE_SOURCE_DIR}/devices
    ${LIBPERSEUS_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)

-#include(${QT_USE_FILE})
-#add_definitions(${QT_DEFINITIONS})
-add_definitions("${QT_DEFINITIONS} -DLIBAIRSPY_DYN_RATES")
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(perseus_SOURCES
+        ${perseus_SOURCES}
+        perseusgui.cpp

-#qt4_wrap_cpp(perseus_HEADERS_MOC ${perseus_HEADERS})
-qt5_wrap_ui(perseus_FORMS_HEADERS ${perseus_FORMS})
+        perseusgui.ui
+    )
+    set(perseus_HEADERS
+        ${perseus_HEADERS}
+        perseusgui.h
+    )

-add_library(inputperseus SHARED
-    ${perseus_SOURCES}
-    ${perseus_HEADERS_MOC}
-    ${perseus_FORMS_HEADERS}
+    set(TARGET_NAME inputperseus)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME inputperseussrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
+	${perseus_SOURCES}
 )

-if (BUILD_DEBIAN)
-target_link_libraries(inputperseus
-    ${QT_LIBRARIES}
-    perseus
-    sdrbase
-    sdrgui
-    swagger
-    perseusdevice
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
+	sdrbase
+	${TARGET_LIB_GUI}
+        swagger
+        ${LIBPERSEUS_LIBRARIES}
+        perseusdevice
 )
-else (BUILD_DEBIAN)
-target_link_libraries(inputperseus
-    ${QT_LIBRARIES}
-    ${LIBPERSEUS_LIBRARIES}
-    sdrbase
-    sdrgui
-    swagger
-    perseusdevice
-)
-endif (BUILD_DEBIAN)

-
-qt5_use_modules(inputperseus Core Widgets)
-
-install(TARGETS inputperseus DESTINATION lib/plugins/samplesource)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesource)
@@ -1,9 +1,6 @@
 project(plutosdrinput)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(plutosdrinput_SOURCES
-    plutosdrinputgui.cpp
    plutosdrinput.cpp
    plutosdrinputplugin.cpp
    plutosdrinputsettings.cpp
@@ -11,69 +8,54 @@ set(plutosdrinput_SOURCES
 )

 set(plutosdrinput_HEADERS
-    plutosdrinputgui.h
    plutosdrinput.h
    plutosdrinputplugin.h
    plutosdrinputsettings.h
    plutosdrinputthread.h
 )

-set(plutosdrinput_FORMS
-    plutosdrinputgui.ui
-)
-
-if (BUILD_DEBIAN)
 include_directories(
-    .
    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
-    ${CMAKE_SOURCE_DIR}/devices    
-    ${LIBIIOSRC}
-)
-else (BUILD_DEBIAN)
-include_directories(
-        .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
-    ${CMAKE_SOURCE_DIR}/devices    
+    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+    ${CMAKE_SOURCE_DIR}/devices
    ${LIBIIO_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)

-#include(${QT_USE_FILE})
-#add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(plutosdrinput_SOURCES
+        ${plutosdrinput_SOURCES}
+        plutosdrinputgui.cpp

-#qt4_wrap_cpp(plutosdrinput_HEADERS_MOC ${plutosdrinput_HEADERS})
-qt5_wrap_ui(plutosdrinput_FORMS_HEADERS ${plutosdrinput_FORMS})
+        plutosdrinputgui.ui
+    )
+    set(plutosdrinput_HEADERS
+        ${plutosdrinput_HEADERS}
+        plutosdrinputgui.h
+    )

-add_library(inputplutosdr SHARED
-    ${plutosdrinput_SOURCES}
-    ${plutosdrinput_HEADERS_MOC}
-    ${plutosdrinput_FORMS_HEADERS}
+    set(TARGET_NAME inputplutosdr)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME inputplutosdrsrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
+	${plutosdrinput_SOURCES}
 )

-if (BUILD_DEBIAN)
-target_link_libraries(inputplutosdr
-    ${QT_LIBRARIES}
-    iio
-    sdrbase
-    sdrgui
-    swagger
-    plutosdrdevice
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
+	sdrbase
+	${TARGET_LIB_GUI}
+        swagger
+        ${LIBIIO_LIBRARIES}
+        plutosdrdevice
 )
-else (BUILD_DEBIAN)
-target_link_libraries(inputplutosdr
-    ${QT_LIBRARIES}
-    ${LIBIIO_LIBRARIES}
-    sdrbase
-    sdrgui
-    swagger
-    plutosdrdevice
-)
-endif (BUILD_DEBIAN)

-qt5_use_modules(inputplutosdr Core Widgets)
-
-install(TARGETS inputplutosdr DESTINATION lib/plugins/samplesource)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesource)
@@ -1,7 +1,5 @@
 project(remoteinput)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 if (HAS_SSSE3)
    message(STATUS "RemoteInput: use SSSE3 SIMD" )
 elseif (HAS_NEON)
@@ -14,7 +12,6 @@ endif()
 set(remoteinput_SOURCES
    remoteinputbuffer.cpp
    remoteinputudphandler.cpp
-    remoteinputgui.cpp
    remoteinput.cpp
    remoteinputsettings.cpp
    remoteinputplugin.cpp
@@ -23,63 +20,51 @@ set(remoteinput_SOURCES
 set(remoteinput_HEADERS
    remoteinputbuffer.h
    remoteinputudphandler.h
-    remoteinputgui.h
    remoteinput.h
    remoteinputsettings.h
    remoteinputplugin.h
 )

-set(remoteinput_FORMS
-    remoteinputgui.ui
-)
-
-#include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-qt5_wrap_ui(remoteinput_FORMS_HEADERS ${remoteinput_FORMS})
-
-add_library(inputremote SHARED
-    ${remoteinput_SOURCES}
-    ${remoteinput_HEADERS_MOC}
-    ${remoteinput_FORMS_HEADERS}
-)
-
-if (BUILD_DEBIAN)
-target_include_directories(inputremote PUBLIC
-    .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
-    ${LIBCM256CCSRC}/..
-)
-else (BUILD_DEBIAN)
-target_include_directories(inputremote PUBLIC
-    .
+include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
    ${CM256CC_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)

-if (BUILD_DEBIAN)
-target_link_libraries(inputremote
-    ${QT_LIBRARIES}
-    cm256cc
-    sdrbase
-    sdrgui
-    swagger
+if(NOT SERVER_MODE)
+    set(remoteinput_SOURCES
+        ${remoteinput_SOURCES}
+        remoteinputgui.cpp
+
+        remoteinputgui.ui
+    )
+    set(remoteinput_HEADERS
+        ${remoteinput_HEADERS}
+        remoteinputgui.h
+    )
+
+    set(TARGET_NAME inputremote)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME inputremotesrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
+	${remoteinput_SOURCES}
 )
-else (BUILD_DEBIAN)
-target_link_libraries(inputremote
-    ${QT_LIBRARIES}
-    ${CM256CC_LIBRARIES}
-    sdrbase
-    sdrgui
-    swagger
+
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
+	sdrbase
+	${TARGET_LIB_GUI}
+        swagger
+        ${CM256CC_LIBRARIES}
 )
-endif (BUILD_DEBIAN)

-target_link_libraries(inputremote Qt5::Core Qt5::Widgets)
-
-install(TARGETS inputremote DESTINATION lib/plugins/samplesource)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesource)
@@ -1,9 +1,6 @@
 project(rtlsdr)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(rtlsdr_SOURCES
-    rtlsdrgui.cpp
    rtlsdrinput.cpp
    rtlsdrplugin.cpp
    rtlsdrsettings.cpp
@@ -11,67 +8,51 @@ set(rtlsdr_SOURCES
 )

 set(rtlsdr_HEADERS
-    rtlsdrgui.h
    rtlsdrinput.h
    rtlsdrplugin.h
    rtlsdrsettings.h
    rtlsdrthread.h
 )
-
-set(rtlsdr_FORMS
-    rtlsdrgui.ui
-)
-
-if (BUILD_DEBIAN)
 include_directories(
-    .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
-    ${LIBRTLSDRSRC}/include
-    ${LIBRTLSDRSRC}/src
-)
-else (BUILD_DEBIAN)
-include_directories(
-    .
    ${CMAKE_CURRENT_BINARY_DIR}
    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
    ${LIBRTLSDR_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)

-#include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(rtlsdr_SOURCES
+        ${rtlsdr_SOURCES}
+        rtlsdrgui.cpp

-#qt4_wrap_cpp(rtlsdr_HEADERS_MOC ${rtlsdr_HEADERS})
-qt5_wrap_ui(rtlsdr_FORMS_HEADERS ${rtlsdr_FORMS})
+        rtlsdrgui.ui
+    )
+    set(rtlsdr_HEADERS
+        ${rtlsdr_HEADERS}
+        rtlsdrgui.h
+    )

-add_library(inputrtlsdr SHARED
-    ${rtlsdr_SOURCES}
-    ${rtlsdr_HEADERS_MOC}
-    ${rtlsdr_FORMS_HEADERS}
+    set(TARGET_NAME inputrtlsdr)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME inputrtlsdrsrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
+	${rtlsdr_SOURCES}
 )

-if (BUILD_DEBIAN)
-target_link_libraries(inputrtlsdr
-    ${QT_LIBRARIES}
-    rtlsdr
-    sdrbase
-    sdrgui
-    swagger
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
+	sdrbase
+	${TARGET_LIB_GUI}
+        swagger
+        ${LIBRTLSDR_LIBRARIES}
 )
-else (BUILD_DEBIAN)
-target_link_libraries(inputrtlsdr
-    ${QT_LIBRARIES}
-    ${LIBRTLSDR_LIBRARIES}
-    sdrbase
-    sdrgui
-    swagger
-)
-endif (BUILD_DEBIAN)

-
-target_link_libraries(inputrtlsdr Qt5::Core Qt5::Widgets)
-
-install(TARGETS inputrtlsdr DESTINATION lib/plugins/samplesource)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesource)
@@ -1,9 +1,6 @@
 project(sdrplay)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(sdrplay_SOURCES
-    sdrplaygui.cpp
    sdrplayinput.cpp
    sdrplayplugin.cpp
    sdrplaysettings.cpp
@@ -11,63 +8,52 @@ set(sdrplay_SOURCES
 )

 set(sdrplay_HEADERS
-    sdrplaygui.h
    sdrplayinput.h
    sdrplayplugin.h
    sdrplaysettings.h
    sdrplaythread.h
 )

-set(sdrplay_FORMS
-    sdrplaygui.ui
-)
-
-if (BUILD_DEBIAN)
 include_directories(
-    .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
-    ${LIBMIRISDRSRC}/include
-    ${LIBMIRISDRSRC}/src
-)
-else (BUILD_DEBIAN)
-include_directories(
-    .
    ${CMAKE_CURRENT_BINARY_DIR}
    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
    ${LIBMIRISDR_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)

-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(sdrplay_SOURCES
+        ${sdrplay_SOURCES}
+        sdrplaygui.cpp

-qt5_wrap_ui(sdrplay_FORMS_HEADERS ${sdrplay_FORMS})
+        sdrplaygui.ui
+    )
+    set(sdrplay_HEADERS
+        ${sdrplay_HEADERS}
+        sdrplaygui.h
+    )

-add_library(inputsdrplay SHARED
-    ${sdrplay_SOURCES}
-    ${sdrplay_HEADERS_MOC}
-    ${sdrplay_FORMS_HEADERS}
+    set(TARGET_NAME inputsdrplay)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME inputsdrplaysrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
+	${sdrplay_SOURCES}
 )

-if (BUILD_DEBIAN)
-target_link_libraries(inputsdrplay
-    ${QT_LIBRARIES}
-    mirisdr
-    sdrbase
-    sdrgui
-    swagger
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
+	sdrbase
+	${TARGET_LIB_GUI}
+        swagger
+        ${LIBMIRISDR_LIBRARIES}
 )
-else (BUILD_DEBIAN)
-target_link_libraries(inputsdrplay
-    ${QT_LIBRARIES}
-    ${LIBMIRISDR_LIBRARIES}
-    sdrbase
-    sdrgui
-    swagger
-)
-endif (BUILD_DEBIAN)

-target_link_libraries(inputsdrplay Qt5::Core Qt5::Widgets)
-
-install(TARGETS inputsdrplay DESTINATION lib/plugins/samplesource)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesource)
@@ -1,9 +1,6 @@
 project(soapysdrinput)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(soapysdrinput_SOURCES
-	soapysdrinputgui.cpp
 	soapysdrinput.cpp
 	soapysdrinputplugin.cpp
 	soapysdrinputsettings.cpp
@@ -11,68 +8,54 @@ set(soapysdrinput_SOURCES
 )

 set(soapysdrinput_HEADERS
-	soapysdrinputgui.h
 	soapysdrinput.h
 	soapysdrinputplugin.h
 	soapysdrinputsettings.h
 	soapysdrinputthread.h
 )

-set(soapysdrinput_FORMS
-	soapysdrinputgui.ui
-)
-
-if (BUILD_DEBIAN)
 include_directories(
-    .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
-    ${CMAKE_SOURCE_DIR}/devices
-    ${SOAPYSDR_SOURCE_DIR}/include
-    ${SOAPYSDR_SOURCE_DIR}/src
-)
-else (BUILD_DEBIAN)
-include_directories(
-	.
 	${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+        ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 	${CMAKE_SOURCE_DIR}/devices
 	${SOAPYSDR_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)

-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(soapysdrinput_SOURCES
+        ${soapysdrinput_SOURCES}
+        soapysdrinputgui.cpp

-qt5_wrap_ui(soapysdrinput_FORMS_HEADERS ${soapysdrinput_FORMS})
+        soapysdrinputgui.ui
+    )
+    set(soapysdrinput_HEADERS
+        ${soapysdrinput_HEADERS}
+        soapysdrinputgui.h
+    )

-add_library(inputsoapysdr SHARED
+    set(TARGET_NAME inputsoapysdr)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME inputsoapysdrsrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
 	${soapysdrinput_SOURCES}
-	${soapysdrinput_HEADERS_MOC}
-	${soapysdrinput_FORMS_HEADERS}
 )

-if (BUILD_DEBIAN)
-target_link_libraries(inputsoapysdr
-    ${QT_LIBRARIES}
-    SoapySDR
-    sdrbase
-    sdrgui
-    swagger
-    soapysdrdevice
-)
-else (BUILD_DEBIAN)
-target_link_libraries(inputsoapysdr
-	${QT_LIBRARIES}
-	${SOAPYSDR_LIBRARY}
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
-	swagger
-	soapysdrdevice
+	${TARGET_LIB_GUI}
+        swagger
+        ${SOAPYSDR_LIBRARIES}
+        soapysdrdevice
 )
-endif (BUILD_DEBIAN)

-target_link_libraries(inputsoapysdr Qt5::Core Qt5::Widgets)
-
-install(TARGETS inputsoapysdr DESTINATION lib/plugins/samplesource)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesource)
@@ -1,9 +1,6 @@
 project(testsource)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(testsource_SOURCES
-	testsourcegui.cpp
 	testsourceinput.cpp
 	testsourceplugin.cpp
 	testsourcethread.cpp
@@ -11,44 +8,50 @@ set(testsource_SOURCES
 )

 set(testsource_HEADERS
-	testsourcegui.h
 	testsourceinput.h
 	testsourceplugin.h
 	testsourcethread.h
 	testsourcesettings.h
 )

-set(testsource_FORMS
-	testsourcegui.ui
-)
-
 include_directories(
-	.
 	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 )

-#include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(testsource_SOURCES
+        ${testsource_SOURCES}
+        testsourcegui.cpp

-#qt4_wrap_cpp(testsource_HEADERS_MOC ${testsource_HEADERS})
-qt5_wrap_ui(testsource_FORMS_HEADERS ${testsource_FORMS})
+        testsourcegui.ui
+    )
+    set(testsource_HEADERS
+        ${testsource_HEADERS}
+        testsourcegui.h
+    )

-add_library(inputtestsource SHARED
+    set(TARGET_NAME inputtestsource)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME inputtestsourcesrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
 	${testsource_SOURCES}
-	${testsource_HEADERS_MOC}
-	${testsource_FORMS_HEADERS}
 )

-target_link_libraries(inputtestsource
-	${QT_LIBRARIES}
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
-	swagger
+	${TARGET_LIB_GUI}
+        swagger
 )

-target_link_libraries(inputtestsource Qt5::Core Qt5::Widgets)
-
-install(TARGETS inputtestsource DESTINATION lib/plugins/samplesource)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesource)
@@ -1,9 +1,6 @@
 project(xtrxinput)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(xtrxinput_SOURCES
-	xtrxinputgui.cpp
 	xtrxinput.cpp
 	xtrxinputplugin.cpp
 	xtrxinputsettings.cpp
@@ -11,47 +8,54 @@ set(xtrxinput_SOURCES
 )

 set(xtrxinput_HEADERS
-	xtrxinputgui.h
 	xtrxinput.h
 	xtrxinputplugin.h
 	xtrxinputsettings.h
 	xtrxinputthread.h
 )

-set(xtrxinput_FORMS
-	xtrxinputgui.ui
-)
-
 include_directories(
-	.
 	${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    	
+        ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 	${CMAKE_SOURCE_DIR}/devices
 	${LIBXTRX_INCLUDE_DIRS}
 )

-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
+if(NOT SERVER_MODE)
+    set(xtrxinput_SOURCES
+        ${xtrxinput_SOURCES}
+        xtrxinputgui.cpp

-qt5_wrap_ui(xtrxinput_FORMS_HEADERS ${xtrxinput_FORMS})
+        xtrxinputgui.ui
+    )
+    set(xtrxinput_HEADERS
+        ${xtrxinput_HEADERS}
+        xtrxinputgui.h
+    )

-add_library(inputxtrx SHARED
+    set(TARGET_NAME inputxtrx)
+    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB_GUI "sdrgui")
+    set(INSTALL_FOLDER "plugins")
+else()
+    set(TARGET_NAME inputxtrxsrv)
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
 	${xtrxinput_SOURCES}
-	${xtrxinput_HEADERS_MOC}
-	${xtrxinput_FORMS_HEADERS}
 )

-
-target_link_libraries(inputxtrx
-	${QT_LIBRARIES}
-	${LIBXTRX_LIBRARY}
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
-	swagger
-	xtrxdevice
+	${TARGET_LIB_GUI}
+        swagger
+        ${LIBXTRX_LIBRARIES}
+        xtrxdevice
 )

-qt5_use_modules(inputxtrx Core Widgets)
-
-install(TARGETS inputxtrx DESTINATION lib/plugins/samplesource)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesource)