Reinstated XTRX from server build with fixes

This commit is contained in:
f4exb 2019-03-06 21:40:05 +01:00
parent 2c1ce97eea
commit 8f111b2e7b
4 changed files with 110 additions and 5 deletions

View File

@ -23,16 +23,21 @@ if(LIBUSB_FOUND AND LIBIIO_FOUND)
add_subdirectory(plutosdroutput)
endif(LIBUSB_FOUND AND LIBIIO_FOUND)
find_package(LibXTRX)
if(LIBXTRX_FOUND)
add_subdirectory(xtrxoutput)
endif(LIBXTRX_FOUND)
find_package(SoapySDR)
if(LIBUSB_FOUND AND SOAPYSDR_FOUND)
add_subdirectory(soapysdroutput)
endif()
find_package(CM256cc)
if(CM256CC_FOUND)
add_subdirectory(remoteoutput)
endif(CM256CC_FOUND)
find_package(SoapySDR)
if(LIBUSB_FOUND AND SOAPYSDR_FOUND)
add_subdirectory(soapysdroutput)
endif()
if (BUILD_DEBIAN)
add_subdirectory(bladerf1output)
add_subdirectory(bladerf2output)

View File

@ -0,0 +1,47 @@
project(xtrxoutput)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(PLUGIN_PREFIX "../../../plugins/samplesink/xtrxoutput")
set(xtrxoutput_SOURCES
${PLUGIN_PREFIX}/xtrxoutput.cpp
${PLUGIN_PREFIX}/xtrxoutputplugin.cpp
${PLUGIN_PREFIX}/xtrxoutputsettings.cpp
${PLUGIN_PREFIX}/xtrxoutputthread.cpp
)
set(xtrxoutput_HEADERS
${PLUGIN_PREFIX}/xtrxoutput.h
${PLUGIN_PREFIX}/xtrxoutputplugin.h
${PLUGIN_PREFIX}/xtrxoutputsettings.h
${PLUGIN_PREFIX}/xtrxoutputthread.h
)
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})
add_definitions(-DQT_PLUGIN)
add_definitions(-DQT_SHARED)
add_library(outputxtrxsrv SHARED
${xtrxoutput_SOURCES}
${xtrxoutput_HEADERS_MOC}
)
target_link_libraries(outputxtrxsrv
${QT_LIBRARIES}
${LIBXTRX_LIBRARY}
sdrbase
swagger
xtrxdevice
)
target_link_libraries(outputxtrxsrv Qt5::Core)
install(TARGETS outputxtrxsrv DESTINATION lib/pluginssrv/samplesink)

View File

@ -77,6 +77,11 @@ else(LIBUSB_FOUND AND LIBMIRISDR_FOUND)
message(STATUS "LibMiriSDR NOT found")
endif(LIBUSB_FOUND AND LIBMIRISDR_FOUND)
find_package(LibXTRX)
if(LIBXTRX_FOUND)
add_subdirectory(xtrxinput)
endif(LIBXTRX_FOUND)
find_package(SoapySDR)
if(LIBUSB_FOUND AND SOAPYSDR_FOUND)
add_subdirectory(soapysdrinput)

View File

@ -0,0 +1,48 @@
project(xtrxinput)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(PLUGIN_PREFIX "../../../plugins/samplesource/xtrxinput")
set(xtrxinput_SOURCES
${PLUGIN_PREFIX}/xtrxinput.cpp
${PLUGIN_PREFIX}/xtrxinputplugin.cpp
${PLUGIN_PREFIX}/xtrxinputsettings.cpp
${PLUGIN_PREFIX}/xtrxinputthread.cpp
)
set(xtrxinput_HEADERS
${PLUGIN_PREFIX}/xtrxinput.h
${PLUGIN_PREFIX}/xtrxinputplugin.h
${PLUGIN_PREFIX}/xtrxinputsettings.h
${PLUGIN_PREFIX}/xtrxinputthread.h
)
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})
add_definitions(-DQT_PLUGIN)
add_definitions(-DQT_SHARED)
add_library(inputxtrxsrv SHARED
${xtrxinput_SOURCES}
${xtrxinput_HEADERS_MOC}
)
target_link_libraries(inputxtrxsrv
${QT_LIBRARIES}
${LIBXTRX_LIBRARY}
sdrbase
swagger
xtrxdevice
)
qt5_use_modules(inputxtrxsrv Core)
install(TARGETS inputxtrxsrv DESTINATION lib/pluginssrv/samplesource)