From 39f4adb0582074596a80a4a1c3b6a49c48655ab6 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Tue, 11 Feb 2020 12:56:33 +0100
Subject: [PATCH] Remove unused dependencies

---
 src/algorithms/acquisition/adapters/CMakeLists.txt     | 10 ++++++++--
 .../acquisition/adapters/beidou_b1i_pcps_acquisition.h |  1 -
 .../acquisition/adapters/beidou_b3i_pcps_acquisition.h |  1 -
 .../adapters/galileo_e1_pcps_ambiguous_acquisition.h   |  1 -
 .../acquisition/adapters/gps_l1_ca_pcps_acquisition.h  |  1 -
 .../acquisition/adapters/gps_l2_m_pcps_acquisition.h   |  1 -
 .../adapters/gps_l2_m_pcps_acquisition_fpga.h          |  3 +--
 .../acquisition/adapters/gps_l5i_pcps_acquisition.h    |  1 -
 src/algorithms/acquisition/libs/CMakeLists.txt         |  2 --
 9 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/algorithms/acquisition/adapters/CMakeLists.txt b/src/algorithms/acquisition/adapters/CMakeLists.txt
index 92260311f..221bd088f 100644
--- a/src/algorithms/acquisition/adapters/CMakeLists.txt
+++ b/src/algorithms/acquisition/adapters/CMakeLists.txt
@@ -90,16 +90,22 @@ target_link_libraries(acquisition_adapters
         channel_libs
         core_system_parameters
         Gnuradio::blocks
-        Volk::volk
     PRIVATE
         gnss_sdr_flags
         Boost::headers
         Gflags::gflags
         Glog::glog
         Gnuradio::fft
-        Volkgnsssdr::volkgnsssdr
 )
 
+if(ENABLE_FPGA)
+    target_link_libraries(acquisition_adapters
+        PRIVATE
+            Volk::volk
+            Volkgnsssdr::volkgnsssdr
+    )
+endif()
+
 target_include_directories(acquisition_adapters
     PUBLIC
         ${CMAKE_SOURCE_DIR}/src/core/interfaces
diff --git a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h
index b9f278266..13ed28e62 100644
--- a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h
+++ b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h
@@ -29,7 +29,6 @@
 #include "pcps_acquisition.h"
 #include <gnuradio/blocks/float_to_complex.h>
 #include <gnuradio/blocks/stream_to_vector.h>
-#include <volk_gnsssdr/volk_gnsssdr.h>
 #include <cstdint>
 #include <memory>
 #include <string>
diff --git a/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.h
index a3c74bd96..a21589291 100644
--- a/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.h
+++ b/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.h
@@ -28,7 +28,6 @@
 #include "pcps_acquisition.h"
 #include <gnuradio/blocks/float_to_complex.h>
 #include <gnuradio/blocks/stream_to_vector.h>
-#include <volk_gnsssdr/volk_gnsssdr.h>
 #include <cstdint>
 #include <memory>
 #include <string>
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h
index 9cf81ec23..4f729d44e 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h
@@ -27,7 +27,6 @@
 #include "gnss_synchro.h"
 #include "pcps_acquisition.h"
 #include <gnuradio/blocks/float_to_complex.h>
-#include <volk_gnsssdr/volk_gnsssdr.h>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h
index 5cd490fb6..22e945573 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h
@@ -31,7 +31,6 @@
 #include "gnss_synchro.h"
 #include "pcps_acquisition.h"
 #include <gnuradio/blocks/float_to_complex.h>
-#include <volk_gnsssdr/volk_gnsssdr.h>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h
index 49fe97f7f..50de93b3a 100644
--- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h
+++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h
@@ -28,7 +28,6 @@
 #include "gnss_synchro.h"
 #include "pcps_acquisition.h"
 #include <gnuradio/blocks/float_to_complex.h>
-#include <volk_gnsssdr/volk_gnsssdr.h>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h
index c7b4405f8..8b53a85a4 100644
--- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h
+++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h
@@ -26,7 +26,6 @@
 #include "channel_fsm.h"
 #include "pcps_acquisition_fpga.h"
 #include <gnuradio/runtime_types.h>  // for basic_block_sptr, top_block_sptr
-#include <volk/volk_complex.h>       // for lv_16sc_t
 #include <cstddef>                   // for size_t
 #include <memory>                    // for weak_ptr
 #include <string>                    // for string
@@ -64,7 +63,7 @@ public:
 
     inline size_t item_size() override
     {
-        return sizeof(lv_16sc_t);
+        return sizeof(float);
     }
 
     void connect(gr::top_block_sptr top_block) override;
diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h
index 2eff5e4fe..f4d7d8937 100644
--- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h
+++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h
@@ -28,7 +28,6 @@
 #include "gnss_synchro.h"
 #include "pcps_acquisition.h"
 #include <gnuradio/blocks/float_to_complex.h>
-#include <volk_gnsssdr/volk_gnsssdr.h>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/src/algorithms/acquisition/libs/CMakeLists.txt b/src/algorithms/acquisition/libs/CMakeLists.txt
index 50c400c86..ceed9f0f8 100644
--- a/src/algorithms/acquisition/libs/CMakeLists.txt
+++ b/src/algorithms/acquisition/libs/CMakeLists.txt
@@ -24,8 +24,6 @@ add_library(acquisition_libs
 )
 
 target_link_libraries(acquisition_libs
-    PUBLIC
-        Volk::volk
     PRIVATE
         Gflags::gflags
         Glog::glog