diff --git a/pluginssrv/samplesink/CMakeLists.txt b/pluginssrv/samplesink/CMakeLists.txt index d06b1e7db..680b03be4 100644 --- a/pluginssrv/samplesink/CMakeLists.txt +++ b/pluginssrv/samplesink/CMakeLists.txt @@ -33,11 +33,6 @@ if(LIBUSB_FOUND AND 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) diff --git a/pluginssrv/samplesink/xtrxoutput/CMakeLists.txt b/pluginssrv/samplesink/xtrxoutput/CMakeLists.txt deleted file mode 100644 index 7f9cfd568..000000000 --- a/pluginssrv/samplesink/xtrxoutput/CMakeLists.txt +++ /dev/null @@ -1,47 +0,0 @@ -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_LIBRARIES} - sdrbase - swagger - xtrxdevice -) - -target_link_libraries(outputxtrxsrv Qt5::Core) - -install(TARGETS outputxtrxsrv DESTINATION lib/pluginssrv/samplesink) diff --git a/pluginssrv/samplesource/CMakeLists.txt b/pluginssrv/samplesource/CMakeLists.txt index 1e58cfec9..d74f159ac 100644 --- a/pluginssrv/samplesource/CMakeLists.txt +++ b/pluginssrv/samplesource/CMakeLists.txt @@ -54,11 +54,6 @@ if(LIBUSB_FOUND AND RX_SAMPLE_24BIT AND LIBPERSEUS_FOUND) 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) diff --git a/pluginssrv/samplesource/xtrxinput/CMakeLists.txt b/pluginssrv/samplesource/xtrxinput/CMakeLists.txt deleted file mode 100644 index 4823f927a..000000000 --- a/pluginssrv/samplesource/xtrxinput/CMakeLists.txt +++ /dev/null @@ -1,48 +0,0 @@ -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_LIBRARIES} - sdrbase - swagger - xtrxdevice -) - -qt5_use_modules(inputxtrxsrv Core) - -install(TARGETS inputxtrxsrv DESTINATION lib/pluginssrv/samplesource) \ No newline at end of file