From ce9d4b48e929a34885b80d7035b23c94ea26d62c Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 10 Feb 2020 12:17:10 +0100
Subject: [PATCH] Fix CMakeLists files, clean dependencies relationships

---
 src/algorithms/observables/adapters/CMakeLists.txt    |  2 +-
 .../observables/gnuradio_blocks/CMakeLists.txt        |  2 +-
 src/algorithms/observables/libs/CMakeLists.txt        |  8 --------
 src/algorithms/observables/libs/obs_conf.h            | 11 ++++-------
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/algorithms/observables/adapters/CMakeLists.txt b/src/algorithms/observables/adapters/CMakeLists.txt
index 6454fdd27..749fe7f80 100644
--- a/src/algorithms/observables/adapters/CMakeLists.txt
+++ b/src/algorithms/observables/adapters/CMakeLists.txt
@@ -27,8 +27,8 @@ target_link_libraries(obs_adapters
     PUBLIC
         obs_gr_blocks
         algorithms_libs
-        observables_libs
     PRIVATE
+        observables_libs
         Gflags::gflags
         Glog::glog
 )
diff --git a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt
index 2a3cd70f3..53e587a4a 100644
--- a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt
@@ -36,8 +36,8 @@ target_link_libraries(obs_gr_blocks
     PUBLIC
         Boost::headers
         Gnuradio::blocks
-    PRIVATE
         observables_libs
+    PRIVATE
         algorithms_libs
         core_system_parameters
         Gflags::gflags
diff --git a/src/algorithms/observables/libs/CMakeLists.txt b/src/algorithms/observables/libs/CMakeLists.txt
index fec53a212..8966cbd0c 100644
--- a/src/algorithms/observables/libs/CMakeLists.txt
+++ b/src/algorithms/observables/libs/CMakeLists.txt
@@ -18,14 +18,6 @@ add_library(observables_libs
     ${OBSERVABLES_LIB_HEADERS}
 )
 
-target_link_libraries(observables_libs
-    PRIVATE
-        Gflags::gflags
-        Glog::glog
-        algorithms_libs
-        core_system_parameters
-)
-
 if(ENABLE_CLANG_TIDY)
     if(CLANG_TIDY_EXE)
         set_target_properties(observables_libs
diff --git a/src/algorithms/observables/libs/obs_conf.h b/src/algorithms/observables/libs/obs_conf.h
index c523013c6..81ea242e3 100644
--- a/src/algorithms/observables/libs/obs_conf.h
+++ b/src/algorithms/observables/libs/obs_conf.h
@@ -18,11 +18,9 @@
  * -------------------------------------------------------------------------
  */
 
-#ifndef GNSS_SDR_OBS_CONF_H_
-#define GNSS_SDR_OBS_CONF_H_
+#ifndef GNSS_SDR_OBS_CONF_H
+#define GNSS_SDR_OBS_CONF_H
 
-#include "configuration_interface.h"
-#include <cstddef>
 #include <cstdint>
 #include <string>
 
@@ -31,13 +29,12 @@ class Obs_Conf
 public:
     bool enable_carrier_smoothing;
     double smoothing_factor;
-    unsigned int nchannels_in;
-    unsigned int nchannels_out;
+    uint32_t nchannels_in;
+    uint32_t nchannels_out;
     bool dump;
     bool dump_mat;
     std::string dump_filename;
 
-
     Obs_Conf();
 };