From 9d0bcc7e5cb2a37a34169aac7ae0c04e74289898 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sat, 24 Nov 2018 19:55:37 +0100 Subject: [PATCH] SoapySDR support: removed from Debian build --- CMakeLists.txt | 1 - devices/CMakeLists.txt | 1 - libsoapysdr/CMakeLists.txt | 4 ++-- plugins/samplesink/CMakeLists.txt | 1 - plugins/samplesource/CMakeLists.txt | 1 - 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4de824c0e..0c76bd2be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -346,7 +346,6 @@ if (BUILD_DEBIAN) add_subdirectory(libmirisdr) add_subdirectory(libperseus) add_subdirectory(libiio) - add_subdirectory(libsoapysdr) endif (BUILD_DEBIAN) add_subdirectory(devices) diff --git a/devices/CMakeLists.txt b/devices/CMakeLists.txt index 9626e5db9..ad8323e6d 100644 --- a/devices/CMakeLists.txt +++ b/devices/CMakeLists.txt @@ -9,7 +9,6 @@ if (BUILD_DEBIAN) add_subdirectory(limesdr) add_subdirectory(perseus) add_subdirectory(plutosdr) - add_subdirectory(soapysdr) else(BUILD_DEBIAN) find_package(LibBLADERF) if(LIBUSB_FOUND AND LIBBLADERF_FOUND) diff --git a/libsoapysdr/CMakeLists.txt b/libsoapysdr/CMakeLists.txt index 434005e80..47a2e0cc3 100644 --- a/libsoapysdr/CMakeLists.txt +++ b/libsoapysdr/CMakeLists.txt @@ -74,13 +74,13 @@ option(CMAKE_INSTALL_RPATH_USE_LINK_PATH "build with automatic rpath" TRUE) list(APPEND SOAPY_SDR_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/Modules.cpp) configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/Modules.in.cpp + ${LIBSOAPYSDRSRC}/lib/Modules.in.cpp ${CMAKE_CURRENT_BINARY_DIR}/Modules.cpp @ONLY) list(APPEND SOAPY_SDR_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/Version.cpp) configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/Version.in.cpp + ${LIBSOAPYSDRSRC}/lib/Version.in.cpp ${CMAKE_CURRENT_BINARY_DIR}/Version.cpp @ONLY) diff --git a/plugins/samplesink/CMakeLists.txt b/plugins/samplesink/CMakeLists.txt index a57d121a4..f8f4af31c 100644 --- a/plugins/samplesink/CMakeLists.txt +++ b/plugins/samplesink/CMakeLists.txt @@ -40,7 +40,6 @@ if (BUILD_DEBIAN) add_subdirectory(limesdroutput) add_subdirectory(plutosdroutput) add_subdirectory(sdrdaemonsink) - add_subdirectory(soapysdroutput) endif (BUILD_DEBIAN) add_subdirectory(filesink) diff --git a/plugins/samplesource/CMakeLists.txt b/plugins/samplesource/CMakeLists.txt index 9e442fa11..93fc805c7 100644 --- a/plugins/samplesource/CMakeLists.txt +++ b/plugins/samplesource/CMakeLists.txt @@ -97,7 +97,6 @@ if (BUILD_DEBIAN) add_subdirectory(rtlsdr) add_subdirectory(sdrdaemonsource) add_subdirectory(sdrplay) - add_subdirectory(soapysdrinput) endif (BUILD_DEBIAN) add_subdirectory(filesource)