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

CMakeLists.txt

@@ -1,317 +1,140 @@
 cmake_minimum_required(VERSION 3.1.0)
 
+# just to be sure that c++11 if fully supported
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9")
     message(FATAL_ERROR "SDRangel requires GCC version 4.9 or higher!")
 endif()
 
-# use, i.e. don't skip the full RPATH for the build tree
-set(CMAKE_SKIP_BUILD_RPATH  FALSE)
-
-# when building, don't use the install RPATH already
-# (but later on when installing)
-set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-
-# add the automatically determined parts of the RPATH
-# which point to directories outside the build tree to the install RPATH
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-
-add_definitions(-DLINUX) # for compatibility with Android and Windows builds with QtCretino
-
-option(V4L-RTL "Use Linux Kernel RTL-SDR Source." OFF)
-option(V4L-MSI "Use Linux Kernel MSI2500 Source." OFF)
-option(BUILD_TYPE "Build type (RELEASE, RELEASEWITHDBGINFO, DEBUG" RELEASE)
-option(DEBUG_OUTPUT "Print debug messages" OFF)
-option(SANITIZE_ADDRESS "Activate memory address sanitization" OFF)
-option(HOST_RPI "Compiling on RPi" OFF)
-option(RX_SAMPLE_24BIT "Internal 24 bit Rx DSP" OFF)
-option(NO_DSP_SIMD "Do not use SIMD instructions for DSP even if available" OFF)
-option(BUILD_SERVER "Build Server" ON)
-option(BUILD_GUI "Build GUI" ON)
-option(ENABLE_DISTRIBUTION "Compile for package distribution" OFF)
-
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
 
 project(sdrangel)
 
-if (BUILD_TYPE MATCHES RELEASE)
+# disable only when needed
-    set(CMAKE_BUILD_TYPE "Release")
+set(CMAKE_CXX_STANDARD 11)
-elseif (BUILD_TYPE MATCHES RELEASEWITHDBGINFO)
+set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
-    set(CMAKE_BUILD_TYPE "ReleaseWithDebugInfo")
+
-elseif (BUILD_TYPE MATCHES DEBUG)
+# declare build structures
-    set(CMAKE_BUILD_TYPE "Debug")
+#set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/)
-elseif (BUILD_TYPE MATCHES DEBIAN)
+#set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/sdrangel)
-    set(CMAKE_BUILD_TYPE "Release")
+#set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/sdrangel)
-    set(BUILD_DEBIAN TRUE)
+set(INSTALL_BIN_DIR "bin/")
-else()
+set(INSTALL_LIB_DIR "lib/sdrangel")
-    set(CMAKE_BUILD_TYPE "Release")
+# set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/sdrangel")
+
+# SDRAngel cmake options
+option(DEBUG_OUTPUT "Print debug messages" OFF)
+option(SANITIZE_ADDRESS "Activate memory address sanitization" OFF)
+option(RX_SAMPLE_24BIT "Internal 24 bit Rx DSP" ON)
+option(BUILD_SERVER "Build Server" ON)
+option(BUILD_GUI "Build GUI" ON)
+option(FORCE_SSSE3 "Compile with SSSE3 instruction only" OFF)
+option(FORCE_SSE41 "Compile with SSE4.1 instruction only" OFF)
+option(BUILD_EXTERNAL_LIBRARIES "Build external libraries" OFF)
+option(ENABLE_AIRSPY "Enable AirSpy support" ON)
+option(ENABLE_AIRSPYHF "Enable AirSpyHF support" ON)
+option(ENABLE_BLADERF "Enable bladeRF support" ON)
+option(ENABLE_FUNCUBE "Enable FUNcube support" ON)
+option(ENABLE_HACKRF "Enable HackRF support" ON)
+option(ENABLE_IIO "Enable liniio support like PlutoSDR" ON)
+option(ENABLE_LIMESUITE "Enable limesuite support" ON)
+option(ENABLE_MIRISDR "Enable LibMiri for old SDRPlay" ON)
+option(ENABLE_PERSEUS "Enable perseus support" ON)
+option(ENABLE_RTLSDR "Enable rtl-sdr support" ON)
+option(ENABLE_SOAPYSDR "Enable SoapySDR support" ON)
+option(ENABLE_XTRX "Enable XTRX support" ON)
+
+if(NOT DEBUG_OUTPUT)
+    add_definitions("-DQT_NO_DEBUG_OUTPUT")
 endif()
 
-set(QT_USE_QTOPENGL TRUE)
+# set compiler
+include(FindCompiler)
+
+# find cpu flags (and set compiler)
+include(FindCPUflags)
+
+# Instruct CMake to run moc automatically when needed
 set(CMAKE_AUTOMOC ON)
 
-if(APPLE AND EXISTS /usr/local/opt/qt5)
+# Create code from a list of Qt designer ui files
-       # Homebrew installs Qt5 (up to at least 5.9.1) in
+set(CMAKE_AUTOUIC ON)
-       # /usr/local/qt5, ensure it can be found by CMake since
+
-       # it is not in the default /usr/local prefix.
+# https://cmake.org/cmake/help/v3.0/manual/cmake-qt.7.html#autorcc
-       list(APPEND CMAKE_PREFIX_PATH "/usr/local/opt/qt5")
+set(CMAKE_AUTORCC TRUE)
+
+# As moc files are generated in the binary dir,
+# tell CMake to always look for includes there:
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+# Qt requirements
+find_package(Qt5 COMPONENTS Core REQUIRED)
+find_package(Qt5 COMPONENTS Widgets REQUIRED)
+find_package(Qt5 COMPONENTS Multimedia REQUIRED)
+find_package(Qt5 COMPONENTS MultimediaWidgets REQUIRED)
+
+# for the server we don't need OpenGL components
+if (BUILD_GUI)
+    find_package(OpenGL REQUIRED)
+    find_package(Qt5 COMPONENTS OpenGL REQUIRED)
 endif()
 
-#find_package(Qt4 REQUIRED)
+# other requirements
-find_package(Qt5Core 5.0 REQUIRED)
+find_package(PkgConfig REQUIRED)
-find_package(Qt5Widgets 5.0 REQUIRED)
-find_package(Qt5Multimedia 5.0 REQUIRED)
-find_package(Qt5OpenGL 5.0 REQUIRED)
-find_package(OpenGL REQUIRED)
-find_package(PkgConfig)
 find_package(Boost REQUIRED)
-find_package(FFTW3F)
+find_package(FFTW3F REQUIRED)
+find_package(Codec2)
+find_package(LibUSB)
+find_package(OpenCV) # channeltx/modatv
 
-if (NOT BUILD_DEBIAN)
+# !! TODO think how to manage build/link external libraries
+if (NOT BUILD_EXTERNAL_LIBRARIES)
     find_package(LibDSDcc)
     find_package(LibMbe)
     find_package(SerialDV)
+    find_package(CM256cc)
 endif()
 
-# MacOS Compatibility
+# macOS compatibility
 if(APPLE)
     find_package(ICONV)
-endif(APPLE)
-##############################################################################
-
-#include(${QT_USE_FILE})
-
-if (DEBUG_OUTPUT)
-    set( QT_DEFINITIONS "${QT_DEFINITIONS}" )
-else()
-    set( QT_DEFINITIONS "${QT_DEFINITIONS} -DQT_NO_DEBUG_OUTPUT" )
 endif()
 
-add_definitions(${QT_DEFINITIONS})
+# Devices
-
+if(ENABLE_AIRSPY)
-if(MSVC)
+    find_package(LibAIRSPY)
-    foreach(OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES})
+endif()
-        string(TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG)
+if(ENABLE_AIRSPYHF)
-        set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/bin_${OUTPUTCONFIG})
+    find_package(LibAIRSPYHF)
-        set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/bin_${OUTPUTCONFIG})
+endif()
-        set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/bin_${OUTPUTCONFIG})
+if(ENABLE_BLADERF)
-    endforeach(OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES)
+    find_package(LibBLADERF)
+endif()
+if(ENABLE_HACKRF)
+    find_package(LibHACKRF)
+endif()
+if(ENABLE_LIMESUITE)
+    find_package(LimeSuite)
+endif()
+if(ENABLE_IIO) # PlutoSDR
+    find_package(LibIIO)
+endif()
+if(ENABLE_MIRISDR)
+    find_package(LibMiriSDR)
+endif()
+if(ENABLE_PERSEUS)
+    find_package(LibPerseus)
+endif()
+if(ENABLE_RTLSDR)
+    find_package(LibRTLSDR)
+endif()
+if(ENABLE_SOAPYSDR)
+    find_package(SoapySDR)
+endif()
+if(ENABLE_XTRX)
+    find_package(LibXTRX)
 endif()
 
