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

plugins/samplesink/CMakeLists.txt

@@ -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()

plugins/samplesink/bladerf1output/CMakeLists.txt

@@ -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)

plugins/samplesink/bladerf2output/CMakeLists.txt

@@ -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)

plugins/samplesink/filesink/CMakeLists.txt

@@ -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)

plugins/samplesink/hackrfoutput/CMakeLists.txt

@@ -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)

plugins/samplesink/limesdroutput/CMakeLists.txt

@@ -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)

plugins/samplesink/plutosdroutput/CMakeLists.txt

@@ -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)

plugins/samplesink/remoteoutput/CMakeLists.txt

@@ -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})

plugins/samplesink/soapysdroutput/CMakeLists.txt

@@ -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)

plugins/samplesink/xtrxoutput/CMakeLists.txt

@@ -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)