From ca36f757e127ada6f5e803c57bba82e033d840ad Mon Sep 17 00:00:00 2001 From: f4exb Date: Fri, 23 Nov 2018 01:06:56 +0100 Subject: [PATCH] SoapySDR support: Debian: added internal soapysdr library --- CMakeLists.txt | 1 + debian/rules | 2 +- devices/soapysdr/CMakeLists.txt | 2 +- libsoapysdr/CMakeLists.txt | 27 +++++++++++++++++++ .../samplesink/soapysdroutput/CMakeLists.txt | 6 ++--- .../samplesource/soapysdrinput/CMakeLists.txt | 6 ++--- 6 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 libsoapysdr/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c76bd2be..4de824c0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -346,6 +346,7 @@ if (BUILD_DEBIAN) add_subdirectory(libmirisdr) add_subdirectory(libperseus) add_subdirectory(libiio) + add_subdirectory(libsoapysdr) endif (BUILD_DEBIAN) add_subdirectory(devices) diff --git a/debian/rules b/debian/rules index 800c02c9d..edca0b7d2 100755 --- a/debian/rules +++ b/debian/rules @@ -21,5 +21,5 @@ # dh_make generated override targets # This is example for Cmake (See https://bugs.debian.org/641051 ) override_dh_auto_configure: - dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/opt/sdrangel -DDEBUG_OUTPUT=ON -DBUILD_TYPE=DEBIAN -DRX_SAMPLE_24BIT=ON -DLIBCM256CCSRC=/z1/development/cm256cc -DLIBDSDCCSRC=/z1/development/dsdcc -DLIBAIRSPYSRC=/z1/development/libairspy -DLIBAIRSPYHFSRC=/z1/softs/airspyhf -DLIBHACKRFSRC=/z1/development/hackrf/host -DLIBRTLSDRSRC=/z1/development/librtlsdr.f4exb -DLIBMBELIBSRC=/z1/development/mbelib -DLIBSERIALDVSRC=/z1/development/serialDV -DLIBBLADERFSRC=/z1/softs/bladeRF -DLIBBLADERFCOMMONSRC=/z1/softs/bladeRF/host/common -DLIBBLADERFLIBSRC=/z1/softs/bladeRF/host/libraries/libbladeRF -DLIBMIRISDRSRC=/z1/development/libmirisdr-4 -DLIBLIMESUITESRC=/z1/softs/LimeSuite -DLIBIIOSRC=/z1/softs/libiio -DLIBPERSEUSSRC=/z1/softs/libperseus-sdr + dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/opt/sdrangel -DDEBUG_OUTPUT=ON -DBUILD_TYPE=DEBIAN -DRX_SAMPLE_24BIT=ON -DLIBCM256CCSRC=/z1/development/cm256cc -DLIBDSDCCSRC=/z1/development/dsdcc -DLIBAIRSPYSRC=/z1/development/libairspy -DLIBAIRSPYHFSRC=/z1/softs/airspyhf -DLIBHACKRFSRC=/z1/development/hackrf/host -DLIBRTLSDRSRC=/z1/development/librtlsdr.f4exb -DLIBMBELIBSRC=/z1/development/mbelib -DLIBSERIALDVSRC=/z1/development/serialDV -DLIBBLADERFSRC=/z1/softs/bladeRF -DLIBBLADERFCOMMONSRC=/z1/softs/bladeRF/host/common -DLIBBLADERFLIBSRC=/z1/softs/bladeRF/host/libraries/libbladeRF -DLIBMIRISDRSRC=/z1/development/libmirisdr-4 -DLIBLIMESUITESRC=/z1/softs/LimeSuite -DLIBIIOSRC=/z1/softs/libiio -DLIBPERSEUSSRC=/z1/softs/libperseus-sdr -DLIBSOAPYSDRSRC=/z1/softs/SoapySDR diff --git a/devices/soapysdr/CMakeLists.txt b/devices/soapysdr/CMakeLists.txt index 55ef5369b..401f9a18a 100644 --- a/devices/soapysdr/CMakeLists.txt +++ b/devices/soapysdr/CMakeLists.txt @@ -20,7 +20,7 @@ if (BUILD_DEBIAN) include_directories( . ${CMAKE_CURRENT_BINARY_DIR} - ${SOAPYSDRSRC} + ${LIBSOAPYSDRSRC} ) else (BUILD_DEBIAN) include_directories( diff --git a/libsoapysdr/CMakeLists.txt b/libsoapysdr/CMakeLists.txt new file mode 100644 index 000000000..f2a2986d1 --- /dev/null +++ b/libsoapysdr/CMakeLists.txt @@ -0,0 +1,27 @@ +project(soapysdr) + +file(GLOB soapysdr_SOURCES + ${LIBSOAPYSDRSRC}/lib/*.cpp +) + +file(GLOB soapysdr_HEADERS + ${LIBSOAPYSDRSRC}/include/SoapySDR/*.hpp + ${LIBSOAPYSDRSRC}/include/SoapySDR/*.h +) + +include_directories( + . + ${CMAKE_CURRENT_BINARY_DIR} + ${LIBSOAPYSDRSRC}/include + ${LIBSOAPYSDRSRC}/lib +) + +add_definitions(-DQT_SHARED) + +message( STATUS "soapysdr_SOURCES: ${soapysdr_SOURCES}" ) + +add_library(soapysdr SHARED + ${soapysdr_SOURCES} +) + +install(TARGETS soapysdr DESTINATION lib) diff --git a/plugins/samplesink/soapysdroutput/CMakeLists.txt b/plugins/samplesink/soapysdroutput/CMakeLists.txt index 95011bb52..d621ceb2e 100644 --- a/plugins/samplesink/soapysdroutput/CMakeLists.txt +++ b/plugins/samplesink/soapysdroutput/CMakeLists.txt @@ -28,8 +28,8 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client ${CMAKE_SOURCE_DIR}/devices - ${SOAPYSDRSRC}/include - ${SOAPYSDRSRC}/src + ${LIBSOAPYSDRSRC}/include + ${LIBSOAPYSDRSRC}/src ) else (BUILD_DEBIAN) include_directories( @@ -56,7 +56,7 @@ add_library(outputsoapysdr SHARED if (BUILD_DEBIAN) target_link_libraries(outputsoapysdr ${QT_LIBRARIES} - bladerf + soapysdr sdrbase sdrgui swagger diff --git a/plugins/samplesource/soapysdrinput/CMakeLists.txt b/plugins/samplesource/soapysdrinput/CMakeLists.txt index b87a6567f..da3141fcd 100644 --- a/plugins/samplesource/soapysdrinput/CMakeLists.txt +++ b/plugins/samplesource/soapysdrinput/CMakeLists.txt @@ -28,8 +28,8 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client ${CMAKE_SOURCE_DIR}/devices - ${SOAPYSDRSRC}/include - ${SOAPYSDRSRC}/src + ${LIBSOAPYSDRSRC}/include + ${LIBSOAPYSDRSRC}/src ) else (BUILD_DEBIAN) include_directories( @@ -56,7 +56,7 @@ add_library(inputsoapysdr SHARED if (BUILD_DEBIAN) target_link_libraries(inputsoapysdr ${QT_LIBRARIES} - bladerf + soapysdr sdrbase sdrgui swagger