-##############################################################################
+# enable 24 bit receiving path
-
-if (HOST_RPI)
-    message( STATUS "Compiling on RPi" )
-endif()
-
-
-set(TEST_DIR ${PROJECT_SOURCE_DIR}/cmake/test)
-
-# Clang or AppleClang (see CMP0025)
-if(NOT DEFINED C_CLANG AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(C_CLANG 1)
-endif()
-if(NOT DEFINED C_GCC AND CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-    set(C_GCC 1)
-endif()
-
-# Detect current compilation architecture and create standard definitions
-# =======================================================================
-include(CheckSymbolExists)
-function(detect_architecture symbol arch)
-    if (NOT DEFINED ARCHITECTURE)
-        set(CMAKE_REQUIRED_QUIET 1)
-        check_symbol_exists("${symbol}" "" ARCHITECTURE_${arch})
-        unset(CMAKE_REQUIRED_QUIET)
-
-        # The output variable needs to be unique across invocations otherwise
-        # CMake's crazy scope rules will keep it defined
-        if (ARCHITECTURE_${arch})
-            set(ARCHITECTURE "${arch}" PARENT_SCOPE)
-            set(ARCHITECTURE_${arch} 1 PARENT_SCOPE)
-            add_definitions(-DARCHITECTURE_${arch}=1)
-        endif()
-    endif()
-endfunction()
-
-if (NOT ENABLE_GENERIC)
-    if (MSVC)
-        detect_architecture("_M_AMD64" x86_64)
-        detect_architecture("_M_IX86" x86)
-        detect_architecture("_M_ARM" ARM)
-        detect_architecture("_M_ARM64" ARM64)
-    else()
-        detect_architecture("__x86_64__" x86_64)
-        detect_architecture("__i386__" x86)
-        detect_architecture("__arm__" ARM)
-        detect_architecture("__aarch64__" ARM64)
-    endif()
-endif()
-if (NOT DEFINED ARCHITECTURE)
-    set(ARCHITECTURE "GENERIC")
-    set(ARCHITECTURE_GENERIC 1)
-    add_definitions(-DARCHITECTURE_GENERIC=1)
-endif()
-message(STATUS "Target architecture: ${ARCHITECTURE}")
-
-# flag that set the minimum cpu flag requirements
-# used to create re-distribuitable binary
-if (ENABLE_DISTRIBUTION)
-    if (${ARCHITECTURE} MATCHES "x86_64|x86")
-        set(HAS_SSSE3 ON CACHE BOOL "SSSE3 SIMD enabled")
-        if(C_GCC OR C_CLANG)
-            set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mssse3" )
-            message(STATUS "Use SSSE3 SIMD instructions")
-            add_definitions(-DUSE_SSSE3)
-        elseif(MSVC)
-            set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /arch:SSSE3" )
-            set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Oi /GL /Ot /Ox /arch:SSSE3" )
-            set( CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG" )
-            message(STATUS "Use MSVC SSSE3 SIMD instructions")
-            add_definitions (/D "_CRT_SECURE_NO_WARNINGS")
-            add_definitions(-DUSE_SSSE3)
-        endif()
-    elseif (${ARCHITECTURE} MATCHES "ARM|ARM64")
-        set(HAS_NEON ON CACHE BOOL "NEON SIMD enabled")
-        message(STATUS "Use NEON SIMD instructions")
-        add_definitions(-DUSE_NEON)
-    endif()
-else ()
-if (${ARCHITECTURE} MATCHES "x86_64|x86")
-    try_run(RUN_SSE2 COMPILE_SSE2 ${CMAKE_BINARY_DIR}/tmp ${TEST_DIR}/test_x86_sse2.cxx COMPILE_DEFINITIONS -msse2 -O0)
-    if(COMPILE_SSE2 AND RUN_SSE2 EQUAL 0)
-       set(HAS_SSE2 ON CACHE BOOL "Architecture has SSSE2 SIMD enabled")
-       if(C_GCC OR C_CLANG)
-           set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2" )
-           message(STATUS "Use SSE2 SIMD instructions")
-           add_definitions(-DUSE_SSE2)
-       elseif(MSVC)
-           set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /arch:SSE2" )
-           set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Oi /GL /Ot /Ox /arch:SSE2" )
-           set( CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG" )
-           add_definitions (/D "_CRT_SECURE_NO_WARNINGS")
-           add_definitions(-DUSE_SSE2)
-       endif()
-    else()
-       set(HAS_SSE2 OFF CACHE BOOL "Architecture does not have SSSE2 SIMD enabled")
-    endif()
-    try_run(RUN_SSSE3 COMPILE_SSSE3 ${CMAKE_BINARY_DIR}/tmp ${TEST_DIR}/test_x86_ssse3.cxx COMPILE_DEFINITIONS -mssse3 -O0)
-    if(COMPILE_SSSE3 AND RUN_SSSE3 EQUAL 0)
-       set(HAS_SSSE3 ON CACHE BOOL "Architecture has SSSE3 SIMD enabled")
-       if(C_GCC OR C_CLANG)
-           set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mssse3" )
-           message(STATUS "Use SSSE3 SIMD instructions")
-           add_definitions(-DUSE_SSSE3)
-       elseif(MSVC)
-           set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /arch:SSSE3" )
-           set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Oi /GL /Ot /Ox /arch:SSSE3" )
-           set( CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG" )
-           message(STATUS "Use MSVC SSSE3 SIMD instructions")
-           add_definitions (/D "_CRT_SECURE_NO_WARNINGS")
-           add_definitions(-DUSE_SSSE3)
-       endif()
-    else()
-       set(HAS_SSSE3 OFF CACHE BOOL "Architecture does not have SSSE3 SIMD enabled")
-    endif()
-    try_run(RUN_SSE4_1 COMPILE_SSE4_1 ${CMAKE_BINARY_DIR}/tmp ${TEST_DIR}/test_x86_sse41.cxx COMPILE_DEFINITIONS -msse4.1 -O0)
-    if(COMPILE_SSE4_1 AND RUN_SSE4_1 EQUAL 0)
-       set(HAS_SSE4_1 ON CACHE BOOL "Architecture has SSE 4.1 SIMD enabled")
-       if(C_GCC OR C_CLANG)
-           set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -msse4.1" )
-           set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -msse4.1" )
-           message(STATUS "Use SSE 4.1 SIMD instructions")
-           add_definitions(-DUSE_SSE4_1)
-       elseif(MSVC)
-           set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /arch:SSE4_1" )
-           set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Oi /GL /Ot /Ox /arch:SSE4_1" )
-           set( CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG" )
-           add_definitions (/D "_CRT_SECURE_NO_WARNINGS")
-           add_definitions(-DUSE_SSE4_1)
-       endif()
-    else()
-       set(HAS_SSE4_1 OFF CACHE BOOL "Architecture does not have SSE 4.1 SIMD enabled")
-    endif()
-    try_run(RUN_SSE4_2 COMPILE_SSE4_2 ${CMAKE_BINARY_DIR}/tmp ${TEST_DIR}/test_x86_sse42.cxx COMPILE_DEFINITIONS -msse4.2 -O0)
-    if(COMPILE_SSE4_2 AND RUN_SSE4_2 EQUAL 0)
-       set(HAS_SSE4_2 ON CACHE BOOL "Architecture has SSE 4.2 SIMD enabled")
-       if(C_GCC OR C_CLANG)
-           set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -msse4.2" )
-           set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -msse4.2" )
-           message(STATUS "Use SSE 4.2 SIMD instructions")
-           add_definitions(-DUSE_SSE4_2)
-       elseif(MSVC)
-           set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /arch:SSE4_2" )
-           set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Oi /GL /Ot /Ox /arch:SSE4_2" )
-           set( CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG" )
-           add_definitions (/D "_CRT_SECURE_NO_WARNINGS")
-           add_definitions(-DUSE_SSE4_2)
-       endif()
-    else()
-       set(HAS_SSE4_2 OFF CACHE BOOL "Architecture does not have SSE 4.2 SIMD enabled")
-    endif()
-    try_run(RUN_AVX COMPILE_AVX ${CMAKE_BINARY_DIR}/tmp ${TEST_DIR}/test_x86_avx.cxx COMPILE_DEFINITIONS -mavx -O0)
-    if(COMPILE_AVX AND RUN_AVX EQUAL 0)
-       set(HAS_AVX ON CACHE BOOL "Architecture has AVX SIMD enabled")
-       if(C_GCC OR C_CLANG)
-           set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mavx" )
-           set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -mavx" )
-           message(STATUS "Use AVX SIMD instructions")
-           add_definitions(-DUSE_AVX)
-       endif()
-    else()
-       set(HAS_AVX OFF CACHE BOOL "Architecture does not have AVX SIMD enabled")
-    endif()
-    try_run(RUN_AVX2 COMPILE_AVX2 ${CMAKE_BINARY_DIR}/tmp ${TEST_DIR}/test_x86_avx2.cxx COMPILE_DEFINITIONS -mavx2 -O0)
-    if(COMPILE_AVX2 AND RUN_AVX2 EQUAL 0)
-       set(HAS_AVX2 ON CACHE BOOL "Architecture has AVX2 SIMD enabled")
-       if(C_GCC OR C_CLANG)
-           set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mavx2" )
-           set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -mavx2" )
-           message(STATUS "Use AVX2 SIMD instructions")
-           add_definitions(-DUSE_AVX2)
-       endif()
-    else()
-       set(HAS_AVX2 OFF CACHE BOOL "Architecture does not have AVX2 SIMD enabled")
-    endif()
-    try_run(RUN_AVX512 COMPILE_AVX512 ${CMAKE_BINARY_DIR}/tmp ${TEST_DIR}/test_x86_avx512.cxx COMPILE_DEFINITIONS -mavx512f -O0)
-    if(COMPILE_AVX512 AND RUN_AVX512 EQUAL 0)
-       set(HAS_AVX512 ON CACHE BOOL "Architecture has AVX512 SIMD enabled")
-       if(C_GCC OR C_CLANG)
-           set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mavx512f" )
-           set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -mavx512f" )
-           message(STATUS "Use AVX512 SIMD instructions")
-           add_definitions(-DUSE_AVX512)
-       endif()
-    else()
-       set(HAS_AVX512 OFF CACHE BOOL "Architecture does not have AVX512 SIMD enabled")
-    endif()
-elseif(ARCHITECTURE_ARM)
-    try_run(RUN_NEON COMPILE_NEON ${CMAKE_BINARY_DIR}/tmp ${TEST_DIR}/test_arm_neon.cxx COMPILE_DEFINITIONS -mfpu=neon -O0)
-    if(COMPILE_NEON AND RUN_NEON EQUAL 0)
-       set(HAS_NEON ON CACHE BOOL "Architecture has NEON SIMD enabled")
-       if(C_GCC OR C_CLANG)
-           set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mfpu=neon" )
-           set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -mfpu=neon" )
-           message(STATUS "Use NEON SIMD instructions")
-           add_definitions(-DUSE_NEON)
-       endif()
-    else()
-       set(HAS_NEON OFF CACHE BOOL "Architecture does not have NEON SIMD enabled")
-    endif()
-elseif(ARCHITECTURE_ARM64)
-    # Advanced SIMD (aka NEON) is mandatory for AArch64
-    set(HAS_NEON ON CACHE BOOL "Architecture has NEON SIMD enabled")
-    message(STATUS "Use NEON SIMD instructions")
-    add_definitions(-DUSE_NEON)
-endif()
-endif()
-
-# clear binary test folder
-FILE(REMOVE_RECURSE ${CMAKE_BINARY_DIR}/tmp)
-##############################################################################
-
-# Compiler flags.
 if (RX_SAMPLE_24BIT)
     message(STATUS "Compiling for 24 bit Rx DSP chain")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSDR_RX_SAMPLE_24BIT")
@@ -328,29 +151,20 @@ if (SANITIZE_ADDRESS)
     set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} -fsanitize=address")
 endif()
 
-if (NO_DSP_SIMD)
+if (C_CLANG OR C_GCC)
-    message(STATUS "Not compiling with SIMD instructions for DSP even if available")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNO_DSP_SIMD")
-else()
-    message(STATUS "Compiling with SIMD instructions for DSP if available")
-endif()
-
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wvla -Woverloaded-virtual -ffast-math -ftree-vectorize ${EXTRA_FLAGS}")
-elseif (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+elseif (C_MSVC)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W3 -MP ${EXTRA_FLAGS}")
 endif()
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+if (C_CLANG)
-    if (BUILD_DEBIAN)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ferror-limit=1")
+elseif (C_GCC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fmax-errors=1")
-    else()
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fmax-errors=10")
-    endif()
 endif()
 
-##############################################################################
+########## version configuration ############
-
+## need more work
 execute_process(
     COMMAND git describe --abbrev=8 --always --tags
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
@@ -364,101 +178,70 @@ configure_file(
     ${CMAKE_BINARY_DIR}/generated/sdrangel_version.h
 )
 
-##############################################################################
+########### include sub-projects ############
+if(BUILD_EXTERNAL_LIBRARIES)
+    add_subdirectory(externals/cm256cc)
+    add_subdirectory(externals/mbelib)
+    add_subdirectory(externals/serialdv)
+    add_subdirectory(externals/dsdcc)
+    add_subdirectory(externals/libairspy)
+    add_subdirectory(externals/libairspyhf)
+    add_subdirectory(externals/libhackrf)
+    add_subdirectory(externals/librtlsdr)
+    add_subdirectory(externals/libbladerf)
+    add_subdirectory(externals/liblimesuite)
+    add_subdirectory(externals/libmirisdr)
+    add_subdirectory(externals/libperseus)
+    add_subdirectory(externals/libiio)
+    add_subdirectory(externals/libsoapysdr)
+endif()
+
+if (CODEC2_FOUND)
+    add_subdirectory(libfreedv)
+endif(CODEC2_FOUND)
+
+if(ENABLE_FUNCUBE AND UNIX AND LIBUSB_FOUND)
+    add_subdirectory(fcdlib)
+    add_subdirectory(fcdhid)
+endif()
+
 # base libraries
 add_subdirectory(sdrbase)
-if (BUILD_GUI)
-add_subdirectory(sdrgui)
-endif()
-if (BUILD_SERVER)
-add_subdirectory(sdrsrv)
-endif()
 add_subdirectory(sdrbench)
 add_subdirectory(httpserver)
 add_subdirectory(logging)
 add_subdirectory(qrtplib)
 add_subdirectory(swagger)
+add_subdirectory(devices)
 
+if (BUILD_GUI)
+    add_subdirectory(sdrgui)
+    add_subdirectory(plugins)
+endif()
+
+if (BUILD_SERVER)
+    add_subdirectory(sdrsrv)
+    set(SERVER_MODE ON)
+    add_definitions(-DSERVER_MODE)
+    add_subdirectory(pluginssrv)
+    remove_definitions(-DSERVER_MODE)
+    set(SERVER_MODE OFF)
+endif()
+
+# includes needed by the following target
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_BINARY_DIR}/generated
-    ${CMAKE_SOURCE_DIR}/exports
     ${CMAKE_SOURCE_DIR}/sdrbase
+    ${CMAKE_SOURCE_DIR}/exports
     ${CMAKE_SOURCE_DIR}/sdrgui
+    ${CMAKE_SOURCE_DIR}/sdrsrv
+    ${CMAKE_SOURCE_DIR}/sdrbench
     ${CMAKE_SOURCE_DIR}/logging
     ${OPENGL_INCLUDE_DIR}
 )
 
-##############################################################################
+############ build sdrangel benchmark ################
-# External binary resources
-include(${CMAKE_SOURCE_DIR}/cmake/include/Qt5ExternalResources.cmake)
-
-qt5_add_external_resources(sdrbase.rcc sdrbase/resources/res.qrc)
-
-
-##############################################################################
-# main GUI application
-if (BUILD_GUI)
-
-set(sdrangel_SOURCES
-    app/main.cpp
-)
-
-if(WIN32)
-    SET(sdrangel_SOURCES ${sdrangel_SOURCES} sdrgui/resources/sdrangel.rc)
-endif(WIN32)
-
-add_executable(sdrangel
-    ${sdrangel_SOURCES}
-)
-
-target_link_libraries(sdrangel
-    sdrbase
-    sdrgui
-    logging
-    ${QT_LIBRARIES}
-    ${OPENGL_LIBRARIES}
-)
-
-if(WIN32)
-    set_target_properties(sdrangel PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE")
-    set_target_properties(sdrangel PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:CONSOLE")
-    set_target_properties(sdrangel PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:windows /ENTRY:mainCRTStartup")
-    set_target_properties(sdrangel PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:windows /ENTRY:mainCRTStartup")
-endif(WIN32)
-
-target_link_libraries(sdrangel Qt5::Widgets Qt5::Multimedia)
-endif()
-
-##############################################################################
-# main server application
-if (BUILD_SERVER)
-
-set(sdrangelsrv_SOURCES
-    appsrv/main.cpp
-)
-
-add_executable(sdrangelsrv
-    ${sdrangelsrv_SOURCES}
-)
-
-target_include_directories(sdrangelsrv
-    PUBLIC ${CMAKE_SOURCE_DIR}/sdrsrv
-)
-
-target_link_libraries(sdrangelsrv
-    sdrbase
-    sdrsrv
-    logging
-    ${QT_LIBRARIES}
-)
-
-target_link_libraries(sdrangelsrv Qt5::Multimedia)
-endif()
-
-##############################################################################
-# main benchmark application
-
 set(sdrangelbench_SOURCES
     appbench/main.cpp
 )
@@ -467,68 +250,61 @@ add_executable(sdrangelbench
     ${sdrangelbench_SOURCES}
 )
 
-target_include_directories(sdrangelbench
-    PUBLIC ${CMAKE_SOURCE_DIR}/sdrbench
-)
-
 target_link_libraries(sdrangelbench
+    Qt5::Multimedia
     sdrbench
     logging
-    ${QT_LIBRARIES}
 )
 
-target_compile_features(sdrangelbench PRIVATE cxx_generalized_initializers) # cmake >= 3.1.0
+############ build sdrangel gui ################
-target_link_libraries(sdrangelbench Qt5::Multimedia)
-
-##############################################################################
-
-if (BUILD_DEBIAN)
-    add_subdirectory(cm256cc)
-    add_subdirectory(mbelib)
-    add_subdirectory(serialdv)
-    add_subdirectory(dsdcc)
-    add_subdirectory(libairspy)
-    add_subdirectory(libairspyhf)
-    add_subdirectory(libhackrf)
-    add_subdirectory(librtlsdr)
-    add_subdirectory(libbladerf)
-    add_subdirectory(liblimesuite)
-    add_subdirectory(libmirisdr)
-    add_subdirectory(libperseus)
-    add_subdirectory(libiio)
-	add_subdirectory(libsoapysdr)
-endif (BUILD_DEBIAN)
-
-find_package(Codec2)
-if (CODEC2_FOUND)
-    add_subdirectory(libfreedv)
-endif(CODEC2_FOUND)
-
-add_subdirectory(devices)
 if (BUILD_GUI)
-add_subdirectory(plugins)
+    set(sdrangel_SOURCES
+        app/main.cpp
+        sdrgui/resources/sdrangel.rc
+    )
+
+    add_executable(sdrangel
+        ${sdrangel_SOURCES}
+    )
+
+    target_link_libraries(sdrangel
+        ${OPENGL_LIBRARIES}
+        Qt5::Widgets
+        Qt5::Multimedia
+        sdrbase
+        sdrgui
+        logging
+
+    )
+endif()
+
+############ build sdrangel server ################
+if (BUILD_SERVER)
+    set(sdrangelsrv_SOURCES
+        appsrv/main.cpp
+    )
+
+    add_executable(sdrangelsrv
+        ${sdrangelsrv_SOURCES}
+    )
+
+    target_link_libraries(sdrangelsrv
+        Qt5::Multimedia
+        sdrbase
+        sdrsrv
+        logging
+    )
+endif()
+
+############ install targets ################
+install(TARGETS sdrangelbench DESTINATION ${INSTALL_BIN_DIR})
+if (BUILD_GUI)
+install(TARGETS sdrangel DESTINATION ${INSTALL_BIN_DIR})
 endif()
 if (BUILD_SERVER)
-add_subdirectory(pluginssrv)
+install(TARGETS sdrangelsrv DESTINATION ${INSTALL_BIN_DIR})
 endif()
 
-if(LIBUSB_FOUND AND UNIX)
-    add_subdirectory(fcdhid)
-    add_subdirectory(fcdlib)
-endif(LIBUSB_FOUND AND UNIX)
-
-##############################################################################
-
-#install targets
-if (BUILD_GUI)
-install(TARGETS sdrangel DESTINATION bin)
-endif()
-if (BUILD_SERVER)
-install(TARGETS sdrangelsrv DESTINATION bin)
-endif()
-install(TARGETS sdrangelbench DESTINATION bin)
-#install(TARGETS sdrbase DESTINATION lib)
-
 #install files and directories (linux specific)
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 install(DIRECTORY udev-rules DESTINATION share/sdrangel)
@@ -537,16 +313,12 @@ install(FILES desktop/sdrangel.desktop DESTINATION share/applications)
 install(FILES desktop/sdrangel_icon.png DESTINATION share/pixmaps)
 endif()
 
-# needed by REST API documentation
+############ uninstall target ################
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sdrbase.rcc DESTINATION bin)
-
-##############################################################################
-
-# uninstall target
 configure_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/include/uninstall.cmake.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+    "${CMAKE_CURRENT_BINARY_DIR}/uninstall.cmake"
     IMMEDIATE @ONLY)
 
 add_custom_target(uninstall
-    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
+    COMMAND ${CMAKE_COMMAND} -P
+    ${CMAKE_CURRENT_BINARY_DIR}/uninstall.cmake)

cmake/Modules/FindCPUflags.cmake

@@ -0,0 +1,213 @@
+# Clang or AppleClang (see CMP0025)
+if(NOT DEFINED C_CLANG AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(C_CLANG 1)
+elseif(NOT DEFINED C_GCC AND CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+    set(C_GCC 1)
+elseif(NOT DEFINED C_MSVC AND CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+    set(C_MSVC 1)
+endif()
+
+# Detect current compilation architecture and create standard definitions
+include(CheckSymbolExists)
+function(detect_architecture symbol arch)
+    if (NOT DEFINED ARCHITECTURE)
+        set(CMAKE_REQUIRED_QUIET 1)
+        check_symbol_exists("${symbol}" "" ARCHITECTURE_${arch})
+        unset(CMAKE_REQUIRED_QUIET)
+
+        # The output variable needs to be unique across invocations otherwise
+        # CMake's crazy scope rules will keep it defined
+        if (ARCHITECTURE_${arch})
+            set(ARCHITECTURE "${arch}" PARENT_SCOPE)
+            set(ARCHITECTURE_${arch} 1 PARENT_SCOPE)
+            add_definitions(-DARCHITECTURE_${arch}=1)
+        endif()
+    endif()
+endfunction()
+
+if (NOT ENABLE_GENERIC)
+    if (C_MSVC)
+        detect_architecture("_M_AMD64" x86_64)
+        detect_architecture("_M_IX86" x86)
+        detect_architecture("_M_ARM" ARM)
+        detect_architecture("_M_ARM64" ARM64)
+    else()
+        detect_architecture("__x86_64__" x86_64)
+        detect_architecture("__i386__" x86)
+        detect_architecture("__arm__" ARM)
+        detect_architecture("__aarch64__" ARM64)
+    endif()
+endif()
+if (NOT DEFINED ARCHITECTURE)
+    set(ARCHITECTURE "GENERIC")
+    set(ARCHITECTURE_GENERIC 1)
+    add_definitions(-DARCHITECTURE_GENERIC=1)
+endif()
+message(STATUS "Target architecture: ${ARCHITECTURE}")
+
+set(TEST_DIR ${PROJECT_SOURCE_DIR}/cmake/test)
+
+# flag that set the minimum cpu flag requirements
+# used to create re-distribuitable binary
+if (${ARCHITECTURE} MATCHES "x86_64|x86" AND (FORCE_SSSE3 OR FORCE_SSE41))
+    if (FORCE_SSSE3)
+        set(HAS_SSSE3 ON CACHE BOOL "SSSE3 SIMD enabled")
+        if(C_GCC OR C_CLANG)
+            set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mssse3" )
+            message(STATUS "Use SSSE3 SIMD instructions")
+            add_definitions(-DUSE_SSSE3)
+        elseif(C_MSVC)
+            set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /arch:SSSE3" )
+            set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Oi /GL /Ot /Ox /arch:SSSE3" )
+            set( CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG" )
+            message(STATUS "Use MSVC SSSE3 SIMD instructions")
+            add_definitions (/D "_CRT_SECURE_NO_WARNINGS")
+            add_definitions(-DUSE_SSSE3)
+        endif()
+    elseif (FORCE_SSE41)
+       set(HAS_SSE4_1 ON CACHE BOOL "Architecture has SSE 4.1 SIMD enabled")
+       if(C_GCC OR C_CLANG)
+           set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -msse4.1" )
+           set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -msse4.1" )
+           message(STATUS "Use SSE 4.1 SIMD instructions")
+           add_definitions(-DUSE_SSE4_1)
+       elseif(C_MSVC)
+           set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /arch:SSE4_1" )
+           set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Oi /GL /Ot /Ox /arch:SSE4_1" )
+           set( CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG" )
+           add_definitions (/D "_CRT_SECURE_NO_WARNINGS")
+           add_definitions(-DUSE_SSE4_1)
+       endif()
+    endif()
+else ()
+if (${ARCHITECTURE} MATCHES "x86_64|x86")
+    try_run(RUN_SSE2 COMPILE_SSE2 ${CMAKE_BINARY_DIR}/tmp ${TEST_DIR}/test_x86_sse2.cxx COMPILE_DEFINITIONS -msse2 -O0)
+    if(COMPILE_SSE2 AND RUN_SSE2 EQUAL 0)
+       set(HAS_SSE2 ON CACHE BOOL "Architecture has SSSE2 SIMD enabled")
+       if(C_GCC OR C_CLANG)
+           set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2" )
+           message(STATUS "Use SSE2 SIMD instructions")
+           add_definitions(-DUSE_SSE2)
+       elseif(C_MSVC)
+           set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /arch:SSE2" )
+           set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Oi /GL /Ot /Ox /arch:SSE2" )
+           set( CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG" )
+           add_definitions (/D "_CRT_SECURE_NO_WARNINGS")
+           add_definitions(-DUSE_SSE2)
+       endif()
+    else()
+       set(HAS_SSE2 OFF CACHE BOOL "Architecture does not have SSSE2 SIMD enabled")
+    endif()
+    try_run(RUN_SSSE3 COMPILE_SSSE3 ${CMAKE_BINARY_DIR}/tmp ${TEST_DIR}/test_x86_ssse3.cxx COMPILE_DEFINITIONS -mssse3 -O0)
+    if(COMPILE_SSSE3 AND RUN_SSSE3 EQUAL 0)
+       set(HAS_SSSE3 ON CACHE BOOL "Architecture has SSSE3 SIMD enabled")
+       if(C_GCC OR C_CLANG)
+           set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mssse3" )
+           message(STATUS "Use SSSE3 SIMD instructions")
+           add_definitions(-DUSE_SSSE3)
+       elseif(C_MSVC)
+           set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /arch:SSSE3" )
+           set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Oi /GL /Ot /Ox /arch:SSSE3" )
+           set( CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG" )
+           message(STATUS "Use MSVC SSSE3 SIMD instructions")
+           add_definitions (/D "_CRT_SECURE_NO_WARNINGS")
+           add_definitions(-DUSE_SSSE3)
+       endif()
+    else()
+       set(HAS_SSSE3 OFF CACHE BOOL "Architecture does not have SSSE3 SIMD enabled")
+    endif()
+    try_run(RUN_SSE4_1 COMPILE_SSE4_1 ${CMAKE_BINARY_DIR}/tmp ${TEST_DIR}/test_x86_sse41.cxx COMPILE_DEFINITIONS -msse4.1 -O0)
+    if(COMPILE_SSE4_1 AND RUN_SSE4_1 EQUAL 0)
+       set(HAS_SSE4_1 ON CACHE BOOL "Architecture has SSE 4.1 SIMD enabled")
+       if(C_GCC OR C_CLANG)
+           set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -msse4.1" )
+           set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -msse4.1" )
+           message(STATUS "Use SSE 4.1 SIMD instructions")
+           add_definitions(-DUSE_SSE4_1)
+       elseif(C_MSVC)
+           set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /arch:SSE4_1" )
+           set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Oi /GL /Ot /Ox /arch:SSE4_1" )
+           set( CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG" )
+           add_definitions (/D "_CRT_SECURE_NO_WARNINGS")
+           add_definitions(-DUSE_SSE4_1)
+       endif()
+    else()
+       set(HAS_SSE4_1 OFF CACHE BOOL "Architecture does not have SSE 4.1 SIMD enabled")
+    endif()
+    try_run(RUN_SSE4_2 COMPILE_SSE4_2 ${CMAKE_BINARY_DIR}/tmp ${TEST_DIR}/test_x86_sse42.cxx COMPILE_DEFINITIONS -msse4.2 -O0)
+    if(COMPILE_SSE4_2 AND RUN_SSE4_2 EQUAL 0)
+       set(HAS_SSE4_2 ON CACHE BOOL "Architecture has SSE 4.2 SIMD enabled")
+       if(C_GCC OR C_CLANG)
+           set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -msse4.2" )
+           set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -msse4.2" )
+           message(STATUS "Use SSE 4.2 SIMD instructions")
+           add_definitions(-DUSE_SSE4_2)
+       elseif(C_MSVC)
+           set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /arch:SSE4_2" )
+           set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Oi /GL /Ot /Ox /arch:SSE4_2" )
+           set( CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG" )
+           add_definitions (/D "_CRT_SECURE_NO_WARNINGS")
+           add_definitions(-DUSE_SSE4_2)
+       endif()
+    else()
+       set(HAS_SSE4_2 OFF CACHE BOOL "Architecture does not have SSE 4.2 SIMD enabled")
+    endif()
+    try_run(RUN_AVX COMPILE_AVX ${CMAKE_BINARY_DIR}/tmp ${TEST_DIR}/test_x86_avx.cxx COMPILE_DEFINITIONS -mavx -O0)
+    if(COMPILE_AVX AND RUN_AVX EQUAL 0)
+       set(HAS_AVX ON CACHE BOOL "Architecture has AVX SIMD enabled")
+       if(C_GCC OR C_CLANG)
+           set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mavx" )
+           set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -mavx" )
+           message(STATUS "Use AVX SIMD instructions")
+           add_definitions(-DUSE_AVX)
+       endif()
+    else()
+       set(HAS_AVX OFF CACHE BOOL "Architecture does not have AVX SIMD enabled")
+    endif()
+    try_run(RUN_AVX2 COMPILE_AVX2 ${CMAKE_BINARY_DIR}/tmp ${TEST_DIR}/test_x86_avx2.cxx COMPILE_DEFINITIONS -mavx2 -O0)
+    if(COMPILE_AVX2 AND RUN_AVX2 EQUAL 0)
+       set(HAS_AVX2 ON CACHE BOOL "Architecture has AVX2 SIMD enabled")
+       if(C_GCC OR C_CLANG)
+           set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mavx2" )
+           set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -mavx2" )
+           message(STATUS "Use AVX2 SIMD instructions")
+           add_definitions(-DUSE_AVX2)
+       endif()
+    else()
+       set(HAS_AVX2 OFF CACHE BOOL "Architecture does not have AVX2 SIMD enabled")
+    endif()
+    try_run(RUN_AVX512 COMPILE_AVX512 ${CMAKE_BINARY_DIR}/tmp ${TEST_DIR}/test_x86_avx512.cxx COMPILE_DEFINITIONS -mavx512f -O0)
+    if(COMPILE_AVX512 AND RUN_AVX512 EQUAL 0)
+       set(HAS_AVX512 ON CACHE BOOL "Architecture has AVX512 SIMD enabled")
+       if(C_GCC OR C_CLANG)
+           set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mavx512f" )
+           set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -mavx512f" )
+           message(STATUS "Use AVX512 SIMD instructions")
+           add_definitions(-DUSE_AVX512)
+       endif()
+    else()
+       set(HAS_AVX512 OFF CACHE BOOL "Architecture does not have AVX512 SIMD enabled")
+    endif()
+elseif(ARCHITECTURE_ARM)
+    try_run(RUN_NEON COMPILE_NEON ${CMAKE_BINARY_DIR}/tmp ${TEST_DIR}/test_arm_neon.cxx COMPILE_DEFINITIONS -mfpu=neon -O0)
+    if(COMPILE_NEON AND RUN_NEON EQUAL 0)
+       set(HAS_NEON ON CACHE BOOL "Architecture has NEON SIMD enabled")
+       if(C_GCC OR C_CLANG)
+           set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mfpu=neon" )
+           set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -mfpu=neon" )
+           message(STATUS "Use NEON SIMD instructions")
+           add_definitions(-DUSE_NEON)
+       endif()
+    else()
+       set(HAS_NEON OFF CACHE BOOL "Architecture does not have NEON SIMD enabled")
+    endif()
+elseif(ARCHITECTURE_ARM64)
+    # Advanced SIMD (aka NEON) is mandatory for AArch64
+    set(HAS_NEON ON CACHE BOOL "Architecture has NEON SIMD enabled")
+    message(STATUS "Use NEON SIMD instructions")
+    add_definitions(-DUSE_NEON)
+endif()
+endif()
+
+# clear binary test folder
+FILE(REMOVE_RECURSE ${CMAKE_BINARY_DIR}/tmp)

cmake/Modules/FindCompiler.cmake

@@ -0,0 +1,8 @@
+# Clang or AppleClang (see CMP0025)
+if(NOT DEFINED C_CLANG AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(C_CLANG 1)
+elseif(NOT DEFINED C_GCC AND CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+    set(C_GCC 1)
+elseif(NOT DEFINED C_MSVC AND CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+    set(C_MSVC 1)
+endif()

cmake/include/Qt5ExternalResources.cmake

@@ -1,80 +0,0 @@
-#
-# External resource support for CMake's Qt5 support, version 1.0
-# written by Grzegorz Antoniak <ga -at- anadoxin -dot- org>
-# http://github.com/antekone/qt5-external-resources-cmake
-#
-# Tested on CMake 3.2.2
-
-# qt5_parse_rcc_depends function
-#
-# Based on original Qt5CoreMacros.cmake/qt5_add_resources function.
-
-function(QT5_PARSE_RCC_DEPENDS infile)
-    set(_RC_DEPENDS)
-    if(EXISTS "${infile}")
-        #  parse file for dependencies
-        #  all files are absolute paths or relative to the location of the qrc file
-        file(READ "${infile}" _RC_FILE_CONTENTS)
-        string(REGEX MATCHALL "<file[^<]+" _RC_FILES "${_RC_FILE_CONTENTS}")
-        foreach(_RC_FILE ${_RC_FILES})
-            string(REGEX REPLACE "^<file[^>]*>" "" _RC_FILE "${_RC_FILE}")
-            if(NOT IS_ABSOLUTE "${_RC_FILE}")
-                set(_RC_FILE "${rc_path}/${_RC_FILE}")
-            endif()
-            set(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}")
-        endforeach()
-        # Since this cmake macro is doing the dependency scanning for these files,
-        # let's make a configured file and add it as a dependency so cmake is run
-        # again when dependencies need to be recomputed.
-        qt5_make_output_file("${infile}" "" "qrc.depends" out_depends)
-        configure_file("${infile}" "${out_depends}" COPYONLY)
-
-        set(out_depends_return ${out_depends} PARENT_SCOPE)
-        set(_RC_DEPENDS_RETURN ${_RC_DEPENDS} PARENT_SCOPE)
-    else()
-        # The .qrc file does not exist (yet). Let's add a dependency and hope
-        # that it will be generated later
-        set(out_depends)
-    endif()
-endfunction()
-
-# qt5_add_external_resources function
-#
-# Usage:
-#
-#    qt5_add_external_resources(outfile res/infile.qrc)
-#
-# This should generate ${CMAKE_BINARY_DIR}/outfile.rcc, ready to be used inside
-# the application. You can also use it like this:
-#
-#    qt5_add_external_resources(outfile res/infile.qrc OPTIONS -someoption)
-#
-# if you would like to add some option to the RCC's command line.
-
-function(QT5_ADD_EXTERNAL_RESOURCES rccfilename qrcfilename)
-    set(options)
-    set(oneValueArgs)
-    set(multiValueArgs OPTIONS)
-
-    cmake_parse_arguments(_RCC "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    set(rcc_files ${_RCC_UNPARSED_ARGUMENTS})
-    set(rcc_options ${_RCC_OPTIONS})
-
-    get_filename_component(outfilename ${rccfilename} NAME_WE)
-    get_filename_component(infile ${qrcfilename} ABSOLUTE)
-    get_filename_component(rc_path ${infile} PATH)
-    set(outfile ${CMAKE_CURRENT_BINARY_DIR}/${outfilename}.rcc)
-
-    qt5_parse_rcc_depends(${infile})
-
-    add_custom_command(OUTPUT ${outfile}
-                       COMMAND ${Qt5Core_RCC_EXECUTABLE}
-                       ARGS ${rcc_options} -name ${outfilename} -o ${outfile} ${infile} -binary
-                       MAIN_DEPENDENCY ${infile}
-                       DEPENDS ${_RC_DEPENDS_RETURN} "${out_depends_return}" VERBATIM)
-    set(_RC_TARGETNAME "qrc_external_${outfilename}")
-    add_custom_target(${_RC_TARGETNAME} ALL DEPENDS ${outfile})
-endfunction()
-
-# vim:set et:

devices/CMakeLists.txt

@@ -1,51 +1,37 @@
 project(devices)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+include_directories(
+    # export.h
+    ${CMAKE_SOURCE_DIR}/exports
+    # util/message.h
+    ${CMAKE_SOURCE_DIR}/sdrbase
+)
 
-find_package(LibUSB)
+if(ENABLE_BLADERF AND LIBBLADERF_FOUND)
-
-if (BUILD_DEBIAN)
     add_subdirectory(bladerf1)
     add_subdirectory(bladerf2)
+endif()
+
+if(ENABLE_HACKRF AND LIBHACKRF_FOUND)
     add_subdirectory(hackrf)
+endif()
+
+if(ENABLE_LIMESUITE AND LIMESUITE_FOUND)
     add_subdirectory(limesdr)
-    add_subdirectory(perseus)
+endif()
-    add_subdirectory(plutosdr)
-    add_subdirectory(soapysdr)
-else(BUILD_DEBIAN)
-    find_package(LibBLADERF)
-    if(LIBUSB_FOUND AND LIBBLADERF_FOUND)
-        add_subdirectory(bladerf1)
-        add_subdirectory(bladerf2)
-    endif(LIBUSB_FOUND AND LIBBLADERF_FOUND)
 
-    find_package(LibHACKRF)
+if(ENABLE_XTRX AND LIBXTRX_FOUND)
-    if(LIBUSB_FOUND AND LIBHACKRF_FOUND)
-        add_subdirectory(hackrf)
-    endif(LIBUSB_FOUND AND LIBHACKRF_FOUND)
-
-    find_package(LimeSuite)
-    if(LIBUSB_FOUND AND LIMESUITE_FOUND)
-        add_subdirectory(limesdr)
-    endif(LIBUSB_FOUND AND LIMESUITE_FOUND)
-
-    find_package(LibXTRX)
-    if(LIBXTRX_FOUND)
     add_subdirectory(xtrx)
-    endif(LIBXTRX_FOUND)
+endif()
 
-    find_package(LibIIO)
+if(ENABLE_IIO AND LIBIIO_FOUND)
-    if(LIBUSB_FOUND AND LIBIIO_FOUND)
     add_subdirectory(plutosdr)
-    endif(LIBUSB_FOUND AND LIBIIO_FOUND)
+endif()
 
-    find_package(LibPerseus)
+if(ENABLE_PERSEUS AND LIBPERSEUS_FOUND)
-    if(LIBUSB_FOUND AND LIBPERSEUS_FOUND)
     add_subdirectory(perseus)
 endif()
 
-    find_package(SoapySDR)
+if(ENABLE_SOAPYSDR AND SOAPYSDR_FOUND)
-    if(SOAPYSDR_FOUND)
     add_subdirectory(soapysdr)
 endif()
-endif (BUILD_DEBIAN)

devices/bladerf1/CMakeLists.txt

@@ -13,40 +13,21 @@ set(bladerf1device_HEADERS
     devicebladerf1shared.h
 )
 
-if (BUILD_DEBIAN)
 include_directories(
-    .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${LIBBLADERFLIBSRC}/include
-    ${LIBBLADERFLIBSRC}/src
-)
-else (BUILD_DEBIAN)
-include_directories(
-    .
     ${CMAKE_CURRENT_BINARY_DIR}
     ${LIBBLADERF_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)
-
-#add_definitions(${QT_DEFINITIONS})
-#add_definitions(-DQT_SHARED)
 
 add_library(bladerf1device SHARED
     ${bladerf1device_SOURCES}
 )
 
-set_target_properties(bladerf1device PROPERTIES DEFINE_SYMBOL "devices_EXPORTS")
+set_target_properties(bladerf1device
+    PROPERTIES DEFINE_SYMBOL "devices_EXPORTS")
 
-if (BUILD_DEBIAN)
-target_link_libraries(bladerf1device
-    bladerf
-    sdrbase
-)
-else (BUILD_DEBIAN)
 target_link_libraries(bladerf1device
     ${LIBBLADERF_LIBRARIES}
     sdrbase
 )
-endif (BUILD_DEBIAN)
 
-install(TARGETS bladerf1device DESTINATION lib)
+install(TARGETS bladerf1device DESTINATION ${INSTALL_LIB_DIR})

devices/bladerf2/CMakeLists.txt

@@ -10,40 +10,21 @@ set(bladerf2device_HEADERS
     devicebladerf2shared.h
 )
 
-if (BUILD_DEBIAN)
 include_directories(
-    .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${LIBBLADERFLIBSRC}/include
-    ${LIBBLADERFLIBSRC}/src
-)
-else (BUILD_DEBIAN)
-include_directories(
-    .
     ${CMAKE_CURRENT_BINARY_DIR}
     ${LIBBLADERF_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)
-
-#add_definitions(${QT_DEFINITIONS})
-#add_definitions(-DQT_SHARED)
 
 add_library(bladerf2device SHARED
     ${bladerf2device_SOURCES}
 )
 
-set_target_properties(bladerf2device PROPERTIES DEFINE_SYMBOL "devices_EXPORTS")
+set_target_properties(bladerf2device
+    PROPERTIES DEFINE_SYMBOL "devices_EXPORTS")
 
-if (BUILD_DEBIAN)
-target_link_libraries(bladerf2device
-    bladerf
-    sdrbase
-)
-else (BUILD_DEBIAN)
 target_link_libraries(bladerf2device
     ${LIBBLADERF_LIBRARIES}
     sdrbase
 )
-endif (BUILD_DEBIAN)
 
-install(TARGETS bladerf2device DESTINATION lib)
+install(TARGETS bladerf2device DESTINATION ${INSTALL_LIB_DIR})

devices/hackrf/CMakeLists.txt

@@ -13,39 +13,21 @@ set(hackrfdevice_HEADERS
     devicehackrfshared.h
 )
 
-if (BUILD_DEBIAN)
 include_directories(
-    .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${LIBHACKRFSRC}
-)
-else (BUILD_DEBIAN)
-include_directories(
-    .
     ${CMAKE_CURRENT_BINARY_DIR}
     ${LIBHACKRF_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)
-
-#add_definitions(${QT_DEFINITIONS})
-#add_definitions(-DQT_SHARED)
 
 add_library(hackrfdevice SHARED
     ${hackrfdevice_SOURCES}
 )
 
-set_target_properties(hackrfdevice PROPERTIES DEFINE_SYMBOL "devices_EXPORTS")
+set_target_properties(hackrfdevice
+    PROPERTIES DEFINE_SYMBOL "devices_EXPORTS")
 
-if (BUILD_DEBIAN)
-target_link_libraries(hackrfdevice
-    hackrf
-    sdrbase
-)
-else (BUILD_DEBIAN)
 target_link_libraries(hackrfdevice
     ${LIBHACKRF_LIBRARIES}
     sdrbase
 )
-endif (BUILD_DEBIAN)
 
-install(TARGETS hackrfdevice DESTINATION lib)
+install(TARGETS hackrfdevice DESTINATION ${INSTALL_LIB_DIR})

devices/limesdr/CMakeLists.txt

@@ -12,47 +12,21 @@ set(limesdrdevice_HEADERS
     devicelimesdrshared.h
 )
 
-if (BUILD_DEBIAN)
 include_directories(
-    .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${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}
     ${LIMESUITE_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)
-
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_SHARED)
 
 add_library(limesdrdevice SHARED
     ${limesdrdevice_SOURCES}
 )
 
-set_target_properties(limesdrdevice PROPERTIES DEFINE_SYMBOL "devices_EXPORTS")
+set_target_properties(limesdrdevice
+    PROPERTIES DEFINE_SYMBOL "devices_EXPORTS")
 
-if (BUILD_DEBIAN)
-target_link_libraries(limesdrdevice
-    limesuite
-    sdrbase
-)
-else (BUILD_DEBIAN)
 target_link_libraries(limesdrdevice
     ${LIMESUITE_LIBRARY}
     sdrbase
 )
-endif (BUILD_DEBIAN)
 
-install(TARGETS limesdrdevice DESTINATION lib)
+install(TARGETS limesdrdevice DESTINATION ${INSTALL_LIB_DIR})

devices/perseus/CMakeLists.txt

@@ -1,7 +1,5 @@
 project(perseusdevice)
 
-set (CMAKE_CXX_STANDARD 11)
-
 set(perseusdevice_SOURCES
     deviceperseus.cpp
     deviceperseusscan.cpp
@@ -12,39 +10,21 @@ set(perseusdevice_HEADERS
     deviceperseusscan.h
 )
 
-if (BUILD_DEBIAN)
 include_directories(
-    .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${LIBPERSEUSSRC}
-)
-else (BUILD_DEBIAN)
-include_directories(
-    .
     ${CMAKE_CURRENT_BINARY_DIR}
     ${LIBPERSEUS_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)
-
-#add_definitions(${QT_DEFINITIONS})
-#add_definitions(-DQT_SHARED)
 
 add_library(perseusdevice SHARED
     ${perseusdevice_SOURCES}
 )
 
-set_target_properties(perseusdevice PROPERTIES DEFINE_SYMBOL "devices_EXPORTS")
+set_target_properties(perseusdevice
+    PROPERTIES DEFINE_SYMBOL "devices_EXPORTS")
 
-if (BUILD_DEBIAN)
-target_link_libraries(perseusdevice
-    perseus
-    sdrbase
-)
-else (BUILD_DEBIAN)
 target_link_libraries(perseusdevice
     ${LIBPERSEUS_LIBRARIES}
     sdrbase
 )
-endif (BUILD_DEBIAN)
 
-install(TARGETS perseusdevice DESTINATION lib)
+install(TARGETS perseusdevice DESTINATION ${INSTALL_LIB_DIR})

devices/plutosdr/CMakeLists.txt

@@ -1,7 +1,5 @@
 project(plutosdrdevice)
 
-set (CMAKE_CXX_STANDARD 11)
-
 set(plutosdrdevice_SOURCES
     deviceplutosdr.cpp
     deviceplutosdrbox.cpp
@@ -18,39 +16,21 @@ set(plutosdrdevice_HEADERS
     deviceplutosdrshared.h
 )
 
-if (BUILD_DEBIAN)
 include_directories(
-    .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${LIBIIOSRC}
-)
-else (BUILD_DEBIAN)
-include_directories(
-    .
     ${CMAKE_CURRENT_BINARY_DIR}
     ${LIBIIO_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)
-
-#add_definitions(${QT_DEFINITIONS})
-#add_definitions(-DQT_SHARED)
 
 add_library(plutosdrdevice SHARED
     ${plutosdrdevice_SOURCES}
 )
 
-set_target_properties(plutosdrdevice PROPERTIES DEFINE_SYMBOL "devices_EXPORTS")
+set_target_properties(plutosdrdevice
+    PROPERTIES DEFINE_SYMBOL "devices_EXPORTS")
 
-if (BUILD_DEBIAN)
-target_link_libraries(plutosdrdevice
-    iio
-    sdrbase
-)
-else (BUILD_DEBIAN)
 target_link_libraries(plutosdrdevice
     ${LIBIIO_LIBRARIES}
     sdrbase
 )
-endif (BUILD_DEBIAN)
 
-install(TARGETS plutosdrdevice DESTINATION lib)
+install(TARGETS plutosdrdevice DESTINATION ${INSTALL_LIB_DIR})

devices/soapysdr/CMakeLists.txt

@@ -1,7 +1,5 @@
 project(soapysdrdevice)
 
-set (CMAKE_CXX_STANDARD 11)
-
 set(soapysdrdevice_SOURCES
 	devicesoapysdr.cpp
     devicesoapysdrscan.cpp
@@ -16,40 +14,21 @@ set(soapysdrdevice_HEADERS
     devicesoapysdrparams.h
 )
 
-if (BUILD_DEBIAN)
 include_directories(
-    .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${SOAPYSDR_SOURCE_DIR}/include
-    ${SOAPYSDR_SOURCE_DIR}/src
-)
-else (BUILD_DEBIAN)
-include_directories(
-    .
     ${CMAKE_CURRENT_BINARY_DIR}
     ${SOAPYSDR_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)
-
-#add_definitions(${QT_DEFINITIONS})
-#add_definitions(-DQT_SHARED)
 
 add_library(soapysdrdevice SHARED
     ${soapysdrdevice_SOURCES}
 )
 
-set_target_properties(soapysdrdevice PROPERTIES DEFINE_SYMBOL "devices_EXPORTS")
+set_target_properties(soapysdrdevice
+    PROPERTIES DEFINE_SYMBOL "devices_EXPORTS")
 
-if (BUILD_DEBIAN)
-target_link_libraries(soapysdrdevice
-    SoapySDR
-    sdrbase
-)
-else (BUILD_DEBIAN)
 target_link_libraries(soapysdrdevice
     ${SOAPYSDR_LIBRARY}
     sdrbase
 )
-endif (BUILD_DEBIAN)
 
-install(TARGETS soapysdrdevice DESTINATION lib)
+install(TARGETS soapysdrdevice DESTINATION ${INSTALL_LIB_DIR})

devices/xtrx/CMakeLists.txt

@@ -13,21 +13,20 @@ set(xtrxdevice_HEADERS
 )
 
 include_directories(
-    .
     ${CMAKE_CURRENT_BINARY_DIR}
     ${LIBXTRX_INCLUDE_DIRS}
 )
 
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_SHARED)
-
 add_library(xtrxdevice SHARED
     ${xtrxdevice_SOURCES}
 )
 
+set_target_properties(xtrxdevice
+    PROPERTIES DEFINE_SYMBOL "devices_EXPORTS")
+
 target_link_libraries(xtrxdevice
     ${LIBXTRX_LIBRARIES}
     sdrbase
 )
 
-install(TARGETS xtrxdevice DESTINATION lib)
+install(TARGETS xtrxdevice DESTINATION ${INSTALL_LIB_DIR})

externals/cm256cc/CMakeLists.txt

@@ -31,4 +31,4 @@ add_library(cm256cc SHARED
     ${cm256cc_SOURCES}
 )
 
-install(TARGETS cm256cc DESTINATION lib)
+install(TARGETS cm256cc DESTINATION ${INSTALL_LIB_DIR})

externals/dsdcc/CMakeLists.txt

@@ -84,4 +84,4 @@ target_link_libraries(dsdcc
     mbelib
 )
 
-install(TARGETS dsdcc DESTINATION lib)
+install(TARGETS dsdcc DESTINATION ${INSTALL_LIB_DIR})

externals/libairspy/CMakeLists.txt

@@ -37,4 +37,4 @@ target_link_libraries(airspy
     ${LIBUSB_LIBRARIES}
 )
 
-install(TARGETS airspy DESTINATION lib)
+install(TARGETS airspy DESTINATION ${INSTALL_LIB_DIR})

externals/libairspyhf/CMakeLists.txt

@@ -32,4 +32,4 @@ target_link_libraries(airspyhf
     ${LIBUSB_LIBRARIES}
 )
 
-install(TARGETS airspyhf DESTINATION lib)
+install(TARGETS airspyhf DESTINATION ${INSTALL_LIB_DIR})

externals/libbladerf/CMakeLists.txt

@@ -154,5 +154,5 @@ target_link_libraries(bladerf
     ${LIBUSB_LIBRARIES}
 )
 
-install(TARGETS bladerf DESTINATION lib)
+install(TARGETS bladerf DESTINATION ${INSTALL_LIB_DIR})
 

externals/libhackrf/CMakeLists.txt

@@ -29,4 +29,4 @@ target_link_libraries(hackrf
     ${LIBUSB_LIBRARIES}
 )
 
-install(TARGETS hackrf DESTINATION lib)
+install(TARGETS hackrf DESTINATION ${INSTALL_LIB_DIR})

externals/libiio/CMakeLists.txt

@@ -331,7 +331,7 @@ endif()
 if(NOT SKIP_INSTALL_ALL)
     install(TARGETS iio
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        LIBRARY DESTINATION lib
+        LIBRARY DESTINATION ${INSTALL_LIB_DIR}
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
         FRAMEWORK DESTINATION /Library/Frameworks
         PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

externals/liblimesuite/CMakeLists.txt

@@ -96,6 +96,6 @@ target_link_libraries(limesuite
     ${LIBUSB_LIBRARIES}
 )
 
-install(TARGETS limesuite DESTINATION lib)
+install(TARGETS limesuite DESTINATION ${INSTALL_LIB_DIR})
 
 

externals/libmirisdr/CMakeLists.txt

@@ -56,4 +56,4 @@ target_link_libraries(mirisdr
     ${LIBUSB_LIBRARIES}
 )
 
-install(TARGETS mirisdr DESTINATION lib)
+install(TARGETS mirisdr DESTINATION ${INSTALL_LIB_DIR})

externals/libperseus/CMakeLists.txt

@@ -39,4 +39,4 @@ target_link_libraries(perseus
     ${LIBUSB_LIBRARIES}
 )
 
-install(TARGETS perseus DESTINATION lib)
+install(TARGETS perseus DESTINATION ${INSTALL_LIB_DIR})

externals/librtlsdr/CMakeLists.txt

@@ -53,4 +53,4 @@ target_link_libraries(rtlsdr
     ${LIBUSB_LIBRARIES}
 )
 
-install(TARGETS rtlsdr DESTINATION lib)
+install(TARGETS rtlsdr DESTINATION ${INSTALL_LIB_DIR})

externals/libsoapysdr/CMakeLists.txt

@@ -158,4 +158,4 @@ message(STATUS "Install prefix: ${CMAKE_INSTALL_PREFIX}")
 #    ${soapysdr_SOURCES}
 #)
 #
-#install(TARGETS soapysdr DESTINATION lib)
+#install(TARGETS soapysdr DESTINATION ${INSTALL_LIB_DIR})

externals/mbelib/CMakeLists.txt

@@ -35,4 +35,4 @@ add_library(mbelib SHARED
 target_link_libraries(mbelib
 )
 
-install(TARGETS mbelib DESTINATION lib)
+install(TARGETS mbelib DESTINATION ${INSTALL_LIB_DIR})

externals/serialdv/CMakeLists.txt

@@ -28,4 +28,4 @@ target_link_libraries(serialdv
     ${LIBUSB_LIBRARIES}
 )
 
-install(TARGETS serialdv DESTINATION lib)
+install(TARGETS serialdv DESTINATION ${INSTALL_LIB_DIR})

fcdhid/CMakeLists.txt

@@ -14,15 +14,11 @@ set(fcdhid_HEADERS
 )
 
 include_directories(
-	.
 	${CMAKE_CURRENT_BINARY_DIR}
         ${LIBUSB_INCLUDE_DIR}
         ${ICONV_INCLUDE_DIR}
 )
 
-#add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
 add_library(fcdhid SHARED
 	${fcdhid_SOURCES}
 )
@@ -32,4 +28,4 @@ target_link_libraries(fcdhid
         ${ICONV_LIBRARY}
 )
 
-install(TARGETS fcdhid DESTINATION lib)
+install(TARGETS fcdhid DESTINATION ${INSTALL_LIB_DIR})

fcdlib/CMakeLists.txt

@@ -13,17 +13,13 @@ set(fcdlib_HEADERS
 )
 
 include_directories(
-	.
 	${CMAKE_CURRENT_BINARY_DIR}
 )
 
-#add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
 add_library(fcdlib SHARED
 	${fcdlib_SOURCES}
 )
 
 target_link_libraries(fcdlib)
 
-install(TARGETS fcdlib DESTINATION lib)
+install(TARGETS fcdlib DESTINATION ${INSTALL_LIB_DIR})

httpserver/CMakeLists.txt

@@ -1,7 +1,5 @@
 project(httpserver)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(httpserver_SOURCES
    httpglobal.cpp
    httplistener.cpp
@@ -34,26 +32,17 @@ set(httpserver_HEADERS
 )
 
 include_directories(
-	.
-    ${CMAKE_SOURCE_DIR}/exports
     ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/exports
 )
 
-#include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_SHARED)
-
 add_library(httpserver SHARED
 	${httpserver_SOURCES}
-	${httpserver_HEADERS_MOC}
 )
 
-set_target_properties(httpserver PROPERTIES DEFINE_SYMBOL "httpserver_EXPORTS")
-
 target_link_libraries(httpserver
-	${QT_LIBRARIES}
+    Qt5::Core
+    Qt5::Network
 )
 
-target_link_libraries(httpserver Qt5::Core Qt5::Network)
+install(TARGETS httpserver DESTINATION ${INSTALL_LIB_DIR})
-
-install(TARGETS httpserver DESTINATION lib)

libfreedv/CMakeLists.txt

@@ -1,7 +1,5 @@
 project(freedv)
 
-set(CMAKE_CXX_STANDARD 11)
-
 set(freedv_SOURCES
 	codec2_fft.cpp
 	cohpsk.cpp
@@ -67,13 +65,10 @@ set(freedv_HEADERS
 )
 
 include_directories(
-	.
 	${CMAKE_CURRENT_BINARY_DIR}
 	${CODEC2_INCLUDE_DIR}
 )
 
-add_definitions(-DQT_SHARED)
-
 add_library(freedv SHARED
 	${freedv_SOURCES}
 )
@@ -82,4 +77,4 @@ target_link_libraries(freedv
 	${CODEC2_LIBRARIES}
 )
 
-install(TARGETS freedv DESTINATION lib)
+install(TARGETS freedv DESTINATION ${INSTALL_LIB_DIR})

logging/CMakeLists.txt

@@ -1,7 +1,5 @@
 project(logging)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 set(logging_SOURCES
    dualfilelogger.cpp
    loggerwithfile.cpp
@@ -20,26 +18,17 @@ set(httpserver_HEADERS
 )
 
 include_directories(
-	.
-    ${CMAKE_SOURCE_DIR}/exports 
     ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/exports
 )
 
-#include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-add_definitions(-DQT_SHARED)
-
 add_library(logging SHARED
     ${logging_SOURCES}
-	${logging_HEADERS_MOC}
 )
 
-set_target_properties(logging PROPERTIES DEFINE_SYMBOL "logging_EXPORTS")
-
 target_link_libraries(logging
-	${QT_LIBRARIES}
+    Qt5::Core
+    Qt5::Network
 )
 
-target_link_libraries(logging Qt5::Core Qt5::Network)
+install(TARGETS logging DESTINATION ${INSTALL_LIB_DIR})
-
-install(TARGETS logging DESTINATION lib)

plugins/CMakeLists.txt

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

plugins/channelrx/CMakeLists.txt

@@ -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)
+if(NOT SERVER_MODE)
-    add_subdirectory(demoddsd)
+    add_subdirectory(demodlora)
-    add_subdirectory(remotesink)
+    add_subdirectory(chanalyzer)
-endif (BUILD_DEBIAN)
+    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()

plugins/channelrx/chanalyzer/CMakeLists.txt

@@ -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 ${INSTALL_LIB_DIR}/plugins/channelrx)
-
-install(TARGETS chanalyzer DESTINATION lib/plugins/channelrx)

plugins/channelrx/demodam/CMakeLists.txt

@@ -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
 )
 
-#include(${QT_USE_FILE})
+if(NOT SERVER_MODE)
-add_definitions(${QT_DEFINITIONS})
+    set(am_SOURCES
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-#qt5_wrap_cpp(nfm_HEADERS_MOC ${nfm_HEADERS})
-qt5_wrap_ui(am_FORMS_HEADERS ${am_FORMS})
-
-add_library(demodam SHARED
         ${am_SOURCES}
-	${am_HEADERS_MOC}
+        amdemodgui.cpp
-	${am_FORMS_HEADERS}
+        amdemodssbdialog.cpp
+
+        amdemodgui.ui
+        amdemodssb.ui
+    )
+    set(am_HEADERS
+        ${am_HEADERS}
+	amdemodgui.h
+        amdemodssbdialog.h
     )
 
-target_link_libraries(demodam
+    set(TARGET_NAME demodam)
-	${QT_LIBRARIES}
+    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}
+)
+
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
+	${TARGET_LIB_GUI}
 )
 
-target_link_libraries(demodam Qt5::Core Qt5::Widgets)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channelrx)
-
-install(TARGETS demodam DESTINATION lib/plugins/channelrx)

plugins/channelrx/demodatv/CMakeLists.txt

@@ -1,12 +1,12 @@
 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
@@ -16,36 +16,20 @@ set(atv_HEADERS
 	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 ${INSTALL_LIB_DIR}/plugins/channelrx)
-
-install(TARGETS demodatv DESTINATION lib/plugins/channelrx)

plugins/channelrx/demodbfm/CMakeLists.txt

@@ -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)
-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})
+if(NOT SERVER_MODE)
-add_definitions(${QT_DEFINITIONS})
+    set(bfm_SOURCES
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-qt5_wrap_ui(bfm_FORMS_HEADERS ${bfm_FORMS})
-
-add_library(demodbfm SHARED
         ${bfm_SOURCES}
-	${bfm_HEADERS_MOC}
+	bfmdemodgui.cpp
-	${bfm_FORMS_HEADERS}
+
+	bfmdemodgui.ui
+    )
+    set(bfm_HEADERS
+        ${bfm_HEADERS}
+        bfmdemodgui.h
     )
 
-target_link_libraries(demodbfm
+    set(TARGET_NAME demodbfm)
-	${QT_LIBRARIES}
+    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()
+
+add_library(${TARGET_NAME} SHARED
+	${bfm_SOURCES}
+)
+
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
+        ${TARGET_LIB_GUI}
 )
 
-target_link_libraries(demodbfm Qt5::Core Qt5::Widgets)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channelrx)
-
-install(TARGETS demodbfm DESTINATION lib/plugins/channelrx)

plugins/channelrx/demoddatv/CMakeLists.txt

@@ -1,6 +1,5 @@
 project(datv)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
 set(datv_SOURCES
     datvdemod.cpp
@@ -14,6 +13,8 @@ set(datv_SOURCES
     leansdr/framework.cpp
     leansdr/math.cpp
     leansdr/sdr.cpp
+
+    datvdemodgui.ui
 )
 
 set(datv_HEADERS
@@ -30,12 +31,7 @@ set(datv_HEADERS
     leansdr/sdr.h
 )
 
-set(datv_FORMS
-	datvdemodgui.ui
-)
-
 include_directories(
-	.
     ${CMAKE_CURRENT_BINARY_DIR}
     ${AVCODEC_INCLUDE_DIRS}
     ${AVFORMAT_INCLUDE_DIRS}
@@ -44,22 +40,15 @@ include_directories(
     ${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}
 )
 
 target_link_libraries(demoddatv
-	${QT_LIBRARIES}
+    Qt5::Core
+    Qt5::Widgets
+    Qt5::Multimedia
+    Qt5::MultimediaWidgets
     sdrbase
     sdrgui
     ${AVCODEC_LIBRARIES}
@@ -69,7 +58,4 @@ target_link_libraries(demoddatv
     ${SWRESAMPLE_LIBRARIES}
 )
 
-find_package(Qt5MultimediaWidgets 5.0 REQUIRED)
+install(TARGETS demoddatv DESTINATION ${INSTALL_LIB_DIR}/plugins/channelrx)
-target_link_libraries(demoddatv Qt5::Core Qt5::Widgets Qt5::Multimedia Qt5::MultimediaWidgets)
-
-install(TARGETS demoddatv DESTINATION lib/plugins/channelrx)

plugins/channelrx/demoddsd/CMakeLists.txt

@@ -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
     ${LIBDSDCC_INCLUDE_DIR}
     ${LIBMBE_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)
 
-#include(${QT_USE_FILE})
+if(NOT SERVER_MODE)
-add_definitions(${QT_DEFINITIONS})
+    set(dsddemod_SOURCES
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-qt5_wrap_ui(dsddemod_FORMS_HEADERS ${dsddemod_FORMS})
-
-add_library(demoddsd SHARED
         ${dsddemod_SOURCES}
-    ${dsddemod_HEADERS_MOC}
+        dsddemodgui.cpp
-    ${dsddemod_FORMS_HEADERS}
+        dsdstatustextdialog.cpp
+
+        dsddemodgui.ui
+        dsdstatustextdialog.ui
+    )
+    set(dsddemod_HEADERS
+        ${dsddemod_HEADERS}
+        dsddemodgui.h
+        dsdstatustextdialog.h
     )
 
-if (BUILD_DEBIAN)
+    set(TARGET_NAME demoddsd)
-target_link_libraries(demoddsd
+    set(TARGET_LIB "Qt5::Widgets")
-    ${QT_LIBRARIES}
+    set(TARGET_LIB_GUI "sdrgui")
-    sdrbase
+    set(INSTALL_FOLDER "plugins")
-    sdrgui
+else()
-    dsdcc
+    set(TARGET_NAME demoddsdsrv)
-    mbelib
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
+	${dsddemod_SOURCES}
 )
-else (BUILD_DEBIAN)
+
-target_link_libraries(demoddsd
+target_link_libraries(${TARGET_NAME}
-    ${QT_LIBRARIES}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-    sdrgui
+	${TARGET_LIB_GUI}
         ${LIBDSDCC_LIBRARIES}
         ${LIBMBE_LIBRARY}
 )
-endif (BUILD_DEBIAN)
 
-
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channelrx)
-target_link_libraries(demoddsd Qt5::Core Qt5::Widgets)
-
-install(TARGETS demoddsd DESTINATION lib/plugins/channelrx)

plugins/channelrx/demodfreedv/CMakeLists.txt

@@ -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}
 )
 
-add_definitions(${QT_DEFINITIONS})
+if(NOT SERVER_MODE)
-add_definitions(-DQT_PLUGIN)
+    set(freedv_SOURCES
-add_definitions(-DQT_SHARED)
-
-qt5_wrap_ui(freedv_FORMS_HEADERS ${freedv_FORMS})
-
-add_library(demodfreedv SHARED
         ${freedv_SOURCES}
-	${freedv_HEADERS_MOC}
+        freedvdemodgui.cpp
-	${freedv_FORMS_HEADERS}
+
+	freedvdemodgui.ui
+    )
+    set(freedv_HEADERS
+        ${freedv_HEADERS}
+        freedvdemodgui.h
     )
 
-target_link_libraries(demodfreedv
+    set(TARGET_NAME demodfreedv)
-	${QT_LIBRARIES}
+    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}
+)
+
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
+	${TARGET_LIB_GUI}
         swagger
         freedv
         ${CODEC2_LIBRARIES}
 )
 
-target_link_libraries(demodfreedv Qt5::Core Qt5::Widgets)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channelrx)
-
-install(TARGETS demodfreedv DESTINATION lib/plugins/channelrx)

plugins/channelrx/demodlora/CMakeLists.txt

@@ -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 ${INSTALL_LIB_DIR}/plugins/channelrx)
-
-install(TARGETS demodlora DESTINATION lib/plugins/channelrx)

plugins/channelrx/demodnfm/CMakeLists.txt

@@ -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
 )
 
-#include(${QT_USE_FILE})
+if(NOT SERVER_MODE)
-add_definitions(${QT_DEFINITIONS})
+    set(nfm_SOURCES
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-#qt5_wrap_cpp(nfm_HEADERS_MOC ${nfm_HEADERS})
-qt5_wrap_ui(nfm_FORMS_HEADERS ${nfm_FORMS})
-
-add_library(demodnfm SHARED
         ${nfm_SOURCES}
-	${nfm_HEADERS_MOC}
+        nfmdemodgui.cpp
-	${nfm_FORMS_HEADERS}
+
+	nfmdemodgui.ui
+    )
+    set(nfm_HEADERS
+        ${nfm_HEADERS}
+        nfmdemodgui.h
     )
 
-target_link_libraries(demodnfm
+    set(TARGET_NAME demodnfm)
-	${QT_LIBRARIES}
+    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}
+)
+
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
+	${TARGET_LIB_GUI}
         swagger
 )
 
-target_link_libraries(demodnfm Qt5::Core Qt5::Widgets)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channelrx)
-
-install(TARGETS demodnfm DESTINATION lib/plugins/channelrx)

plugins/channelrx/demodssb/CMakeLists.txt

@@ -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
 )
 
-#include(${QT_USE_FILE})
+if(NOT SERVER_MODE)
-add_definitions(${QT_DEFINITIONS})
+    set(ssb_SOURCES
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-#qt5_wrap_cpp(ssb_HEADERS_MOC ${ssb_HEADERS})
-qt5_wrap_ui(ssb_FORMS_HEADERS ${ssb_FORMS})
-
-add_library(demodssb SHARED
         ${ssb_SOURCES}
-	${ssb_HEADERS_MOC}
+        ssbdemodgui.cpp
-	${ssb_FORMS_HEADERS}
+
+        ssbdemodgui.ui
+    )
+    set(ssb_HEADERS
+        ${ssb_HEADERS}
+        ssbdemodgui.h
     )
 
-target_link_libraries(demodssb
+    set(TARGET_NAME demodssb)
-	${QT_LIBRARIES}
+    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}
+)
+
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
+	${TARGET_LIB_GUI}
         swagger
 )
 
-target_link_libraries(demodssb Qt5::Core Qt5::Widgets)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channelrx)
-
-install(TARGETS demodssb DESTINATION lib/plugins/channelrx)

plugins/channelrx/demodwfm/CMakeLists.txt

@@ -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
 )
 
-#include(${QT_USE_FILE})
+if(NOT SERVER_MODE)
-add_definitions(${QT_DEFINITIONS})
+    set(wfm_SOURCES
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-#qt5_wrap_cpp(nfm_HEADERS_MOC ${nfm_HEADERS})
-qt5_wrap_ui(wfm_FORMS_HEADERS ${wfm_FORMS})
-
-add_library(demodwfm SHARED
         ${wfm_SOURCES}
-	${wfm_HEADERS_MOC}
+        wfmdemodgui.cpp
-	${wfm_FORMS_HEADERS}
+
+	wfmdemodgui.ui
+    )
+    set(wfm_HEADERS
+        ${wfm_HEADERS}
+        wfmdemodgui.h
     )
 
-target_link_libraries(demodwfm
+    set(TARGET_NAME demodwfm)
-	${QT_LIBRARIES}
+    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}
+)
+
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
+	${TARGET_LIB_GUI}
 )
 
-target_link_libraries(demodwfm Qt5::Core Qt5::Widgets)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channelrx)
-
-install(TARGETS demodwfm DESTINATION lib/plugins/channelrx)

plugins/channelrx/remotesink/CMakeLists.txt

@@ -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
+include_directories(
-	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
-    .
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
     ${CM256CC_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)
 
-if (BUILD_DEBIAN)
+if(NOT SERVER_MODE)
-target_link_libraries(remotesink
+    set(remotesink_SOURCES
-    ${QT_LIBRARIES}
+        ${remotesink_SOURCES}
-    cm256cc
+        remotesinkgui.cpp
-    sdrbase
+
-    sdrgui
+	remotesinkgui.ui
-    swagger
     )
-else (BUILD_DEBIAN)
+    set(remotesink_HEADERS
-target_link_libraries(remotesink
+        ${remotesink_HEADERS}
-    ${QT_LIBRARIES}
+        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}
+)
+
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
+	sdrbase
+	${TARGET_LIB_GUI}
         ${CM256CC_LIBRARIES}
-    sdrbase
-    sdrgui
         swagger
 )
-endif (BUILD_DEBIAN)
 
-target_link_libraries(remotesink Qt5::Core Qt5::Widgets)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channelrx)
-
-install(TARGETS remotesink DESTINATION lib/plugins/channelrx)

plugins/channelrx/udpsink/CMakeLists.txt

@@ -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
 )
 
-#include(${QT_USE_FILE})
+if(NOT SERVER_MODE)
-add_definitions(${QT_DEFINITIONS})
+    set(udpsink_SOURCES
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-qt5_wrap_ui(udpsink_FORMS_HEADERS ${udpsink_FORMS})
-
-add_library(udpsink SHARED
         ${udpsink_SOURCES}
-	${udpsink_HEADERS_MOC}
+        udpsinkgui.cpp
-	${udpsink_FORMS_HEADERS}
+
+	udpsinkgui.ui
+    )
+    set(udpsink_HEADERS
+        ${udpsink_HEADERS}
+        udpsinkgui.h
     )
 
-target_link_libraries(udpsink
+    set(TARGET_NAME udpsink)
-	${QT_LIBRARIES}
+    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}
+)
+
+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 ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channelrx)
-
-install(TARGETS udpsink DESTINATION lib/plugins/channelrx)

plugins/channeltx/CMakeLists.txt

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

plugins/channeltx/modam/CMakeLists.txt

@@ -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
 )
 
-add_definitions(${QT_DEFINITIONS})
+if(NOT SERVER_MODE)
-add_definitions(-DQT_PLUGIN)
+    set(modam_SOURCES
-add_definitions(-DQT_SHARED)
-
-qt5_wrap_ui(modam_FORMS_HEADERS ${modam_FORMS})
-
-add_library(modam SHARED
         ${modam_SOURCES}
-	${modam_HEADERS_MOC}
+        ammodgui.cpp
-	${modam_FORMS_HEADERS}
+
+        ammodgui.ui
+    )
+    set(modam_HEADERS
+        ${modam_HEADERS}
+        ammodgui.h
     )
 
-target_link_libraries(modam
+    set(TARGET_NAME modam)
-	${QT_LIBRARIES}
+    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}
+)
+
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
+	${TARGET_LIB_GUI}
         swagger
 )
 
-target_link_libraries(modam Qt5::Core Qt5::Widgets)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channeltx)
-
-install(TARGETS modam DESTINATION lib/plugins/channeltx)
-

plugins/channeltx/modatv/CMakeLists.txt

@@ -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
 )
 
-add_definitions(${QT_DEFINITIONS})
+if(NOT SERVER_MODE)
-add_definitions(-DQT_PLUGIN)
+    set(modatv_SOURCES
-add_definitions(-DQT_SHARED)
-
-qt5_wrap_ui(modatv_FORMS_HEADERS ${modatv_FORMS})
-
-add_library(modatv SHARED
         ${modatv_SOURCES}
-	${modatv_HEADERS_MOC}
+        atvmodgui.cpp
-	${modatv_FORMS_HEADERS}
+
+        atvmodgui.ui
+    )
+    set(modatv_HEADERS
+        ${modatv_HEADERS}
+        atvmodgui.h
     )
 
-target_link_libraries(modatv
+    set(TARGET_NAME modatv)
-    ${OpenCV_LIBS}
+    set(TARGET_LIB "Qt5::Widgets")
-	${QT_LIBRARIES}
+    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}
+)
+
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
+	${TARGET_LIB_GUI}
         swagger
+        ${OpenCV_LIBS}
 )
 
-target_link_libraries(modatv Qt5::Core Qt5::Widgets)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channeltx)
-
-install(TARGETS modatv DESTINATION lib/plugins/channeltx)

plugins/channeltx/modfreedv/CMakeLists.txt

@@ -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})
+if(NOT SERVER_MODE)
-add_definitions(-DQT_PLUGIN)
+    set(modfreedv_SOURCES
-add_definitions(-DQT_SHARED)
-
-qt5_wrap_ui(modfreedv_FORMS_HEADERS ${modfreedv_FORMS})
-
-add_library(modfreedv SHARED
         ${modfreedv_SOURCES}
-    ${modfreedv_HEADERS_MOC}
+        freedvmodgui.cpp
-    ${modfreedv_FORMS_HEADERS}
+
+        freedvmodgui.ui
+    )
+    set(modfreedv_HEADERS
+        ${modfreedv_HEADERS}
+        freedvmodgui.h
     )
 
-target_link_libraries(modfreedv
+    set(TARGET_NAME modfreedv)
-    ${QT_LIBRARIES}
+    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(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-    sdrgui
+	${TARGET_LIB_GUI}
         swagger
         freedv
         ${CODEC2_LIBRARIES}
 )
 
-target_link_libraries(modfreedv Qt5::Core Qt5::Widgets)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channeltx)
-
-install(TARGETS modfreedv DESTINATION lib/plugins/channeltx)

plugins/channeltx/modnfm/CMakeLists.txt

@@ -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
 )
 
-add_definitions(${QT_DEFINITIONS})
+if(NOT SERVER_MODE)
-add_definitions(-DQT_PLUGIN)
+    set(modnfm_SOURCES
-add_definitions(-DQT_SHARED)
-
-qt5_wrap_ui(modnfm_FORMS_HEADERS ${modnfm_FORMS})
-
-add_library(modnfm SHARED
         ${modnfm_SOURCES}
-	${modnfm_HEADERS_MOC}
+        nfmmodgui.cpp
-	${modnfm_FORMS_HEADERS}
+
+        nfmmodgui.ui
+    )
+    set(modnfm_HEADERS
+        ${modnfm_HEADERS}
+        nfmmodgui.h
     )
 
-target_link_libraries(modnfm
+    set(TARGET_NAME modnfm)
-	${QT_LIBRARIES}
+    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}
+)
+
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
+	${TARGET_LIB_GUI}
         swagger
 )
 
-target_link_libraries(modnfm Qt5::Core Qt5::Widgets)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channeltx)
-
-install(TARGETS modnfm DESTINATION lib/plugins/channeltx)

plugins/channeltx/modssb/CMakeLists.txt

@@ -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
 )
 
-add_definitions(${QT_DEFINITIONS})
+if(NOT SERVER_MODE)
-add_definitions(-DQT_PLUGIN)
+    set(modssb_SOURCES
-add_definitions(-DQT_SHARED)
-
-qt5_wrap_ui(modssb_FORMS_HEADERS ${modssb_FORMS})
-
-add_library(modssb SHARED
         ${modssb_SOURCES}
-    ${modssb_HEADERS_MOC}
+        ssbmodgui.cpp
-    ${modssb_FORMS_HEADERS}
+
+        ssbmodgui.ui
+    )
+    set(modssb_HEADERS
+        ${modssb_HEADERS}
+        ssbmodgui.h
     )
 
-target_link_libraries(modssb
+    set(TARGET_NAME modssb)
-    ${QT_LIBRARIES}
+    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(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-    sdrgui
+	${TARGET_LIB_GUI}
         swagger
 )
 
-target_link_libraries(modssb Qt5::Core Qt5::Widgets)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channeltx)
-
-install(TARGETS modssb DESTINATION lib/plugins/channeltx)

plugins/channeltx/modwfm/CMakeLists.txt

@@ -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
 )
 
-add_definitions(${QT_DEFINITIONS})
+if(NOT SERVER_MODE)
-add_definitions(-DQT_PLUGIN)
+    set(modwfm_SOURCES
-add_definitions(-DQT_SHARED)
-
-qt5_wrap_ui(modwfm_FORMS_HEADERS ${modwfm_FORMS})
-
-add_library(modwfm SHARED
         ${modwfm_SOURCES}
-	${modwfm_HEADERS_MOC}
+        wfmmodgui.cpp
-	${modwfm_FORMS_HEADERS}
+
+        wfmmodgui.ui
+    )
+    set(modwfm_HEADERS
+        ${modwfm_HEADERS}
+        wfmmodgui.h
     )
 
-target_link_libraries(modwfm
+    set(TARGET_NAME modwfm)
-	${QT_LIBRARIES}
+    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}
+)
+
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
+	${TARGET_LIB_GUI}
         swagger
 )
 
-target_link_libraries(modwfm Qt5::Core Qt5::Widgets)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channeltx)
-
-install(TARGETS modwfm DESTINATION lib/plugins/channeltx)

plugins/channeltx/remotesource/CMakeLists.txt

@@ -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
+include_directories(
-	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
-    .
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
     ${CM256CC_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)
 
-if (BUILD_DEBIAN)
+if(NOT SERVER_MODE)
-target_link_libraries(remotesource
+    set(remotesource_SOURCES
-    ${QT_LIBRARIES}
+        ${remotesource_SOURCES}
-    cm256cc
+        remotesourcegui.cpp
-    sdrbase
+
-    sdrgui
+        remotesourcegui.ui
-    swagger
     )
-else (BUILD_DEBIAN)
+    set(remotesource_HEADERS
-target_link_libraries(remotesource
+        ${remotesource_HEADERS}
-    ${QT_LIBRARIES}
+        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}
+)
+
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
+        Qt5::Network
+	sdrbase
+	${TARGET_LIB_GUI}
+        swagger
         ${CM256CC_LIBRARIES}
-    sdrbase
-    sdrgui
-    swagger
 )
-endif (BUILD_DEBIAN)
 
-target_link_libraries(remotesource Qt5::Core Qt5::Widgets Qt5::Network)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channeltx)
-
-install(TARGETS remotesource DESTINATION lib/plugins/channeltx)

plugins/channeltx/udpsource/CMakeLists.txt

@@ -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})
+if(NOT SERVER_MODE)
-add_definitions(${QT_DEFINITIONS})
+    set(udpsource_SOURCES
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-qt5_wrap_ui(udpsource_FORMS_HEADERS ${udpsource_FORMS})
-
-add_library(udpsource SHARED
         ${udpsource_SOURCES}
-	${udpsource_HEADERS_MOC}
+        udpsourcegui.cpp
-	${udpsource_FORMS_HEADERS}
+
+        udpsourcegui.ui
+    )
+    set(udpsource_HEADERS
+        ${udpsource_HEADERS}
+        udpsourcegui.h
     )
 
-target_link_libraries(udpsource
+    set(TARGET_NAME udpsource)
-	${QT_LIBRARIES}
+    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}
+)
+
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
+        Qt5::Network
 	sdrbase
-	sdrgui
+	${TARGET_LIB_GUI}
         swagger
 )
 
