From 9d23915fee6a5f6c1033acec52864c497d4ca62a Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carlesfernandez@gmail.com>
Date: Thu, 1 Mar 2018 15:05:04 +0100
Subject: [PATCH] Fix make check in Ubuntu 16.04

---
 src/algorithms/tracking/libs/CMakeLists.txt |  7 +++----
 src/core/receiver/CMakeLists.txt            |  2 --
 src/tests/CMakeLists.txt                    | 10 +++-------
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/algorithms/tracking/libs/CMakeLists.txt b/src/algorithms/tracking/libs/CMakeLists.txt
index 19387889e..5c5ce7a2a 100644
--- a/src/algorithms/tracking/libs/CMakeLists.txt
+++ b/src/algorithms/tracking/libs/CMakeLists.txt
@@ -31,10 +31,10 @@ endif(ENABLE_CUDA)
 
 
 
-set(TRACKING_LIB_SOURCES   
+set(TRACKING_LIB_SOURCES
      cpu_multicorrelator.cc
      cpu_multicorrelator_real_codes.cc
-     cpu_multicorrelator_16sc.cc     
+     cpu_multicorrelator_16sc.cc
      lock_detectors.cc
      tcp_communication.cc
      tcp_packet_data.cc
@@ -74,11 +74,10 @@ file(GLOB TRACKING_LIB_HEADERS "*.h")
 list(SORT TRACKING_LIB_HEADERS)
 add_library(tracking_lib ${TRACKING_LIB_SOURCES} ${TRACKING_LIB_HEADERS})
 source_group(Headers FILES ${TRACKING_LIB_HEADERS})
-target_link_libraries(tracking_lib ${OPT_TRACKING_LIBRARIES} ${VOLK_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES})
+target_link_libraries(tracking_lib ${OPT_TRACKING_LIBRARIES} ${VOLK_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${Boost_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES})
 
 if(VOLK_GNSSSDR_FOUND)
     add_dependencies(tracking_lib glog-${glog_RELEASE})
 else(VOLK_GNSSSDR_FOUND)
     add_dependencies(tracking_lib glog-${glog_RELEASE} volk_gnsssdr_module)
 endif()
-
diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt
index b87b2bd1a..0e12422a6 100644
--- a/src/core/receiver/CMakeLists.txt
+++ b/src/core/receiver/CMakeLists.txt
@@ -161,8 +161,6 @@ target_link_libraries(gnss_rx ${Boost_LIBRARIES}
                               conditioner_adapters
                               resampler_adapters
                               acq_adapters
-                              tracking_lib
-#                              acquisition_lib
                               tracking_adapters
                               channel_adapters
                               telemetry_decoder_libswiftcnav
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index aac3aa98f..038b3c9b6 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -328,8 +328,8 @@ include_directories(
      ${CMAKE_SOURCE_DIR}/src/tests/common-files
      ${GLOG_INCLUDE_DIRS}
      ${GFlags_INCLUDE_DIRS}
-     ${GNURADIO_RUNTIME_INCLUDE_DIRS}
      ${Boost_INCLUDE_DIRS}
+     ${GNURADIO_RUNTIME_INCLUDE_DIRS}
      ${ARMADILLO_INCLUDE_DIRS}
      ${VOLK_INCLUDE_DIRS}
      ${VOLK_GNSSSDR_INCLUDE_DIRS}
@@ -605,12 +605,8 @@ if(NOT ${ENABLE_PACKAGING})
      target_link_libraries(control_thread_test ${Boost_LIBRARIES}
                                                ${GFlags_LIBS}
                                                ${GLOG_LIBRARIES}
-                                               ${GNURADIO_RUNTIME_LIBRARIES}
                                                ${GTEST_LIBRARIES}
-                                               gnss_sp_libs
-                                               gnss_system_parameters
                                                gnss_rx
-                                               ${VOLK_GNSSSDR_LIBRARIES}
                           )
      add_test(control_thread_test control_thread_test)
      if(NOT ${GTEST_DIR_LOCAL})
@@ -722,10 +718,10 @@ else(NOT ${GTEST_DIR_LOCAL})
    if(MATIO_FOUND)
         add_dependencies(matio_test gtest)
     else(MATIO_FOUND)
-        add_dependencies(matio_test gtest matio-${GNSSSDR_MATIO_LOCAL_VERSION}) 
+        add_dependencies(matio_test gtest matio-${GNSSSDR_MATIO_LOCAL_VERSION})
     endif(MATIO_FOUND)
 endif(NOT ${GTEST_DIR_LOCAL})
-                                          
+
 add_executable(acq_test
       ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
       ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc