From d225bf937824c866d82b487dc6f2f1b5be0346eb Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Sat, 1 Dec 2018 10:09:10 +0100
Subject: [PATCH] SoapySDR support: new attempt for Debian build (2)

---
 devices/CMakeLists.txt                               | 1 +
 devices/soapysdr/CMakeLists.txt                      | 4 ++--
 plugins/samplesink/CMakeLists.txt                    | 1 +
 plugins/samplesink/soapysdroutput/CMakeLists.txt     | 4 ++--
 plugins/samplesource/CMakeLists.txt                  | 1 +
 plugins/samplesource/soapysdrinput/CMakeLists.txt    | 4 ++--
 pluginssrv/samplesink/soapysdroutput/CMakeLists.txt  | 4 ++--
 pluginssrv/samplesource/soapysdrinput/CMakeLists.txt | 4 ++--
 8 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/devices/CMakeLists.txt b/devices/CMakeLists.txt
index e61097662..65439fb0d 100644
--- a/devices/CMakeLists.txt
+++ b/devices/CMakeLists.txt
@@ -11,6 +11,7 @@ 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/devices/soapysdr/CMakeLists.txt b/devices/soapysdr/CMakeLists.txt
index f8268c52b..2f6c3dfea 100644
--- a/devices/soapysdr/CMakeLists.txt
+++ b/devices/soapysdr/CMakeLists.txt
@@ -20,8 +20,8 @@ if (BUILD_DEBIAN)
 include_directories(
     .
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${LIBSOAPYSDRSRC}/include
-    ${LIBSOAPYSDRSRC}/src
+    ${SOAPYSDR_SOURCE_DIR}/include
+    ${SOAPYSDR_SOURCE_DIR}/src
 )
 else (BUILD_DEBIAN)
 include_directories(
diff --git a/plugins/samplesink/CMakeLists.txt b/plugins/samplesink/CMakeLists.txt
index f8f4af31c..a57d121a4 100644
--- a/plugins/samplesink/CMakeLists.txt
+++ b/plugins/samplesink/CMakeLists.txt
@@ -40,6 +40,7 @@ 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/samplesink/soapysdroutput/CMakeLists.txt b/plugins/samplesink/soapysdroutput/CMakeLists.txt
index d621ceb2e..a0aafc3ae 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
-    ${LIBSOAPYSDRSRC}/include
-    ${LIBSOAPYSDRSRC}/src
+    ${SOAPYSDR_SOURCE_DIR}/include
+    ${SOAPYSDR_SOURCE_DIR}/src
 )
 else (BUILD_DEBIAN)
 include_directories(
diff --git a/plugins/samplesource/CMakeLists.txt b/plugins/samplesource/CMakeLists.txt
index 93fc805c7..9e442fa11 100644
--- a/plugins/samplesource/CMakeLists.txt
+++ b/plugins/samplesource/CMakeLists.txt
@@ -97,6 +97,7 @@ if (BUILD_DEBIAN)
     add_subdirectory(rtlsdr)
     add_subdirectory(sdrdaemonsource)
     add_subdirectory(sdrplay)
+    add_subdirectory(soapysdrinput)
 endif (BUILD_DEBIAN)
 
 add_subdirectory(filesource)
diff --git a/plugins/samplesource/soapysdrinput/CMakeLists.txt b/plugins/samplesource/soapysdrinput/CMakeLists.txt
index da3141fcd..bc46d685e 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
-    ${LIBSOAPYSDRSRC}/include
-    ${LIBSOAPYSDRSRC}/src
+    ${SOAPYSDR_SOURCE_DIR}/include
+    ${SOAPYSDR_SOURCE_DIR}/src
 )
 else (BUILD_DEBIAN)
 include_directories(
diff --git a/pluginssrv/samplesink/soapysdroutput/CMakeLists.txt b/pluginssrv/samplesink/soapysdroutput/CMakeLists.txt
index 0f99beee2..b84de7a4a 100644
--- a/pluginssrv/samplesink/soapysdroutput/CMakeLists.txt
+++ b/pluginssrv/samplesink/soapysdroutput/CMakeLists.txt
@@ -23,8 +23,8 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
     ${CMAKE_SOURCE_DIR}/devices
-    ${LIBSOAPYSDRSRC}/include
-    ${LIBSOAPYSDRSRC}/src
+    ${SOAPYSDR_SOURCE_DIR}/include
+    ${SOAPYSDR_SOURCE_DIR}/src
 )
 else (BUILD_DEBIAN)
 include_directories(
diff --git a/pluginssrv/samplesource/soapysdrinput/CMakeLists.txt b/pluginssrv/samplesource/soapysdrinput/CMakeLists.txt
index 331082b11..ceccc4ff2 100644
--- a/pluginssrv/samplesource/soapysdrinput/CMakeLists.txt
+++ b/pluginssrv/samplesource/soapysdrinput/CMakeLists.txt
@@ -23,8 +23,8 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
     ${CMAKE_SOURCE_DIR}/devices
-    ${LIBSOAPYSDRSRC}/include
-    ${LIBSOAPYSDRSRC}/src
+    ${SOAPYSDR_SOURCE_DIR}/include
+    ${SOAPYSDR_SOURCE_DIR}/src
 )
 else (BUILD_DEBIAN)
 include_directories(