-target_link_libraries(udpsource Qt5::Core Qt5::Widgets Qt5::Network)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/channeltx)
-
-install(TARGETS udpsource DESTINATION lib/plugins/channeltx)

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}/devices
 	${LIBBLADERF_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)
 
-#include(${QT_USE_FILE})
+if(NOT SERVER_MODE)
-add_definitions(${QT_DEFINITIONS})
+    set(bladerf1output_SOURCES
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-#qt4_wrap_cpp(bladerf1output_HEADERS_MOC ${bladerf1output_HEADERS})
-qt5_wrap_ui(bladerf1output_FORMS_HEADERS ${bladerf1output_FORMS})
-
-add_library(outputbladerf1 SHARED
         ${bladerf1output_SOURCES}
-	${bladerf1output_HEADERS_MOC}
+        bladerf1outputgui.cpp
-	${bladerf1output_FORMS_HEADERS}
+
+        bladerf1outputgui.ui
+    )
+    set(bladerf1output_HEADERS
+        ${bladerf1output_HEADERS}
+        bladerf1outputgui.h
     )
 
-if (BUILD_DEBIAN)
+    set(TARGET_NAME outputbladerf1)
-target_link_libraries(outputbladerf1
+    set(TARGET_LIB "Qt5::Widgets")
-    ${QT_LIBRARIES}
+    set(TARGET_LIB_GUI "sdrgui")
-    bladerf
+    set(INSTALL_FOLDER "plugins")
-    sdrbase
+else()
-    sdrgui
+    set(TARGET_NAME outputbladerf1srv)
-    swagger
+    set(TARGET_LIB "")
-    bladerf1device
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
+	${bladerf1output_SOURCES}
 )
-else (BUILD_DEBIAN)
+
-target_link_libraries(outputbladerf1
+target_link_libraries(${TARGET_NAME}
-	${QT_LIBRARIES}
+        Qt5::Core
+        ${TARGET_LIB}
+	sdrbase
+	${TARGET_LIB_GUI}
+        swagger
         ${LIBBLADERF_LIBRARIES}
-	sdrbase
-	sdrgui
-	swagger
         bladerf1device
 )
-endif (BUILD_DEBIAN)
 
-target_link_libraries(outputbladerf1 Qt5::Core Qt5::Widgets)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesink)
-
-install(TARGETS outputbladerf1 DESTINATION lib/plugins/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}/devices
 	${LIBBLADERF_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)
 
-#include(${QT_USE_FILE})
+if(NOT SERVER_MODE)
-add_definitions(${QT_DEFINITIONS})
+    set(bladerf2output_SOURCES
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-#qt4_wrap_cpp(bladerf2output_HEADERS_MOC ${bladerf2output_HEADERS})
-qt5_wrap_ui(bladerf2output_FORMS_HEADERS ${bladerf2output_FORMS})
-
-add_library(outputbladerf2 SHARED
         ${bladerf2output_SOURCES}
-	${bladerf2output_HEADERS_MOC}
+        bladerf2outputgui.cpp
-	${bladerf2output_FORMS_HEADERS}
+
+        bladerf2outputgui.ui
+    )
+    set(bladerf2output_HEADERS
+        ${bladerf2output_HEADERS}
+        bladerf2outputgui.h
     )
 
-if (BUILD_DEBIAN)
+    set(TARGET_NAME outputbladerf2)
-target_link_libraries(outputbladerf2
+    set(TARGET_LIB "Qt5::Widgets")
-    ${QT_LIBRARIES}
+    set(TARGET_LIB_GUI "sdrgui")
-    bladerf
+    set(INSTALL_FOLDER "plugins")
-    sdrbase
+else()
-    sdrgui
+    set(TARGET_NAME outputbladerf2srv)
-    swagger
+    set(TARGET_LIB "")
-    bladerf2device
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
+	${bladerf2output_SOURCES}
 )
-else (BUILD_DEBIAN)
+
-target_link_libraries(outputbladerf2
+target_link_libraries(${TARGET_NAME}
-	${QT_LIBRARIES}
+        Qt5::Core
+        ${TARGET_LIB}
+	sdrbase
+	${TARGET_LIB_GUI}
+        swagger
         ${LIBBLADERF_LIBRARIES}
-	sdrbase
-	sdrgui
-	swagger
         bladerf2device
 )
-endif (BUILD_DEBIAN)
 
-target_link_libraries(outputbladerf2 Qt5::Core Qt5::Widgets)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesink)
-
-install(TARGETS outputbladerf2 DESTINATION lib/plugins/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
 )
 
-add_definitions(${QT_DEFINITIONS})
+if(NOT SERVER_MODE)
-add_definitions(-DQT_PLUGIN)
+    set(filesink_SOURCES
-add_definitions(-DQT_SHARED)
-
-qt5_wrap_ui(filesink_FORMS_HEADERS ${filesink_FORMS})
-
-add_library(outputfilesink SHARED
         ${filesink_SOURCES}
-	${filesink_HEADERS_MOC}
+        filesinkgui.cpp
-	${filesink_FORMS_HEADERS}
+
+        filesinkgui.ui
+    )
+    set(filesink_HEADERS
+        ${filesink_HEADERS}
+        filesinkgui.h
     )
 
-target_link_libraries(outputfilesink
+    set(TARGET_NAME outputfilesink)
-	${QT_LIBRARIES}
+    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}
+)
+
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
+	${TARGET_LIB_GUI}
         swagger
 )
 
-target_link_libraries(outputfilesink Qt5::Core Qt5::Widgets)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesink)
-
-install(TARGETS outputfilesink DESTINATION lib/plugins/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
     ${LIBHACKRF_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)
 
-#include(${QT_USE_FILE})
+if(NOT SERVER_MODE)
-#add_definitions(${QT_DEFINITIONS})
+    set(hackrfoutput_SOURCES
-add_definitions("${QT_DEFINITIONS} -DLIBHACKRF_DYN_RATES")
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-#qt4_wrap_cpp(hackrfoutput_HEADERS_MOC ${hackrfoutput_HEADERS})
-qt5_wrap_ui(hackrfoutput_FORMS_HEADERS ${hackrfoutput_FORMS})
-
-add_library(outputhackrf SHARED
         ${hackrfoutput_SOURCES}
-    ${hackrfoutput_HEADERS_MOC}
+        hackrfoutputgui.cpp
-    ${hackrfoutput_FORMS_HEADERS}
+
+        hackrfoutputgui.ui
+    )
+    set(hackrfoutput_HEADERS
+        ${hackrfoutput_HEADERS}
+        hackrfoutputgui.h
     )
 
-if (BUILD_DEBIAN)
+    set(TARGET_NAME outputhackrf)
-target_link_libraries(outputhackrf
+    set(TARGET_LIB "Qt5::Widgets")
-    ${QT_LIBRARIES}
+    set(TARGET_LIB_GUI "sdrgui")
-    hackrf
+    set(INSTALL_FOLDER "plugins")
-    sdrbase
+else()
-    sdrgui
+    set(TARGET_NAME outputhackrfsrv)
-    swagger
+    set(TARGET_LIB "")
-    hackrfdevice
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
+	${hackrfoutput_SOURCES}
 )
-else (BUILD_DEBIAN)
+
-target_link_libraries(outputhackrf
+target_link_libraries(${TARGET_NAME}
-    ${QT_LIBRARIES}
+        Qt5::Core
+        ${TARGET_LIB}
+	sdrbase
+	${TARGET_LIB_GUI}
+        swagger
         ${LIBHACKRF_LIBRARIES}
-    sdrbase
-    sdrgui
-    swagger
         hackrfdevice
 )
-endif (BUILD_DEBIAN)
 
-target_link_libraries(outputhackrf Qt5::Core Qt5::Widgets)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesink)
-
-install(TARGETS outputhackrf DESTINATION lib/plugins/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}/devices
 	${LIMESUITE_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)
 
-#include(${QT_USE_FILE})
+if(NOT SERVER_MODE)
-add_definitions(${QT_DEFINITIONS})
+    set(limesdroutput_SOURCES
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-#qt4_wrap_cpp(limesdroutput_HEADERS_MOC ${limesdroutput_HEADERS})
-qt5_wrap_ui(limesdroutput_FORMS_HEADERS ${limesdroutput_FORMS})
-
-add_library(outputlimesdr SHARED
         ${limesdroutput_SOURCES}
-	${limesdroutput_HEADERS_MOC}
+        limesdroutputgui.cpp
-	${limesdroutput_FORMS_HEADERS}
+
+        limesdroutputgui.ui
+    )
+    set(limesdroutput_HEADERS
+        ${limesdroutput_HEADERS}
+        limesdroutputgui.h
     )
 
-if (BUILD_DEBIAN)
+    set(TARGET_NAME outputlimesdr)
-target_link_libraries(outputlimesdr
+    set(TARGET_LIB "Qt5::Widgets")
-    ${QT_LIBRARIES}
+    set(TARGET_LIB_GUI "sdrgui")
-    limesuite
+    set(INSTALL_FOLDER "plugins")
-    sdrbase
+else()
-    sdrgui
+    set(TARGET_NAME outputlimesdrsrv)
-    swagger
+    set(TARGET_LIB "")
-    limesdrdevice
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
+	${limesdroutput_SOURCES}
 )
-else (BUILD_DEBIAN)
+
-target_link_libraries(outputlimesdr
+target_link_libraries(${TARGET_NAME}
-	${QT_LIBRARIES}
+        Qt5::Core
+        ${TARGET_LIB}
+	sdrbase
+	${TARGET_LIB_GUI}
+        swagger
         ${LIMESUITE_LIBRARY}
-	sdrbase
-	sdrgui
-	swagger
         limesdrdevice
 )
-endif (BUILD_DEBIAN)
 
-target_link_libraries(outputlimesdr Qt5::Core Qt5::Widgets)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesink)
-
-install(TARGETS outputlimesdr DESTINATION lib/plugins/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
     ${LIBIIO_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)
 
-#include(${QT_USE_FILE})
+if(NOT SERVER_MODE)
-#add_definitions(${QT_DEFINITIONS})
+    set(plutosdroutput_SOURCES
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-#qt4_wrap_cpp(plutosdroutput_HEADERS_MOC ${plutosdroutput_HEADERS})
-qt5_wrap_ui(plutosdroutput_FORMS_HEADERS ${plutosdroutput_FORMS})
-
-add_library(outputplutosdr SHARED
         ${plutosdroutput_SOURCES}
-    ${plutosdroutput_HEADERS_MOC}
+        plutosdroutputgui.cpp
-    ${plutosdroutput_FORMS_HEADERS}
+
+        plutosdroutputgui.ui
+    )
+    set(plutosdroutput_HEADERS
+        ${plutosdroutput_HEADERS}
+        plutosdroutputgui.h
     )
 
-if (BUILD_DEBIAN)
+    set(TARGET_NAME outputplutosdr)
-target_link_libraries(outputplutosdr
+    set(TARGET_LIB "Qt5::Widgets")
-    ${QT_LIBRARIES}
+    set(TARGET_LIB_GUI "sdrgui")
-    iio
+    set(INSTALL_FOLDER "plugins")
-    sdrbase
+else()
-    sdrgui
+    set(TARGET_NAME outputplutosdrsrv)
-    swagger
+    set(TARGET_LIB "")
-    plutosdrdevice
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
+	${plutosdroutput_SOURCES}
 )
-else (BUILD_DEBIAN)
+
-target_link_libraries(outputplutosdr
+target_link_libraries(${TARGET_NAME}
-    ${QT_LIBRARIES}
+        Qt5::Core
+        ${TARGET_LIB}
+	sdrbase
+	${TARGET_LIB_GUI}
+        swagger
         ${LIBIIO_LIBRARIES}
-    sdrbase
-    sdrgui
-    swagger
         plutosdrdevice
 )
-endif (BUILD_DEBIAN)
 
-qt5_use_modules(outputplutosdr Core Widgets)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesink)
-
-install(TARGETS outputplutosdr DESTINATION lib/plugins/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,7 +10,6 @@ else()
 endif()
 
 set(remoteoutput_SOURCES
-	remoteoutputgui.cpp
 	remoteoutput.cpp
 	remoteoutputplugin.cpp
 	remoteoutputsettings.cpp
@@ -22,7 +19,6 @@ set(remoteoutput_SOURCES
 )
 
 set(remoteoutput_HEADERS
-	remoteoutputgui.h
 	remoteoutput.h
 	remoteoutputplugin.h
 	remoteoutputsettings.h
@@ -31,57 +27,46 @@ set(remoteoutput_HEADERS
         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}/devices
         ${CM256CC_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)
 
-add_definitions(${QT_DEFINITIONS})
+if(NOT SERVER_MODE)
-add_definitions(-DQT_PLUGIN)
+    set(remoteoutput_SOURCES
-add_definitions(-DQT_SHARED)
-
-qt5_wrap_ui(remoteoutput_FORMS_HEADERS ${remoteoutput_FORMS})
-
-add_library(outputremote SHARED
         ${remoteoutput_SOURCES}
-	${remoteoutput_HEADERS_MOC}
+        remoteoutputgui.cpp
-	${remoteoutput_FORMS_HEADERS}
+
+        remoteoutputgui.ui
+    )
+    set(remoteoutput_HEADERS
+        ${remoteoutput_HEADERS}
+        remoteoutputgui.h
     )
 
-if (BUILD_DEBIAN)
+    set(TARGET_NAME outputremote)
-target_link_libraries(outputremote
+    set(TARGET_LIB "Qt5::Widgets")
-    ${QT_LIBRARIES}
+    set(TARGET_LIB_GUI "sdrgui")
-    sdrbase
+    set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
-    sdrgui
+else()
-    swagger
+    set(TARGET_NAME outputremotesrv)
-    cm256cc
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
+endif()
+
+add_library(${TARGET_NAME} SHARED
+	${remoteoutput_SOURCES}
 )
-else (BUILD_DEBIAN)
+
-target_link_libraries(outputremote
+target_link_libraries(${TARGET_NAME}
-	${QT_LIBRARIES}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
+	${TARGET_LIB_GUI}
         swagger
         ${CM256CC_LIBRARIES}
 )
-endif (BUILD_DEBIAN)
 
-target_link_libraries(outputremote Qt5::Core Qt5::Widgets)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER})
-
-install(TARGETS outputremote DESTINATION lib/plugins/samplesink)

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}/devices
 	${SOAPYSDR_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)
 
-add_definitions(${QT_DEFINITIONS})
+if(NOT SERVER_MODE)
-add_definitions(-DQT_PLUGIN)
+    set(soapysdroutput_SOURCES
-add_definitions(-DQT_SHARED)
-
-qt5_wrap_ui(soapysdroutput_FORMS_HEADERS ${soapysdroutput_FORMS})
-
-add_library(outputsoapysdr SHARED
         ${soapysdroutput_SOURCES}
-	${soapysdroutput_HEADERS_MOC}
+        soapysdroutputgui.cpp
-	${soapysdroutput_FORMS_HEADERS}
+
+        soapysdroutputgui.ui
+    )
+    set(soapysdroutput_HEADERS
+        ${soapysdroutput_HEADERS}
+        soapysdroutputgui.h
     )
 
-if (BUILD_DEBIAN)
+    set(TARGET_NAME outputsoapysdr)
-target_link_libraries(outputsoapysdr
+    set(TARGET_LIB "Qt5::Widgets")
-    ${QT_LIBRARIES}
+    set(TARGET_LIB_GUI "sdrgui")
-    SoapySDR
+    set(INSTALL_FOLDER "plugins")
-    sdrbase
+else()
-    sdrgui
+    set(TARGET_NAME outputsoapysdrsrv)
-    swagger
+    set(TARGET_LIB "")
-    soapysdrdevice
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
+	${soapysdroutput_SOURCES}
 )
-else (BUILD_DEBIAN)
+
-target_link_libraries(outputsoapysdr
+target_link_libraries(${TARGET_NAME}
-	${QT_LIBRARIES}
+        Qt5::Core
+        ${TARGET_LIB}
+	sdrbase
+	${TARGET_LIB_GUI}
+        swagger
         ${SOAPYSDR_LIBRARY}
-	sdrbase
-	sdrgui
-	swagger
         soapysdrdevice
 )
-endif (BUILD_DEBIAN)
 
-target_link_libraries(outputsoapysdr Qt5::Core Qt5::Widgets)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesink)
-
-install(TARGETS outputsoapysdr DESTINATION lib/plugins/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}/devices
 	${LIBXTRX_INCLUDE_DIRS}
 )
 
-add_definitions(${QT_DEFINITIONS})
+if(NOT SERVER_MODE)
-add_definitions(-DQT_PLUGIN)
+    set(xtrxoutput_SOURCES
-add_definitions(-DQT_SHARED)
-
-qt5_wrap_ui(xtrxoutput_FORMS_HEADERS ${xtrxoutput_FORMS})
-
-add_library(outputxtrx SHARED
         ${xtrxoutput_SOURCES}
-	${xtrxoutput_HEADERS_MOC}
+        xtrxoutputgui.cpp
-	${xtrxoutput_FORMS_HEADERS}
+
+        xtrxoutputgui.ui
+    )
+    set(xtrxoutput_HEADERS
+        ${xtrxoutput_HEADERS}
+        xtrxoutputgui.h
     )
 
-target_link_libraries(outputxtrx
+    set(TARGET_NAME outputxtrx)
-	${QT_LIBRARIES}
+    set(TARGET_LIB "Qt5::Widgets")
-    ${LIBXTRX_LIBRARY}
+    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}
+)
+
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
+	${TARGET_LIB_GUI}
         swagger
+        ${LIBXTRX_LIBRARY}
         xtrxdevice
 )
 
-target_link_libraries(outputxtrx Qt5::Core Qt5::Widgets)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesink)
-
-install(TARGETS outputxtrx DESTINATION lib/plugins/samplesink)

plugins/samplesource/CMakeLists.txt

@@ -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(ENABLE_AIRSPY AND LIBAIRSPY_FOUND)
-if(LIBUSB_FOUND AND LIBMIRISDR_FOUND)
+    add_subdirectory(airspy)
-    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")
 endif()
 
-if (BUILD_DEBIAN)
+if(ENABLE_AIRSPYHF AND LIBAIRSPYHF_FOUND)
-    add_subdirectory(airspy)
     add_subdirectory(airspyhf)
+endif()
+
+if(ENABLE_BLADERF AND LIBBLADERF_FOUND)
     add_subdirectory(bladerf1input)
     add_subdirectory(bladerf2input)
-    add_subdirectory(hackrfinput)
+endif()
-    add_subdirectory(limesdrinput)
+
-    add_subdirectory(perseus)
+if(ENABLE_FUNCUBE AND UNIX AND LIBUSB_FOUND)
-    add_subdirectory(plutosdrinput)
+    add_subdirectory(fcdpro)
-    add_subdirectory(rtlsdr)
+    add_subdirectory(fcdproplus)
-    add_subdirectory(remoteinput)
+endif()
-    add_subdirectory(sdrplay)
+
-    add_subdirectory(soapysdrinput)
+if(ENABLE_HACKRF AND LIBHACKRF_FOUND)
-endif (BUILD_DEBIAN)
+    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)

plugins/samplesource/airspy/CMakeLists.txt

@@ -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
     ${LIBAIRSPY_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)
 
-#include(${QT_USE_FILE})
+if(NOT SERVER_MODE)
-#add_definitions(${QT_DEFINITIONS})
+    set(airspy_SOURCES
-add_definitions("${QT_DEFINITIONS} -DLIBAIRSPY_DYN_RATES")
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-#qt4_wrap_cpp(airspy_HEADERS_MOC ${airspy_HEADERS})
-qt5_wrap_ui(airspy_FORMS_HEADERS ${airspy_FORMS})
-
-add_library(inputairspy SHARED
         ${airspy_SOURCES}
-    ${airspy_HEADERS_MOC}
+        airspygui.cpp
-    ${airspy_FORMS_HEADERS}
+
+        airspygui.ui
+    )
+    set(airspy_HEADERS
+        ${airspy_HEADERS}
+        airspygui.h
     )
 
-if (BUILD_DEBIAN)
+    set(TARGET_NAME inputairspy)
-target_link_libraries(inputairspy
+    set(TARGET_LIB "Qt5::Widgets")
-    ${QT_LIBRARIES}
+    set(TARGET_LIB_GUI "sdrgui")
-    airspy
+    set(INSTALL_FOLDER "plugins")
-    sdrbase
+else()
-    sdrgui
+    set(TARGET_NAME inputairspysrv)
-    swagger
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
+	${airspy_SOURCES}
 )
-else (BUILD_DEBIAN)
+
-target_link_libraries(inputairspy
+target_link_libraries(${TARGET_NAME}
-    ${QT_LIBRARIES}
+        Qt5::Core
+        ${TARGET_LIB}
+	sdrbase
+	${TARGET_LIB_GUI}
+        swagger
         ${LIBAIRSPY_LIBRARIES}
-    sdrbase
-    sdrgui
-    swagger
 )
-endif (BUILD_DEBIAN)
 
-
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesource)
-target_link_libraries(inputairspy Qt5::Core Qt5::Widgets)
-
-install(TARGETS inputairspy DESTINATION lib/plugins/samplesource)

plugins/samplesource/airspyhf/CMakeLists.txt

@@ -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
     ${LIBAIRSPYHF_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)
 
-#include(${QT_USE_FILE})
+if(NOT SERVER_MODE)
-#add_definitions(${QT_DEFINITIONS})
+    set(airspyhf_SOURCES
-add_definitions("${QT_DEFINITIONS} -DLIBAIRSPY_DYN_RATES")
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-#qt4_wrap_cpp(airspyhf_HEADERS_MOC ${airspyhf_HEADERS})
-qt5_wrap_ui(airspyhf_FORMS_HEADERS ${airspyhf_FORMS})
-
-add_library(inputairspyhf SHARED
         ${airspyhf_SOURCES}
-    ${airspyhf_HEADERS_MOC}
+        airspyhfgui.cpp
-    ${airspyhf_FORMS_HEADERS}
+
+        airspyhfgui.ui
+    )
+    set(airspyhf_HEADERS
+        ${airspyhf_HEADERS}
+        airspyhfgui.h
     )
 
-if (BUILD_DEBIAN)
+    set(TARGET_NAME inputairspyhf)
-target_link_libraries(inputairspyhf
+    set(TARGET_LIB "Qt5::Widgets")
-    ${QT_LIBRARIES}
+    set(TARGET_LIB_GUI "sdrgui")
-    airspyhf
+    set(INSTALL_FOLDER "plugins")
-    sdrbase
+else()
-    sdrgui
+    set(TARGET_NAME inputairspyhfsrv)
-    swagger
+    set(TARGET_LIB "")
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
+	${airspyhf_SOURCES}
 )
-else (BUILD_DEBIAN)
+
-target_link_libraries(inputairspyhf
+target_link_libraries(${TARGET_NAME}
-    ${QT_LIBRARIES}
+        Qt5::Core
+        ${TARGET_LIB}
+	sdrbase
+	${TARGET_LIB_GUI}
+        swagger
         ${LIBAIRSPYHF_LIBRARIES}
-    sdrbase
-    sdrgui
-    swagger
 )
-endif (BUILD_DEBIAN)
 
-
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesource)
-qt5_use_modules(inputairspyhf Core Widgets)
-
-install(TARGETS inputairspyhf DESTINATION lib/plugins/samplesource)

plugins/samplesource/bladerf1input/CMakeLists.txt

@@ -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}/devices
 	${LIBBLADERF_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)
 
-#include(${QT_USE_FILE})
+if(NOT SERVER_MODE)
-add_definitions(${QT_DEFINITIONS})
+    set(bladerf1input_SOURCES
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-#qt4_wrap_cpp(bladerf1input_HEADERS_MOC ${bladerf1input_HEADERS})
-qt5_wrap_ui(bladerf1input_FORMS_HEADERS ${bladerf1input_FORMS})
-
-add_library(inputbladerf1 SHARED
         ${bladerf1input_SOURCES}
-	${bladerf1input_HEADERS_MOC}
+        bladerf1inputgui.cpp
-	${bladerf1input_FORMS_HEADERS}
+
+        bladerf1inputgui.ui
+    )
+    set(bladerf1input_HEADERS
+        ${bladerf1input_HEADERS}
+        bladerf1inputgui.h
     )
 
-if (BUILD_DEBIAN)
+    set(TARGET_NAME inputbladerf1)
-target_link_libraries(inputbladerf1
+    set(TARGET_LIB "Qt5::Widgets")
-    ${QT_LIBRARIES}
+    set(TARGET_LIB_GUI "sdrgui")
-    bladerf
+    set(INSTALL_FOLDER "plugins")
-    sdrbase
+else()
-    sdrgui
+    set(TARGET_NAME inputbladerf1srv)
-    swagger
+    set(TARGET_LIB "")
-    bladerf1device
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
+	${bladerf1input_SOURCES}
 )
-else (BUILD_DEBIAN)
+
-target_link_libraries(inputbladerf1
+target_link_libraries(${TARGET_NAME}
-	${QT_LIBRARIES}
+        Qt5::Core
+        ${TARGET_LIB}
+	sdrbase
+	${TARGET_LIB_GUI}
+        swagger
         ${LIBBLADERF_LIBRARIES}
-	sdrbase
-	sdrgui
-	swagger
         bladerf1device
 )
-endif (BUILD_DEBIAN)
 
-target_link_libraries(inputbladerf1 Qt5::Core Qt5::Widgets)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesource)
-
-install(TARGETS inputbladerf1 DESTINATION lib/plugins/samplesource)

plugins/samplesource/bladerf2input/CMakeLists.txt

@@ -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}/devices
 	${LIBBLADERF_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)
 
-#include(${QT_USE_FILE})
+if(NOT SERVER_MODE)
-add_definitions(${QT_DEFINITIONS})
+    set(bladerf2input_SOURCES
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-qt5_wrap_ui(bladerf2input_FORMS_HEADERS ${bladerf2input_FORMS})
-
-add_library(inputbladerf2 SHARED
         ${bladerf2input_SOURCES}
-	${bladerf2input_HEADERS_MOC}
+        bladerf2inputgui.cpp
-	${bladerf2input_FORMS_HEADERS}
+
+        bladerf2inputgui.ui
+    )
+    set(bladerf2input_HEADERS
+        ${bladerf2input_HEADERS}
+        bladerf2inputgui.h
     )
 
-if (BUILD_DEBIAN)
+    set(TARGET_NAME inputbladerf2)
-target_link_libraries(inputbladerf2
+    set(TARGET_LIB "Qt5::Widgets")
-    ${QT_LIBRARIES}
+    set(TARGET_LIB_GUI "sdrgui")
-    bladerf
+    set(INSTALL_FOLDER "plugins")
-    sdrbase
+else()
-    sdrgui
+    set(TARGET_NAME inputbladerf2srv)
-    swagger
+    set(TARGET_LIB "")
-    bladerf2device
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
+	${bladerf2input_SOURCES}
 )
-else (BUILD_DEBIAN)
+
-target_link_libraries(inputbladerf2
+target_link_libraries(${TARGET_NAME}
-	${QT_LIBRARIES}
+        Qt5::Core
+        ${TARGET_LIB}
+	sdrbase
+	${TARGET_LIB_GUI}
+        swagger
         ${LIBBLADERF_LIBRARIES}
-	sdrbase
-	sdrgui
-	swagger
         bladerf2device
 )
-endif (BUILD_DEBIAN)
 
-target_link_libraries(inputbladerf2 Qt5::Core Qt5::Widgets)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesource)
-
-install(TARGETS inputbladerf2 DESTINATION lib/plugins/samplesource)

plugins/samplesource/fcdpro/CMakeLists.txt

@@ -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}/fcdlib
 )
 
-#include(${QT_USE_FILE})
+if(NOT SERVER_MODE)
-add_definitions(${QT_DEFINITIONS})
+    set(fcdpro_SOURCES
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-#qt4_wrap_cpp(fcdpro_HEADERS_MOC ${fcdpro_HEADERS})
-qt5_wrap_ui(fcdpro_FORMS_HEADERS ${fcdpro_FORMS})
-
-add_library(inputfcdpro SHARED
         ${fcdpro_SOURCES}
-	${fcdpro_HEADERS_MOC}
+        fcdprogui.cpp
-	${fcdpro_FORMS_HEADERS}
+
+        fcdprogui.ui
+    )
+    set(fcdpro_HEADERS
+        ${fcdpro_HEADERS}
+        fcdprogui.h
     )
 
-target_link_libraries(inputfcdpro
+    set(TARGET_NAME inputfcdpro)
-	${QT_LIBRARIES}
+    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}
+)
+
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
+	sdrbase
+	${TARGET_LIB_GUI}
+        swagger
         fcdhid
         fcdlib
-	sdrbase
-	sdrgui
-	swagger
 )
 
-target_link_libraries(inputfcdpro Qt5::Core Qt5::Widgets)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesource)
-
-install(TARGETS inputfcdpro DESTINATION lib/plugins/samplesource)

plugins/samplesource/fcdproplus/CMakeLists.txt

@@ -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}/fcdhid
 	${CMAKE_SOURCE_DIR}/fcdlib
 )
 
-#include(${QT_USE_FILE})
+if(NOT SERVER_MODE)
-add_definitions(${QT_DEFINITIONS})
+    set(fcdproplus_SOURCES
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-#qt4_wrap_cpp(fcdproplus_HEADERS_MOC ${fcdproplus_HEADERS})
-qt5_wrap_ui(fcdproplus_FORMS_HEADERS ${fcdproplus_FORMS})
-
-add_library(inputfcdproplus SHARED
         ${fcdproplus_SOURCES}
-	${fcdproplus_HEADERS_MOC}
+        fcdproplusgui.cpp
-	${fcdproplus_FORMS_HEADERS}
+
+        fcdproplusgui.ui
+    )
+    set(fcdproplus_HEADERS
+        ${fcdproplus_HEADERS}
+        fcdproplusgui.h
     )
 
-target_link_libraries(inputfcdproplus
+    set(TARGET_NAME inputfcdproplus)
-	${QT_LIBRARIES}
+    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}
+)
+
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
+	sdrbase
+	${TARGET_LIB_GUI}
+        swagger
         fcdhid
         fcdlib
-	sdrbase
-	sdrgui
-	swagger
 )
 
-target_link_libraries(inputfcdproplus Qt5::Core Qt5::Widgets)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesource)
-
-install(TARGETS inputfcdproplus DESTINATION lib/plugins/samplesource)

plugins/samplesource/filesource/CMakeLists.txt

@@ -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})
+if(NOT SERVER_MODE)
-add_definitions(${QT_DEFINITIONS})
+    set(filesource_SOURCES
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-#qt4_wrap_cpp(filesource_HEADERS_MOC ${filesource_HEADERS})
-qt5_wrap_ui(filesource_FORMS_HEADERS ${filesource_FORMS})
-
-add_library(inputfilesource SHARED
         ${filesource_SOURCES}
-	${filesource_HEADERS_MOC}
+        filesourcegui.cpp
-	${filesource_FORMS_HEADERS}
+
+        filesourcegui.ui
+    )
+    set(filesource_HEADERS
+        ${filesource_HEADERS}
+        filesourcegui.h
     )
 
-target_link_libraries(inputfilesource
+    set(TARGET_NAME inputfilesource)
-	${QT_LIBRARIES}
+    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}
+)
+
+target_link_libraries(${TARGET_NAME}
+        Qt5::Core
+        ${TARGET_LIB}
 	sdrbase
-	sdrgui
+	${TARGET_LIB_GUI}
         swagger
 )
 
-target_link_libraries(inputfilesource Qt5::Core Qt5::Widgets)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesource)
-
-install(TARGETS inputfilesource DESTINATION lib/plugins/samplesource)

plugins/samplesource/hackrfinput/CMakeLists.txt

@@ -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
     ${LIBHACKRF_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)
 
-#include(${QT_USE_FILE})
+if(NOT SERVER_MODE)
-#add_definitions(${QT_DEFINITIONS})
+    set(hackrfinput_SOURCES
-add_definitions("${QT_DEFINITIONS} -DLIBHACKRF_DYN_RATES")
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-#qt4_wrap_cpp(hackrfinput_HEADERS_MOC ${hackrfinput_HEADERS})
-qt5_wrap_ui(hackrfinput_FORMS_HEADERS ${hackrfinput_FORMS})
-
-add_library(inputhackrf SHARED
         ${hackrfinput_SOURCES}
-    ${hackrfinput_HEADERS_MOC}
+        hackrfinputgui.cpp
-    ${hackrfinput_FORMS_HEADERS}
+
+        hackrfinputgui.ui
+    )
+    set(hackrfinput_HEADERS
+        ${hackrfinput_HEADERS}
+        hackrfinputgui.h
     )
 
-if (BUILD_DEBIAN)
+    set(TARGET_NAME inputhackrf)
-target_link_libraries(inputhackrf
+    set(TARGET_LIB "Qt5::Widgets")
-    ${QT_LIBRARIES}
+    set(TARGET_LIB_GUI "sdrgui")
-    hackrf
+    set(INSTALL_FOLDER "plugins")
-    sdrbase
+else()
-    sdrgui
+    set(TARGET_NAME inputhackrfsrv)
-    swagger
+    set(TARGET_LIB "")
-    hackrfdevice
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
+	${hackrfinput_SOURCES}
 )
-else (BUILD_DEBIAN)
+
-target_link_libraries(inputhackrf
+target_link_libraries(${TARGET_NAME}
-    ${QT_LIBRARIES}
+        Qt5::Core
+        ${TARGET_LIB}
+	sdrbase
+	${TARGET_LIB_GUI}
+        swagger
         ${LIBHACKRF_LIBRARIES}
-    sdrbase
-    sdrgui
-    swagger
         hackrfdevice
 )
-endif (BUILD_DEBIAN)
 
-target_link_libraries(inputhackrf Qt5::Core Qt5::Widgets)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesource)
-
-install(TARGETS inputhackrf DESTINATION lib/plugins/samplesource)

plugins/samplesource/limesdrinput/CMakeLists.txt

@@ -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}/devices
 	${LIMESUITE_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)
 
-#include(${QT_USE_FILE})
+if(NOT SERVER_MODE)
-add_definitions(${QT_DEFINITIONS})
+    set(limesdrinput_SOURCES
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-#qt4_wrap_cpp(limesdrinput_HEADERS_MOC ${limesdrinput_HEADERS})
-qt5_wrap_ui(limesdrinput_FORMS_HEADERS ${limesdrinput_FORMS})
-
-add_library(inputlimesdr SHARED
         ${limesdrinput_SOURCES}
-	${limesdrinput_HEADERS_MOC}
+        limesdrinputgui.cpp
-	${limesdrinput_FORMS_HEADERS}
+
+        limesdrinputgui.ui
+    )
+    set(limesdrinput_HEADERS
+        ${limesdrinput_HEADERS}
+        limesdrinputgui.h
     )
 
-if (BUILD_DEBIAN)
+    set(TARGET_NAME inputlimesdr)
-target_link_libraries(inputlimesdr
+    set(TARGET_LIB "Qt5::Widgets")
-    ${QT_LIBRARIES}
+    set(TARGET_LIB_GUI "sdrgui")
-    limesuite
+    set(INSTALL_FOLDER "plugins")
-    sdrbase
+else()
-    sdrgui
+    set(TARGET_NAME inputlimesdrsrv)
-    swagger
+    set(TARGET_LIB "")
-    limesdrdevice
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
+	${limesdrinput_SOURCES}
 )
-else (BUILD_DEBIAN)
+
-target_link_libraries(inputlimesdr
+target_link_libraries(${TARGET_NAME}
-	${QT_LIBRARIES}
+        Qt5::Core
+        ${TARGET_LIB}
+	sdrbase
+	${TARGET_LIB_GUI}
+        swagger
         ${LIMESUITE_LIBRARY}
-	sdrbase
-	sdrgui
-	swagger
         limesdrdevice
 )
-endif (BUILD_DEBIAN)
 
-target_link_libraries(inputlimesdr Qt5::Core Qt5::Widgets)
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesource)
-
-install(TARGETS inputlimesdr DESTINATION lib/plugins/samplesource)

plugins/samplesource/perseus/CMakeLists.txt

@@ -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
     ${LIBPERSEUS_INCLUDE_DIR}
 )
-endif (BUILD_DEBIAN)
 
-#include(${QT_USE_FILE})
+if(NOT SERVER_MODE)
-#add_definitions(${QT_DEFINITIONS})
+    set(perseus_SOURCES
-add_definitions("${QT_DEFINITIONS} -DLIBAIRSPY_DYN_RATES")
-add_definitions(-DQT_PLUGIN)
-add_definitions(-DQT_SHARED)
-
-#qt4_wrap_cpp(perseus_HEADERS_MOC ${perseus_HEADERS})
-qt5_wrap_ui(perseus_FORMS_HEADERS ${perseus_FORMS})
-
-add_library(inputperseus SHARED
         ${perseus_SOURCES}
-    ${perseus_HEADERS_MOC}
+        perseusgui.cpp
-    ${perseus_FORMS_HEADERS}
+
+        perseusgui.ui
+    )
+    set(perseus_HEADERS
+        ${perseus_HEADERS}
+        perseusgui.h
     )
 
-if (BUILD_DEBIAN)
+    set(TARGET_NAME inputperseus)
-target_link_libraries(inputperseus
+    set(TARGET_LIB "Qt5::Widgets")
-    ${QT_LIBRARIES}
+    set(TARGET_LIB_GUI "sdrgui")
-    perseus
+    set(INSTALL_FOLDER "plugins")
-    sdrbase
+else()
-    sdrgui
+    set(TARGET_NAME inputperseussrv)
-    swagger
+    set(TARGET_LIB "")
-    perseusdevice
+    set(TARGET_LIB_GUI "")
+    set(INSTALL_FOLDER "pluginssrv")
+endif()
+
+add_library(${TARGET_NAME} SHARED
+	${perseus_SOURCES}
 )
-else (BUILD_DEBIAN)
+
-target_link_libraries(inputperseus
+target_link_libraries(${TARGET_NAME}
-    ${QT_LIBRARIES}
+        Qt5::Core
+        ${TARGET_LIB}
+	sdrbase
+	${TARGET_LIB_GUI}
+        swagger
         ${LIBPERSEUS_LIBRARIES}
-    sdrbase
-    sdrgui
-    swagger
         perseusdevice
 )
-endif (BUILD_DEBIAN)
 
-
+install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_LIB_DIR}/${INSTALL_FOLDER}/samplesource)
-qt5_use_modules(inputperseus Core Widgets)
-
-install(TARGETS inputperseus DESTINATION lib/plugins/samplesource)