Update to modern CMake usage

2025-11-20 09:05:25 +00:00 · 2019-02-03 19:24:44 +01:00
parent f3eef2f513
commit 8ae72fe458
72 changed files with 1387 additions and 1258 deletions
--- a/src/algorithms/PVT/adapters/CMakeLists.txt
+++ b/src/algorithms/PVT/adapters/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  (see AUTHORS file for a list of contributors)
+# Copyright (C) 2012-2019  (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -17,10 +17,6 @@
 #


-if(Boost_VERSION LESS 105800)
-    add_definitions(-DOLD_BOOST=1)
-endif()
-
 set(PVT_ADAPTER_SOURCES
    rtklib_pvt.cc
 )
@@ -29,28 +25,27 @@ set(PVT_ADAPTER_HEADERS
    rtklib_pvt.h
 )

-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/gnuradio_blocks
-    ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${ARMADILLO_INCLUDE_DIRS}
-    ${Boost_INCLUDE_DIRS}
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-)
-
 add_library(pvt_adapters ${PVT_ADAPTER_SOURCES} ${PVT_ADAPTER_HEADERS})

 source_group(Headers FILES ${PVT_ADAPTER_HEADERS})

 target_link_libraries(pvt_adapters
-    pvt_gr_blocks
-    ${ARMADILLO_LIBRARIES}
-    ${GNURADIO_RUNTIME_LIBRARIES}
+    PUBLIC
+        pvt_gr_blocks
+        Armadillo::armadillo
+        Gnuradio::runtime
+        gnss_system_parameters
+        gnss_rx
+        pvt_lib
+    PRIVATE
+        Boost::serialization
+)
+
+if(Boost_VERSION LESS 105800)
+    target_compile_definitions(pvt_adapters PUBLIC -DOLD_BOOST=1)
+endif()
+
+set_property(TARGET pvt_adapters
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
--- a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  (see AUTHORS file for a list of contributors)
+# Copyright (C) 2012-2019  (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -16,11 +16,6 @@
 # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
 #

-
-if(Boost_VERSION LESS 105800)
-    add_definitions(-DOLD_BOOST=1)
-endif()
-
 set(PVT_GR_BLOCKS_SOURCES
    rtklib_pvt_cc.cc
 )
@@ -29,21 +24,35 @@ set(PVT_GR_BLOCKS_HEADERS
    rtklib_pvt_cc.h
 )

-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${ARMADILLO_INCLUDE_DIRS}
-    ${Boost_INCLUDE_DIRS}
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
+add_library(pvt_gr_blocks ${PVT_GR_BLOCKS_SOURCES} ${PVT_GR_BLOCKS_HEADERS})
+
+source_group(Headers FILES ${PVT_GR_BLOCKS_HEADERS})
+
+target_link_libraries(pvt_gr_blocks
+    PUBLIC
+        Boost::date_time
+        pvt_lib
+        Gnuradio::runtime
+        gnss_system_parameters
+        gnss_rx
+    PRIVATE
+        Glog::glog
+        Boost::filesystem
+        Boost::system
 )

-add_library(pvt_gr_blocks ${PVT_GR_BLOCKS_SOURCES} ${PVT_GR_BLOCKS_HEADERS})
-source_group(Headers FILES ${PVT_GR_BLOCKS_HEADERS})
-target_link_libraries(pvt_gr_blocks pvt_lib ${ARMADILLO_LIBRARIES})
+target_include_directories(pvt_gr_blocks
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs
+        ${CMAKE_SOURCE_DIR}/src/core/system_parameters
+)
+
+if(Boost_VERSION LESS 105800)
+    target_compile_definitions(pvt_gr_blocks PUBLIC -DOLD_BOOST=1)
+endif()
+
+set_property(TARGET pvt_gr_blocks
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+        $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/core/system_parameters>
+)
--- a/src/algorithms/PVT/libs/CMakeLists.txt
+++ b/src/algorithms/PVT/libs/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  (see AUTHORS file for a list of contributors)
+# Copyright (C) 2012-2019  (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -16,7 +16,6 @@
 # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
 #

-add_definitions(-DGNSS_SDR_VERSION="${VERSION}")

 set(PVT_LIB_SOURCES
    pvt_solution.cc
@@ -46,48 +45,35 @@ set(PVT_LIB_HEADERS
    pvt_conf.h
 )

-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/adapters
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib
-    ${Boost_INCLUDE_DIRS}
-    ${ARMADILLO_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${GLOG_INCLUDE_DIRS}
-    ${MATIO_INCLUDE_DIRS}
-)
-
 list(SORT PVT_LIB_HEADERS)
 list(SORT PVT_LIB_SOURCES)

 add_library(pvt_lib ${PVT_LIB_SOURCES} ${PVT_LIB_HEADERS})
+
 source_group(Headers FILES ${PVT_LIB_HEADERS})

-if(MATIO_FOUND)
-    add_dependencies(pvt_lib
-        glog-${glog_RELEASE}
-        armadillo-${armadillo_RELEASE}
-    )
-else()
-    add_dependencies(pvt_lib
-        glog-${glog_RELEASE}
-        armadillo-${armadillo_RELEASE}
-        matio-${GNSSSDR_MATIO_LOCAL_VERSION}
-    )
-endif()
-
 target_link_libraries(pvt_lib
-    rtklib_lib
-    gnss_sdr_flags
-    gnss_sp_libs
-    ${Boost_LIBRARIES}
-    ${GLOG_LIBRARIES}
-    ${ARMADILLO_LIBRARIES}
-    ${BLAS}
-    ${LAPACK}
-    ${MATIO_LIBRARIES}
+    PUBLIC
+        Armadillo::armadillo
+        Boost::date_time
+        gnss_system_parameters
+        gnss_sp_libs
+        rtklib_lib
+        gnss_rx
+    PRIVATE
+        Boost::filesystem
+        Boost::system
+        Glog::glog
+        Matio::matio
+)
+
+target_include_directories(pvt_lib PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs ${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib)
+
+target_compile_definitions(pvt_lib PUBLIC -DGNSS_SDR_VERSION="${VERSION}")
+
+set_property(TARGET pvt_lib APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/algorithms/libs>
+    $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib>
+    $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/core/system_parameters>
 )
--- a/src/algorithms/PVT/libs/nmea_printer.h
+++ b/src/algorithms/PVT/libs/nmea_printer.h
@@ -38,6 +38,7 @@

 #include "rtklib_solver.h"
 #include <fstream>
+#include <memory>
 #include <string>


--- a/src/algorithms/PVT/libs/rinex_printer.cc
+++ b/src/algorithms/PVT/libs/rinex_printer.cc
@@ -31,7 +31,6 @@
 #include "rinex_printer.h"
 #include <boost/date_time/gregorian/gregorian.hpp>
 #include <boost/date_time/local_time/local_time.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/date_time/time_zone_base.hpp>
 #include <boost/filesystem/operations.hpp>   // for create_directories, exists
 #include <boost/filesystem/path.hpp>         // for path, operator<<
--- a/src/algorithms/PVT/libs/rtcm_printer.h
+++ b/src/algorithms/PVT/libs/rtcm_printer.h
@@ -36,8 +36,8 @@

 #include "rtcm.h"
 #include <fstream>  // std::ofstream
-#include <memory>   // std::shared_ptr
-
+#include <map>
+#include <memory>  // std::shared_ptr

 /*!
 * \brief This class provides a implementation of a subset of the RTCM Standard 10403.2 messages
--- a/src/algorithms/acquisition/adapters/CMakeLists.txt
+++ b/src/algorithms/acquisition/adapters/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  (see AUTHORS file for a list of contributors)
+# Copyright (C) 2012-2019  (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -83,33 +83,29 @@ if(OPENCL_FOUND)
    )
 endif()

-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/gnuradio_blocks
-    ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/libs
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${Boost_INCLUDE_DIRS}
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${ARMADILLO_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${GNURADIO_BLOCKS_INCLUDE_DIRS}
-    ${VOLK_GNSSSDR_INCLUDE_DIRS}
-)
-
 list(SORT ACQ_ADAPTER_HEADERS)
 list(SORT ACQ_ADAPTER_SOURCES)
+
 add_library(acq_adapters ${ACQ_ADAPTER_SOURCES} ${ACQ_ADAPTER_HEADERS})
+
 source_group(Headers FILES ${ACQ_ADAPTER_HEADERS})
+
 target_link_libraries(acq_adapters
-    acquisition_lib
-    gnss_sp_libs
-    gnss_sdr_flags
-    acq_gr_blocks
-    ${Boost_LIBRARIES}
-    ${GNURADIO_RUNTIME_LIBRARIES}
-    ${GNURADIO_BLOCKS_LIBRARIES}
+    PUBLIC
+        gnss_sp_libs
+        gnss_sdr_flags
+        acq_gr_blocks
+        rx_core_lib
+        Gnuradio::blocks
+        gnss_system_parameters
+    PRIVATE
+        Boost::boost
+        Glog::glog
+        Volkgnsssdr::volkgnsssdr
+        acquisition_lib
+)
+
+set_property(TARGET acq_adapters
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
--- a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h
+++ b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h
@@ -34,7 +34,6 @@
 #ifndef GNSS_SDR_BEIDOU_B1I_PCPS_ACQUISITION_H_
 #define GNSS_SDR_BEIDOU_B1I_PCPS_ACQUISITION_H_

-#include "acq_conf.h"
 #include "acquisition_interface.h"
 #include "complex_byte_to_float_x2.h"
 #include "gnss_synchro.h"
--- a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  (see AUTHORS file for a list of contributors)
+# Copyright (C) 2012-2019  (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -49,21 +49,6 @@ if(OPENCL_FOUND)
    set(ACQ_GR_BLOCKS_HEADERS ${ACQ_GR_BLOCKS_HEADERS} pcps_opencl_acquisition_cc.h)
 endif()

-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/libs
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${Boost_INCLUDE_DIRS}
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${ARMADILLO_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${VOLK_GNSSSDR_INCLUDE_DIRS}
-    ${MATIO_INCLUDE_DIRS}
-)

 if(OPENCL_FOUND)
    include_directories(${OPENCL_INCLUDE_DIRS})
@@ -79,32 +64,30 @@ list(SORT ACQ_GR_BLOCKS_SOURCES)
 add_library(acq_gr_blocks ${ACQ_GR_BLOCKS_SOURCES} ${ACQ_GR_BLOCKS_HEADERS})
 source_group(Headers FILES ${ACQ_GR_BLOCKS_HEADERS})

-if(ENABLE_FPGA)
-    target_link_libraries(acq_gr_blocks
+target_link_libraries(acq_gr_blocks
+    PUBLIC
+        Gnuradio::runtime
+        Gnuradio::fft
+        Volk::volk
+        gnss_system_parameters
        acquisition_lib
-        gnss_sp_libs
-        gnss_system_parameters
-        ${GNURADIO_RUNTIME_LIBRARIES}
-        ${GNURADIO_FFT_LIBRARIES}
-        ${VOLK_LIBRARIES}
-        ${VOLK_GNSSSDR_LIBRARIES}
        ${OPT_LIBRARIES}
-        ${OPT_ACQUISITION_LIBRARIES}
-    )
-else()
-    target_link_libraries(acq_gr_blocks
+    PRIVATE
        gnss_sp_libs
-        gnss_system_parameters
-        ${GNURADIO_RUNTIME_LIBRARIES}
-        ${GNURADIO_FFT_LIBRARIES}
-        ${VOLK_LIBRARIES}
-        ${VOLK_GNSSSDR_LIBRARIES}
-        ${OPT_LIBRARIES}
-        ${MATIO_LIBRARIES}
-        ${OPT_ACQUISITION_LIBRARIES}
-    )
+        Glog::glog
+        Boost::filesystem
+        Matio::matio
+        Volkgnsssdr::volkgnsssdr
+        gnss_rx
+)
+
+if(OPENCL_FOUND)
+    target_include_directories(acq_gr_blocks PUBLIC ${OPENCL_INCLUDE_DIRS})
 endif()

-if(NOT VOLKGNSSSDR_FOUND)
-    add_dependencies(acq_gr_blocks volk_gnsssdr_module)
-endif()
+target_include_directories(acq_gr_blocks PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
+
+set_property(TARGET acq_gr_blocks
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
--- a/src/algorithms/acquisition/libs/CMakeLists.txt
+++ b/src/algorithms/acquisition/libs/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  (see AUTHORS file for a list of contributors)
+# Copyright (C) 2012-2019  (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -19,17 +19,6 @@
 if(ENABLE_FPGA)
    set(ACQUISITION_LIB_SOURCES fpga_acquisition.cc)
    set(ACQUISITION_LIB_HEADERS fpga_acquisition.h)
-    include_directories(
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-        ${CMAKE_SOURCE_DIR}/src/core/interfaces
-        ${CMAKE_SOURCE_DIR}/src/core/receiver
-        ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-        ${VOLK_INCLUDE_DIRS}
-        ${GLOG_INCLUDE_DIRS}
-        ${GFlags_INCLUDE_DIRS}
-        ${VOLK_GNSSSDR_INCLUDE_DIRS}
-    )
 endif()

 set(ACQUISITION_LIB_HEADERS ${ACQUISITION_LIB_HEADERS} acq_conf.h)
@@ -46,13 +35,17 @@ add_library(acquisition_lib
 source_group(Headers FILES ${ACQUISITION_LIB_HEADERS})

 target_link_libraries(acquisition_lib
-    ${VOLK_LIBRARIES}
-    ${VOLK_GNSSSDR_LIBRARIES}
-    ${GNURADIO_RUNTIME_LIBRARIES}
+    PUBLIC
+        Volk::volk
+        Gnuradio::fft
+    PRIVATE
+        Glog::glog
+        gnss_system_parameters
+        gnss_rx
+        gnss_sp_libs
 )

-if(VOLKGNSSSDR_FOUND)
-    add_dependencies(acquisition_lib glog-${glog_RELEASE})
-else()
-    add_dependencies(acquisition_lib glog-${glog_RELEASE} volk_gnsssdr_module)
-endif()
+set_property(TARGET acquisition_lib
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
--- a/src/algorithms/channel/adapters/CMakeLists.txt
+++ b/src/algorithms/channel/adapters/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  (see AUTHORS file for a list of contributors)
+# Copyright (C) 2012-2019  (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -19,19 +19,6 @@
 set(CHANNEL_ADAPTER_SOURCES channel.cc)
 set(CHANNEL_ADAPTER_HEADERS channel.h)

-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/channel/libs
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${Boost_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-)
-
 add_library(channel_adapters
    ${CHANNEL_ADAPTER_SOURCES}
    ${CHANNEL_ADAPTER_HEADERS}
@@ -40,8 +27,16 @@ add_library(channel_adapters
 source_group(Headers FILES ${CHANNEL_ADAPTER_HEADERS})

 target_link_libraries(channel_adapters
-    channel_fsm
-    ${GNURADIO_RUNTIME_LIBRARIES}
-    ${Boost_LIBRARIES}
-    gnss_sdr_flags
+    PUBLIC
+        Gnuradio::runtime
+        channel_fsm
+        gnss_rx
+    PRIVATE
+        gnss_sdr_flags
+        Glog::glog
+)
+
+set_property(TARGET channel_adapters
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
--- a/src/algorithms/channel/libs/CMakeLists.txt
+++ b/src/algorithms/channel/libs/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  (see AUTHORS file for a list of contributors)
+# Copyright (C) 2012-2019  (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -26,23 +26,21 @@ set(CHANNEL_FSM_HEADERS
    channel_msg_receiver_cc.h
 )

-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/channel/adapters
-    ${Boost_INCLUDE_DIRS}
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-)
-
 list(SORT CHANNEL_FSM_HEADERS)
 list(SORT CHANNEL_FSM_SOURCES)

 add_library(channel_fsm ${CHANNEL_FSM_SOURCES} ${CHANNEL_FSM_HEADERS})
 source_group(Headers FILES ${CHANNEL_FSM_HEADERS})
-add_dependencies(channel_fsm glog-${glog_RELEASE})

-target_link_libraries(channel_fsm gnss_rx)
+target_link_libraries(channel_fsm
+    PUBLIC
+        gnss_rx
+        Gnuradio::runtime
+    PRIVATE
+        Glog::glog
+)
+
+set_property(TARGET channel_fsm
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
--- a/src/algorithms/conditioner/adapters/CMakeLists.txt
+++ b/src/algorithms/conditioner/adapters/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  (see AUTHORS file for a list of contributors)
+# Copyright (C) 2012-2019  (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -27,21 +27,21 @@ set(COND_ADAPTER_HEADERS
    array_signal_conditioner.h
 )

-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/gnuradio_blocks
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-)
-
 list(SORT COND_ADAPTER_HEADERS)
 list(SORT COND_ADAPTER_SOURCES)

 add_library(conditioner_adapters ${COND_ADAPTER_SOURCES} ${COND_ADAPTER_HEADERS})
 source_group(Headers FILES ${COND_ADAPTER_HEADERS})
-add_dependencies(conditioner_adapters glog-${glog_RELEASE})
+
+target_link_libraries(conditioner_adapters
+    PUBLIC
+        gnss_rx
+        Gnuradio::runtime
+    PRIVATE
+        Glog::glog
+)
+
+set_property(TARGET conditioner_adapters
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
--- a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt
+++ b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  (see AUTHORS file for a list of contributors)
+# Copyright (C) 2012-2019  (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -35,18 +35,6 @@ set(DATATYPE_ADAPTER_HEADERS
    ishort_to_complex.h
 )

-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/algorithms/data_type_adapter/gnuradio_blocks
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${VOLK_INCLUDE_DIRS}
-)
-
 list(SORT DATATYPE_ADAPTER_HEADERS)
 list(SORT DATATYPE_ADAPTER_SOURCES)

@@ -56,9 +44,25 @@ add_library(datatype_adapters
 )

 source_group(Headers FILES ${DATATYPE_ADAPTER_HEADERS})
-add_dependencies(datatype_adapters glog-${glog_RELEASE})
+
 target_link_libraries(datatype_adapters
-    data_type_gr_blocks
-    ${GNURADIO_RUNTIME_LIBRARIES}
-    ${GNURADIO_BLOCKS_LIBRARIES}
+    PUBLIC
+        gnss_system_parameters
+        gnss_rx
+        data_type_gr_blocks
+        gnss_sp_libs
+        Gnuradio::blocks
+    PRIVATE
+        Glog::glog
+        Volk::volk
+)
+
+target_include_directories(datatype_adapters
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/algorithms/libs
+)
+
+set_property(TARGET datatype_adapters
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
--- a/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  (see AUTHORS file for a list of contributors)
+# Copyright (C) 2012-2019  (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -29,12 +29,6 @@ set(DATA_TYPE_GR_BLOCKS_HEADERS
    interleaved_byte_to_complex_short.h
 )

-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${VOLK_INCLUDE_DIRS}
-)
-
 list(SORT DATA_TYPE_GR_BLOCKS_HEADERS)
 list(SORT DATA_TYPE_GR_BLOCKS_SOURCES)

@@ -46,6 +40,15 @@ add_library(data_type_gr_blocks
 source_group(Headers FILES ${DATA_TYPE_GR_BLOCKS_HEADERS})

 target_link_libraries(data_type_gr_blocks
-    ${GNURADIO_RUNTIME_LIBRARIES}
-    ${VOLK_LIBRARIES}
+    PUBLIC
+        Gnuradio::runtime
+        Boost::boost
+        gnss_sp_libs
+    PRIVATE
+        Volk::volk
+)
+
+set_property(TARGET data_type_gr_blocks
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
--- a/src/algorithms/input_filter/adapters/CMakeLists.txt
+++ b/src/algorithms/input_filter/adapters/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  (see AUTHORS file for a list of contributors)
+# Copyright (C) 2012-2019  (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -34,22 +34,6 @@ set(INPUT_FILTER_ADAPTER_HEADERS
    notch_filter_lite.h
 )

-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/algorithms/input_filter/gnuradio_blocks
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${VOLK_INCLUDE_DIRS}
-)
-
-if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
-    add_definitions(-DGR_GREATER_38=1)
-endif()
-
 list(SORT INPUT_FILTER_ADAPTER_HEADERS)
 list(SORT INPUT_FILTER_ADAPTER_SOURCES)

@@ -59,11 +43,26 @@ add_library(input_filter_adapters
 )

 source_group(Headers FILES ${INPUT_FILTER_ADAPTER_HEADERS})
-add_dependencies(input_filter_adapters glog-${glog_RELEASE} gnss_sp_libs)
+
 target_link_libraries(input_filter_adapters
-    input_filter_gr_blocks
-    ${GNURADIO_RUNTIME_LIBRARIES}
-    ${GNURADIO_BLOCKS_LIBRARIES}
-    ${GNURADIO_FILTER_LIBRARIES}
-    gnss_sp_libs
+    PUBLIC
+        input_filter_gr_blocks
+        Gnuradio::filter
+        Gnuradio::blocks
+        gnss_sp_libs
+        gnss_rx
+    PRIVATE
+        Volk::volk
+)
+
+target_include_directories(input_filter_adapters PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
+
+
+if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
+    target_compile_definitions(input_filter_adapters PUBLIC -DGR_GREATER_38=1)
+endif()
+
+set_property(TARGET input_filter_adapters
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
--- a/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  (see AUTHORS file for a list of contributors)
+# Copyright (C) 2012-2019  (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -31,15 +31,6 @@ set(INPUT_FILTER_GR_BLOCKS_HEADERS
    notch_lite_cc.h
 )

-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${GNURADIO_BLOCKS_INCLUDE_DIRS}
-    ${VOLK_GNSSSDR_INCLUDE_DIRS}
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-)
-
 list(SORT INPUT_FILTER_GR_BLOCKS_HEADERS)
 list(SORT INPUT_FILTER_GR_BLOCKS_SOURCES)

@@ -50,12 +41,17 @@ add_library(input_filter_gr_blocks
 source_group(Headers FILES ${INPUT_FILTER_GR_BLOCKS_HEADERS})

 target_link_libraries(input_filter_gr_blocks
-    ${GNURADIO_FILTER_LIBRARIES}
-    ${VOLK_GNSSSDR_LIBRARIES}
-    ${LOG4CPP_LIBRARIES})
+    PUBLIC
+        Gnuradio::filter
+        Gnuradio::blocks
+        Volkgnsssdr::volkgnsssdr
+    PRIVATE
+        Gflags::gflags
+        Glog::glog
+        ${LOG4CPP_LIBRARIES}
+)

-if(NOT VOLKGNSSSDR_FOUND)
-    add_dependencies(input_filter_gr_blocks volk_gnsssdr_module glog-${glog_RELEASE})
-else()
-    add_dependencies(input_filter_gr_blocks glog-${glog_RELEASE})
-endif()
+set_property(TARGET input_filter_gr_blocks
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
--- a/src/algorithms/libs/CMakeLists.txt
+++ b/src/algorithms/libs/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  (see AUTHORS file for a list of contributors)
+# Copyright (C) 2012-2019  (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -90,20 +90,6 @@ if(OPENCL_FOUND)
    )
 endif()

-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${Boost_INCLUDE_DIRS}
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${ARMADILLO_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${GNURADIO_BLOCKS_INCLUDE_DIRS}
-    ${VOLK_INCLUDE_DIRS}
-    ${VOLK_GNSSSDR_INCLUDE_DIRS}
-)

 if(OPENCL_FOUND)
    include_directories(${OPENCL_INCLUDE_DIRS})
@@ -114,8 +100,6 @@ if(OPENCL_FOUND)
    endif()
 endif()

-add_definitions(-DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}")
-
 list(SORT GNSS_SPLIBS_HEADERS)
 list(SORT GNSS_SPLIBS_SOURCES)

@@ -123,29 +107,50 @@ add_library(gnss_sp_libs ${GNSS_SPLIBS_SOURCES} ${GNSS_SPLIBS_HEADERS})
 source_group(Headers FILES ${GNSS_SPLIBS_HEADERS})

 target_link_libraries(gnss_sp_libs
-    ${GNURADIO_RUNTIME_LIBRARIES}
-    ${VOLK_LIBRARIES} ${ORC_LIBRARIES}
-    ${VOLK_GNSSSDR_LIBRARIES}  ${ORC_LIBRARIES}
-    ${GFlags_LIBS}
-    ${ARMADILLO_LIBRARIES}
-    ${GNURADIO_BLOCKS_LIBRARIES}
-    ${GNURADIO_FFT_LIBRARIES}
-    ${GNURADIO_FILTER_LIBRARIES}
-    ${OPT_LIBRARIES}
-    gnss_rx
+    PUBLIC
+        Boost::boost
+        Gflags::gflags
+        Armadillo::armadillo
+        Gnuradio::runtime
+        Gnuradio::blocks
+        Volk::volk ${ORC_LIBRARIES}
+        Volkgnsssdr::volkgnsssdr
+        gnss_system_parameters
+        ${OPT_LIBRARIES}
+    PRIVATE
+        Boost::filesystem
+        Glog::glog
+        gnss_rx
 )

-if(NOT VOLKGNSSSDR_FOUND)
-    add_dependencies(gnss_sp_libs volk_gnsssdr_module
-        armadillo-${armadillo_RELEASE})
-else()
-    add_dependencies(gnss_sp_libs armadillo-${armadillo_RELEASE})
-endif()
+target_compile_definitions(gnss_sp_libs PUBLIC -DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}")

 if(${GFLAGS_GREATER_20})
-    add_definitions(-DGFLAGS_GREATER_2_0=1)
+    target_compile_definitions(gnss_sp_libs PUBLIC -DGFLAGS_GREATER_2_0=1)
 endif()

+set_property(TARGET gnss_sp_libs
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
+
 add_library(gnss_sdr_flags gnss_sdr_flags.cc gnss_sdr_flags.h)
 source_group(Headers FILES gnss_sdr_flags.h)
-target_link_libraries(gnss_sdr_flags ${GFlags_LIBS})
+
+target_link_libraries(gnss_sdr_flags
+    PUBLIC
+        Gflags::gflags
+    PRIVATE
+        Boost::filesystem
+)
+
+if(${GFLAGS_GREATER_20})
+    target_compile_definitions(gnss_sdr_flags PUBLIC -DGFLAGS_GREATER_2_0=1)
+endif()
+
+target_compile_definitions(gnss_sdr_flags PUBLIC -DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}")
+
+set_property(TARGET gnss_sdr_flags
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
--- a/src/algorithms/libs/rtklib/CMakeLists.txt
+++ b/src/algorithms/libs/rtklib/CMakeLists.txt
@@ -16,7 +16,6 @@
 # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
 #

-add_definitions(-DGNSS_SDR_VERSION="${VERSION}")

 set(RTKLIB_LIB_SOURCES
    rtklib_rtkcmn.cc
@@ -59,33 +58,31 @@ set(RTKLIB_LIB_HEADERS
    rtklib.h
 )

-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${Boost_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${GLOG_INCLUDE_DIRS}
-)
-
 list(SORT RTKLIB_LIB_HEADERS)
 list(SORT RTKLIB_LIB_SOURCES)

 add_library(rtklib_lib ${RTKLIB_LIB_SOURCES} ${RTKLIB_LIB_HEADERS})
 source_group(Headers FILES ${RTKLIB_LIB_HEADERS})
-add_dependencies(rtklib_lib glog-${glog_RELEASE})

 if(OS_IS_MACOSX)
    set(MAC_LIBRARIES "-framework Accelerate")
 endif()

-target_link_libraries(
-    rtklib_lib
-    ${Boost_LIBRARIES}
-    ${GFlags_LIBS}
-    ${GLOG_LIBRARIES}
-    ${BLAS}
-    ${LAPACK}
-    ${MAC_LIBRARIES}
+target_link_libraries(rtklib_lib
+    PUBLIC
+        gnss_rx
+        gnss_system_parameters
+    PRIVATE
+        Gflags::gflags
+        Glog::glog
+        ${BLAS}
+        ${LAPACK}
+        ${MAC_LIBRARIES}
+)
+
+target_compile_definitions(rtklib_lib PUBLIC -DGNSS_SDR_VERSION="${VERSION}")
+
+set_property(TARGET rtklib_lib
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
--- a/src/algorithms/libs/rtklib/rtklib_ionex.cc
+++ b/src/algorithms/libs/rtklib/rtklib_ionex.cc
@@ -59,6 +59,7 @@

 #include "rtklib_ionex.h"
 #include "rtklib_rtkcmn.h"
+#include <cstring>

 /* get index -----------------------------------------------------------------*/
 int getindex(double value, const double *range)
--- a/src/algorithms/libs/rtklib/rtklib_lambda.cc
+++ b/src/algorithms/libs/rtklib/rtklib_lambda.cc
@@ -52,6 +52,7 @@

 #include "rtklib_lambda.h"
 #include "rtklib_rtkcmn.h"
+#include <cstring>

 /* LD factorization (Q=L'*diag(D)*L) -----------------------------------------*/
 int LD(int n, const double *Q, double *L, double *D)
--- a/src/algorithms/libs/rtklib/rtklib_pntpos.cc
+++ b/src/algorithms/libs/rtklib/rtklib_pntpos.cc
@@ -54,6 +54,7 @@
 #include "rtklib_ephemeris.h"
 #include "rtklib_ionex.h"
 #include "rtklib_sbas.h"
+#include <cstring>

 /* pseudorange measurement error variance ------------------------------------*/
 double varerr(const prcopt_t *opt, double el, int sys)
--- a/src/algorithms/libs/rtklib/rtklib_ppp.cc
+++ b/src/algorithms/libs/rtklib/rtklib_ppp.cc
@@ -57,6 +57,7 @@
 #include "rtklib_rtkcmn.h"
 #include "rtklib_sbas.h"
 #include "rtklib_tides.h"
+#include <cstring>

 /* wave length of LC (m) -----------------------------------------------------*/
 double lam_LC(int i, int j, int k)
--- a/src/algorithms/libs/rtklib/rtklib_preceph.cc
+++ b/src/algorithms/libs/rtklib/rtklib_preceph.cc
@@ -62,6 +62,7 @@

 #include "rtklib_preceph.h"
 #include "rtklib_rtkcmn.h"
+#include <cstring>

 /* satellite code to satellite system ----------------------------------------*/
 int code2sys(char code)
--- a/src/algorithms/libs/rtklib/rtklib_rtcm3.cc
+++ b/src/algorithms/libs/rtklib/rtklib_rtcm3.cc
@@ -54,6 +54,7 @@

 #include "rtklib_rtcm3.h"
 #include "rtklib_rtkcmn.h"
+#include <cstring>


 /* msm signal id table -------------------------------------------------------*/
--- a/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc
+++ b/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc
@@ -52,6 +52,7 @@

 #include "rtklib_rtkcmn.h"
 //#include <cstdio>
+#include <glog/logging.h>
 #include <dirent.h>
 #include <iostream>
 #include <sstream>
--- a/src/algorithms/libs/rtklib/rtklib_rtkcmn.h
+++ b/src/algorithms/libs/rtklib/rtklib_rtkcmn.h
@@ -79,7 +79,7 @@
 #define GNSS_SDR_RTKLIB_RTKCMN_H_

 #include "rtklib.h"
-#include <glog/logging.h>
+//#include <glog/logging.h>

 /* coordinate rotation matrix ------------------------------------------------*/
 #define Rx(t, X)                                     \
--- a/src/algorithms/libs/rtklib/rtklib_rtkpos.cc
+++ b/src/algorithms/libs/rtklib/rtklib_rtkpos.cc
@@ -57,6 +57,7 @@
 #include "rtklib_pntpos.h"
 #include "rtklib_ppp.h"
 #include "rtklib_tides.h"
+#include <cstring>

 static int resamb_WLNL(rtk_t *rtk __attribute((unused)), const obsd_t *obs __attribute((unused)), const int *sat __attribute((unused)),
    const int *iu __attribute((unused)), const int *ir __attribute((unused)), int ns __attribute__((unused)), const nav_t *nav __attribute((unused)),
--- a/src/algorithms/libs/rtklib/rtklib_rtksvr.cc
+++ b/src/algorithms/libs/rtklib/rtklib_rtksvr.cc
@@ -7,6 +7,7 @@
 #include "rtklib_sbas.h"
 #include "rtklib_solution.h"
 #include "rtklib_stream.h"
+#include <cstring>

 /* write solution header to output stream ------------------------------------*/
 void writesolhead(stream_t *stream, const solopt_t *solopt)
--- a/src/algorithms/libs/rtklib/rtklib_sbas.cc
+++ b/src/algorithms/libs/rtklib/rtklib_sbas.cc
@@ -61,6 +61,7 @@

 #include "rtklib_sbas.h"
 #include "rtklib_rtkcmn.h"
+#include <cstring>

 /* extract field from line ---------------------------------------------------*/
 char *getfield(char *p, int pos)
--- a/src/algorithms/libs/rtklib/rtklib_solution.cc
+++ b/src/algorithms/libs/rtklib/rtklib_solution.cc
@@ -55,6 +55,7 @@
 #include "rtklib_rtkcmn.h"
 #include "rtklib_rtksvr.h"
 #include <cctype>
+#include <cstring>


 /* constants and macros ------------------------------------------------------*/
--- a/src/algorithms/libs/rtklib/rtklib_stream.cc
+++ b/src/algorithms/libs/rtklib/rtklib_stream.cc
@@ -53,6 +53,7 @@
 #include <arpa/inet.h>
 #include <cctype>
 #include <cerrno>
+#include <cstring>
 #include <fcntl.h>
 #include <netdb.h>
 #include <netinet/tcp.h>
--- a/src/algorithms/observables/adapters/CMakeLists.txt
+++ b/src/algorithms/observables/adapters/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  (see AUTHORS file for a list of contributors)
+# Copyright (C) 2012-2019  (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -24,19 +24,22 @@ set(OBS_ADAPTER_HEADERS
    hybrid_observables.h
 )

-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/observables/gnuradio_blocks
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
+add_library(obs_adapters ${OBS_ADAPTER_SOURCES} ${OBS_ADAPTER_HEADERS})
+
+source_group(Headers FILES ${OBS_ADAPTER_HEADERS})
+
+target_include_directories(obs_adapters PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
+
+target_link_libraries(obs_adapters
+    PUBLIC
+        obs_gr_blocks
+        gnss_rx
+        gnss_sp_libs
+    PRIVATE
+        Glog::glog
 )

-add_library(obs_adapters ${OBS_ADAPTER_SOURCES} ${OBS_ADAPTER_HEADERS})
-source_group(Headers FILES ${OBS_ADAPTER_HEADERS})
-target_link_libraries(obs_adapters obs_gr_blocks ${GNURADIO_RUNTIME_LIBRARIES})
+set_property(TARGET obs_adapters
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
--- a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  (see AUTHORS file for a list of contributors)
+# Copyright (C) 2012-2019  (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -24,42 +24,24 @@ set(OBS_GR_BLOCKS_HEADERS
    hybrid_observables_cc.h
 )

-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${ARMADILLO_INCLUDE_DIRS}
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${MATIO_INCLUDE_DIRS}
-)
-
 add_library(obs_gr_blocks ${OBS_GR_BLOCKS_SOURCES} ${OBS_GR_BLOCKS_HEADERS})

+target_include_directories(obs_gr_blocks PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
+
 source_group(Headers FILES ${OBS_GR_BLOCKS_HEADERS})

-if(MATIO_FOUND)
-    add_dependencies(obs_gr_blocks
-        gnss_sp_libs
-        glog-${glog_RELEASE}
-        armadillo-${armadillo_RELEASE}
-    )
-else()
-    add_dependencies(obs_gr_blocks
-        gnss_sp_libs
-        glog-${glog_RELEASE}
-        armadillo-${armadillo_RELEASE}
-        matio-${GNSSSDR_MATIO_LOCAL_VERSION}
-    )
-endif()
-
 target_link_libraries(obs_gr_blocks
-    gnss_sp_libs
-    ${GNURADIO_RUNTIME_LIBRARIES}
-    ${ARMADILLO_LIBRARIES}
-    ${MATIO_LIBRARIES}
+    PUBLIC
+        Gnuradio::blocks
+        Boost::boost
+        gnss_system_parameters
+    PRIVATE
+        gnss_sp_libs
+        Glog::glog
+        Boost::filesystem
+        Matio::matio
+)
+
+set_property(TARGET obs_gr_blocks APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
--- a/src/algorithms/resampler/adapters/CMakeLists.txt
+++ b/src/algorithms/resampler/adapters/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  (see AUTHORS file for a list of contributors)
+# Copyright (C) 2012-2019  (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -27,20 +27,6 @@ set(RESAMPLER_ADAPTER_HEADERS
    mmse_resampler_conditioner.h
 )

-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/algorithms/resampler/gnuradio_blocks
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${VOLK_INCLUDE_DIRS}
-)
-
-if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
-    add_definitions(-DGR_GREATER_38=1)
-endif()
-
 list(SORT RESAMPLER_ADAPTER_HEADERS)
 list(SORT RESAMPLER_ADAPTER_SOURCES)

@@ -51,4 +37,21 @@ add_library(resampler_adapters

 source_group(Headers FILES ${RESAMPLER_ADAPTER_HEADERS})

-target_link_libraries(resampler_adapters resampler_gr_blocks)
+target_link_libraries(resampler_adapters
+    PUBLIC
+        Gnuradio::runtime
+        resampler_gr_blocks
+        gnss_rx
+    PRIVATE
+        Glog::glog
+        Volk::volk
+)
+
+if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
+    target_compile_definitions(resampler_adapters PUBLIC -DGR_GREATER_38=1)
+endif()
+
+set_property(TARGET resampler_adapters
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
--- a/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  (see AUTHORS file for a list of contributors)
+# Copyright (C) 2012-2019  (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -29,22 +29,26 @@ set(RESAMPLER_GR_BLOCKS_HEADERS
    direct_resampler_conditioner_cb.h
 )

-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${VOLK_INCLUDE_DIRS}
-)
-
 list(SORT RESAMPLER_GR_BLOCKS_HEADERS)
 list(SORT RESAMPLER_GR_BLOCKS_SOURCES)

+source_group(Headers FILES ${RESAMPLER_GR_BLOCKS_HEADERS})
+
 add_library(resampler_gr_blocks
    ${RESAMPLER_GR_BLOCKS_SOURCES}
    ${RESAMPLER_GR_BLOCKS_HEADERS}
 )

-source_group(Headers FILES ${RESAMPLER_GR_BLOCKS_HEADERS})
+target_link_libraries(resampler_gr_blocks
+    PUBLIC
+        Gnuradio::runtime
+        Volk::volk
+    PRIVATE
+        Gflags::gflags
+        Glog::glog
+)

-add_dependencies(resampler_gr_blocks glog-${glog_RELEASE})
+set_property(TARGET resampler_gr_blocks
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
--- a/src/algorithms/signal_generator/adapters/CMakeLists.txt
+++ b/src/algorithms/signal_generator/adapters/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  (see AUTHORS file for a list of contributors)
+# Copyright (C) 2012-2019  (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -19,18 +19,6 @@
 set(SIGNAL_GENERATOR_ADAPTER_SOURCES signal_generator.cc)
 set(SIGNAL_GENERATOR_ADAPTER_HEADERS signal_generator.h)

-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/signal_generator/gnuradio_blocks
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-)
-
 add_library(signal_generator_adapters
    ${SIGNAL_GENERATOR_ADAPTER_SOURCES}
    ${SIGNAL_GENERATOR_ADAPTER_HEADERS}
@@ -39,9 +27,17 @@ add_library(signal_generator_adapters
 source_group(Headers FILES ${SIGNAL_GENERATOR_ADAPTER_HEADERS})

 target_link_libraries(signal_generator_adapters
-    gnss_sp_libs
-    signal_generator_blocks
-    ${GNURADIO_RUNTIME_LIBRARIES}
-    ${GNURADIO_BLOCKS_LIBRARIES}
-    ${GNURADIO_FILTER_LIBRARIES}
+    PUBLIC
+        signal_generator_blocks
+        Gnuradio::runtime
+        Gnuradio::blocks
+        gnss_rx
+    PRIVATE
+        Glog::glog
+        gnss_sp_libs
+)
+
+set_property(TARGET signal_generator_adapters
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
--- a/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
@@ -20,13 +20,13 @@ set(SIGNAL_GENERATOR_BLOCK_SOURCES signal_generator_c.cc)
 set(SIGNAL_GENERATOR_BLOCK_HEADERS signal_generator_c.h)

 include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
+    #${CMAKE_CURRENT_SOURCE_DIR}
+    #${CMAKE_SOURCE_DIR}/src/core/system_parameters
+    #${CMAKE_SOURCE_DIR}/src/core/interfaces
+    #${CMAKE_SOURCE_DIR}/src/core/receiver
+    #${CMAKE_SOURCE_DIR}/src/algorithms/libs
+    #${GLOG_INCLUDE_DIRS}
+    #${GFlags_INCLUDE_DIRS}
    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
    ${VOLK_GNSSSDR_INCLUDE_DIRS}
 )
@@ -39,16 +39,25 @@ add_library(signal_generator_blocks
 source_group(Headers FILES ${SIGNAL_GENERATOR_BLOCK_HEADERS})

 target_link_libraries(signal_generator_blocks
-    gnss_system_parameters
-    gnss_sp_libs
-    ${GNURADIO_RUNTIME_LIBRARIES}
-    ${GNURADIO_FFT_LIBRARIES}
-    ${VOLK_GNSSSDR_LIBRARIES}
-    ${ORC_LIBRARIES}
+    PUBLIC
+        Boost::boost
+        gnss_system_parameters
+        ${GNURADIO_RUNTIME_LIBRARIES}
+        ${GNURADIO_FFT_LIBRARIES}
+        ${VOLK_GNSSSDR_LIBRARIES}
+        ${ORC_LIBRARIES}
+    PRIVATE
+        gnss_sp_libs
 )

-if(VOLKGNSSSDR_FOUND)
-    # add_dependencies(signal_generator_blocks glog-${glog_RELEASE})
-else()
+target_include_directories(signal_generator_blocks PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
+
+
+set_property(TARGET signal_generator_blocks
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
+
+if(NOT VOLKGNSSSDR_FOUND)
    add_dependencies(signal_generator_blocks volk_gnsssdr_module)
 endif()
--- a/src/algorithms/signal_source/adapters/CMakeLists.txt
+++ b/src/algorithms/signal_source/adapters/CMakeLists.txt
@@ -207,21 +207,6 @@ if(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.3)
        two_bit_packed_file_signal_source.h)
 endif()

-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${OPT_DRIVER_INCLUDE_DIRS}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/libs
-    ${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/gnuradio_blocks
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${Boost_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${VOLK_INCLUDE_DIRS}
-)
-
 if(ARCH_64BITS)
    add_definitions(-DARCH_64BITS=1)
 endif()
@@ -233,10 +218,27 @@ list(SORT SIGNAL_SOURCE_ADAPTER_SOURCES)

 add_library(signal_source_adapters ${SIGNAL_SOURCE_ADAPTER_SOURCES} ${SIGNAL_SOURCE_ADAPTER_HEADERS})
 source_group(Headers FILES ${SIGNAL_SOURCE_ADAPTER_HEADERS})
-target_link_libraries(signal_source_adapters signal_source_gr_blocks
-    ${Boost_LIBRARIES}
-    ${GNURADIO_PMT_LIBRARIES}
-    ${GNURADIO_BLOCKS_LIBRARIES}
-    ${OPT_LIBRARIES}
-    gnss_sp_libs
+
+target_include_directories(signal_source_adapters PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
+
+target_link_libraries(signal_source_adapters
+    PUBLIC
+        Boost::boost
+        Gnuradio::runtime
+        signal_source_gr_blocks
+        ${Boost_LIBRARIES}
+        ${GNURADIO_PMT_LIBRARIES}
+        ${GNURADIO_BLOCKS_LIBRARIES}
+        ${OPT_LIBRARIES}
+        gnss_sp_libs
+        gnss_rx
+        signal_source_lib
+    PRIVATE
+        Glog::glog
+        Volk::volk
+)
+
+set_property(TARGET signal_source_adapters APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    $<BUILD_INTERFACE:${OPT_DRIVER_INCLUDE_DIRS}>
 )
--- a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
@@ -57,12 +57,12 @@ set(SIGNAL_SOURCE_GR_BLOCKS_HEADERS


 include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/libs
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${Boost_INCLUDE_DIRS}
+    #${CMAKE_CURRENT_SOURCE_DIR}
+    #${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/libs
+    #${GLOG_INCLUDE_DIRS}
+    #${GFlags_INCLUDE_DIRS}
+    #${GNURADIO_RUNTIME_INCLUDE_DIRS}
+    #${Boost_INCLUDE_DIRS}
    ${OPT_DRIVER_INCLUDE_DIRS}
 )

@@ -77,10 +77,18 @@ add_library(signal_source_gr_blocks
 source_group(Headers FILES ${SIGNAL_SOURCE_GR_BLOCKS_HEADERS})

 target_link_libraries(signal_source_gr_blocks
-    signal_source_lib
-    ${GNURADIO_RUNTIME_LIBRARIES}
-    ${Boost_LIBRARIES}
-    ${OPT_LIBRARIES}
+    PUBLIC
+        signal_source_lib
+        Gnuradio::runtime
+        Boost::thread
+        ${OPT_LIBRARIES}
+    PRIVATE
+        Glog::glog
 )

-add_dependencies(signal_source_gr_blocks glog-${glog_RELEASE})
+target_include_directories(signal_source_gr_blocks PUBLIC ${OPT_DRIVER_INCLUDE_DIRS})
+
+set_property(TARGET signal_source_gr_blocks APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    $<BUILD_INTERFACE:${OPT_DRIVER_INCLUDE_DIRS}>
+)
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h
@@ -39,7 +39,7 @@
 *
 *   Value_0, Value_1, Value_2, ..., Value_n, Value_n+1, Value_n+2, ...
 *
- * \author Cillian O'Driscoll cillian.odriscoll (at) gmail . com 
+ * \author Cillian O'Driscoll cillian.odriscoll (at) gmail . com
 * -------------------------------------------------------------------------
 *
 * Copyright (C) 2010-2018  (see AUTHORS file for a list of contributors)
--- a/src/algorithms/signal_source/libs/CMakeLists.txt
+++ b/src/algorithms/signal_source/libs/CMakeLists.txt
@@ -57,14 +57,6 @@ if(ENABLE_FPGA OR ENABLE_AD9361)
    set(OPT_SIGNAL_SOURCE_LIB_HEADERS ${OPT_SIGNAL_SOURCE_LIB_HEADERS} fpga_switch.h)
 endif()

-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${Boost_INCLUDE_DIRS}
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${OPT_DRIVER_INCLUDE_DIRS}
-)
-
 set(SIGNAL_SOURCE_LIB_SOURCES
    rtl_tcp_commands.cc
    rtl_tcp_dongle_info.cc
@@ -81,6 +73,20 @@ list(SORT SIGNAL_SOURCE_LIB_HEADERS)
 list(SORT SIGNAL_SOURCE_LIB_SOURCES)

 add_library(signal_source_lib ${SIGNAL_SOURCE_LIB_SOURCES} ${SIGNAL_SOURCE_LIB_HEADERS})
+
 source_group(Headers FILES ${SIGNAL_SOURCE_LIB_HEADERS})
-target_link_libraries(signal_source_lib ${OPT_LIBRARIES})
-add_dependencies(signal_source_lib glog-${glog_RELEASE})
+
+target_link_libraries(signal_source_lib
+    PUBLIC
+        Boost::boost
+        ${OPT_LIBRARIES}
+    PRIVATE
+        Glog::glog
+)
+
+target_include_directories(signal_source_lib PUBLIC ${OPT_DRIVER_INCLUDE_DIRS})
+
+set_property(TARGET signal_source_lib APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    $<BUILD_INTERFACE:${OPT_DRIVER_INCLUDE_DIRS}>
+)
--- a/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt
+++ b/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  (see AUTHORS file for a list of contributors)
+# Copyright (C) 2012-2019  (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -41,20 +41,6 @@ set(TELEMETRY_DECODER_ADAPTER_HEADERS
    beidou_b1i_telemetry_decoder.h
 )

-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/gnuradio_blocks
-    ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/libs
-    ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/libs/libswiftcnav
-    ${Boost_INCLUDE_DIRS}
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-)
-
 list(SORT TELEMETRY_DECODER_ADAPTER_HEADERS)
 list(SORT TELEMETRY_DECODER_ADAPTER_SOURCES)

@@ -66,7 +52,17 @@ add_library(telemetry_decoder_adapters
 source_group(Headers FILES ${TELEMETRY_DECODER_ADAPTER_HEADERS})

 target_link_libraries(telemetry_decoder_adapters
-    telemetry_decoder_gr_blocks
-    gnss_system_parameters
-    ${GNURADIO_RUNTIME_LIBRARIES}
+    PUBLIC
+        telemetry_decoder_gr_blocks
+        gnss_system_parameters
+        gnss_rx
+    PRIVATE
+        Gnuradio::runtime
+        telemetry_decoder_lib
+)
+
+
+set_property(TARGET telemetry_decoder_adapters
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  (see AUTHORS file for a list of contributors)
+# Copyright (C) 2012-2019  (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -38,19 +38,6 @@ set(TELEMETRY_DECODER_GR_BLOCKS_HEADERS
    beidou_b1i_telemetry_decoder_cc.h
 )

-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/libs
-    ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/libs/libswiftcnav
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${Boost_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${VOLK_GNSSSDR_INCLUDE_DIRS}
-)
-
 list(SORT TELEMETRY_DECODER_GR_BLOCKS_HEADERS)
 list(SORT TELEMETRY_DECODER_GR_BLOCKS_SOURCES)

@@ -62,13 +49,19 @@ add_library(telemetry_decoder_gr_blocks
 source_group(Headers FILES ${TELEMETRY_DECODER_GR_BLOCKS_HEADERS})

 target_link_libraries(telemetry_decoder_gr_blocks
-    telemetry_decoder_libswiftcnav
-    telemetry_decoder_lib
-    gnss_system_parameters
-    ${GNURADIO_RUNTIME_LIBRARIES}
-    ${VOLK_GNSSSDR_LIBRARIES}
+    PUBLIC
+        telemetry_decoder_libswiftcnav
+        telemetry_decoder_lib
+        gnss_system_parameters
+        gnss_rx
+        Gnuradio::runtime
+        Volkgnsssdr::volkgnsssdr
+    PRIVATE
+        Boost::boost
+        Glog::glog
 )

-if(NOT VOLKGNSSSDR_FOUND)
-    add_dependencies(telemetry_decoder_gr_blocks volk_gnsssdr_module)
-endif()
+set_property(TARGET telemetry_decoder_gr_blocks
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
--- a/src/algorithms/telemetry_decoder/libs/CMakeLists.txt
+++ b/src/algorithms/telemetry_decoder/libs/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  (see AUTHORS file for a list of contributors)
+# Copyright (C) 2012-2019  (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -28,17 +28,6 @@ set(TELEMETRY_DECODER_LIB_HEADERS
    convolutional.h
 )

-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/adapters
-    ${Boost_INCLUDE_DIRS}
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-)
-
 list(SORT TELEMETRY_DECODER_LIB_HEADERS)
 list(SORT TELEMETRY_DECODER_LIB_SOURCES)

@@ -46,6 +35,16 @@ add_library(telemetry_decoder_lib
    ${TELEMETRY_DECODER_LIB_SOURCES}
    ${TELEMETRY_DECODER_LIB_HEADERS}
 )
+
 source_group(Headers FILES ${TELEMETRY_DECODER_LIB_HEADERS})

-target_link_libraries(telemetry_decoder_lib gnss_system_parameters)
+target_link_libraries(telemetry_decoder_lib
+    PUBLIC
+        gnss_system_parameters
+        gnss_rx
+)
+
+set_property(TARGET telemetry_decoder_lib
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  (see AUTHORS file for a list of contributors)
+# Copyright (C) 2012-2019  (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -31,10 +31,6 @@ set(TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS
    fec.h
 )

-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
 list(SORT TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS)
 list(SORT TELEMETRY_DECODER_LIBSWIFTCNAV_SOURCES)

@@ -43,6 +39,11 @@ add_library(telemetry_decoder_libswiftcnav STATIC
    ${TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS}
 )

+set_property(TARGET telemetry_decoder_libswiftcnav
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
+
 source_group(Headers FILES ${TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS})

 set_target_properties(telemetry_decoder_libswiftcnav
--- a/src/algorithms/tracking/adapters/CMakeLists.txt
+++ b/src/algorithms/tracking/adapters/CMakeLists.txt
@@ -88,16 +88,16 @@ set(TRACKING_ADAPTER_HEADERS
 )

 include_directories(
-     ${CMAKE_CURRENT_SOURCE_DIR}
-     ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-     ${CMAKE_SOURCE_DIR}/src/core/interfaces
-     ${CMAKE_SOURCE_DIR}/src/core/receiver
-     ${CMAKE_SOURCE_DIR}/src/algorithms/tracking/gnuradio_blocks
-     ${CMAKE_SOURCE_DIR}/src/algorithms/tracking/libs
-     ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-     ${ARMADILLO_INCLUDE_DIRS}
-     ${GLOG_INCLUDE_DIRS}
-     ${GFlags_INCLUDE_DIRS}
+     #${CMAKE_CURRENT_SOURCE_DIR}
+     #${CMAKE_SOURCE_DIR}/src/core/system_parameters
+     #${CMAKE_SOURCE_DIR}/src/core/interfaces
+     #${CMAKE_SOURCE_DIR}/src/core/receiver
+     #${CMAKE_SOURCE_DIR}/src/algorithms/tracking/gnuradio_blocks
+     #${CMAKE_SOURCE_DIR}/src/algorithms/tracking/libs
+     #${CMAKE_SOURCE_DIR}/src/algorithms/libs
+     #${ARMADILLO_INCLUDE_DIRS}
+     #${GLOG_INCLUDE_DIRS}
+     #${GFlags_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${VOLK_GNSSSDR_INCLUDE_DIRS}
     ${OPT_TRACKING_INCLUDE_DIRS}
@@ -114,7 +114,13 @@ add_library(tracking_adapters
 source_group(Headers FILES ${TRACKING_ADAPTER_HEADERS})

 target_link_libraries(tracking_adapters
-    tracking_gr_blocks
-    gnss_sp_libs
-    gnss_sdr_flags
+    PUBLIC
+        tracking_gr_blocks
+        gnss_sp_libs
+        gnss_sdr_flags
+)
+
+set_property(TARGET tracking_adapters
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
--- a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  (see AUTHORS file for a list of contributors)
+# Copyright (C) 2012-2019  (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -79,26 +79,9 @@ set(TRACKING_GR_BLOCKS_HEADERS
 )

 include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/tracking/libs
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${ARMADILLO_INCLUDE_DIRS}
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${Boost_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${VOLK_GNSSSDR_INCLUDE_DIRS}
    ${OPT_TRACKING_INCLUDES}
-    ${MATIO_INCLUDE_DIRS}
 )

-if(ENABLE_GENERIC_ARCH)
-    add_definitions(-DGENERIC_ARCH=1)
-endif()
-
 list(SORT TRACKING_GR_BLOCKS_HEADERS)
 list(SORT TRACKING_GR_BLOCKS_SOURCES)

@@ -110,27 +93,23 @@ add_library(tracking_gr_blocks
 source_group(Headers FILES ${TRACKING_GR_BLOCKS_HEADERS})

 target_link_libraries(tracking_gr_blocks
-    tracking_lib
-    ${GNURADIO_RUNTIME_LIBRARIES}
-    gnss_sdr_flags gnss_sp_libs
-    ${Boost_LIBRARIES}
-    ${VOLK_GNSSSDR_LIBRARIES}
-    ${MATIO_LIBRARIES}
-    ${OPT_TRACKING_LIBRARIES}
+    PUBLIC
+        Boost::boost
+        tracking_lib
+        Gnuradio::blocks
+        Volkgnsssdr::volkgnsssdr
+        gnss_sdr_flags
+        gnss_sp_libs
+        gnss_rx
+        Matio::matio
+        ${OPT_TRACKING_LIBRARIES}
 )

-if(NOT VOLKGNSSSDR_FOUND)
-    if(MATIO_FOUND)
-        add_dependencies(tracking_gr_blocks volk_gnsssdr_module)
-    else()
-        add_dependencies(tracking_gr_blocks volk_gnsssdr_module
-            matio-${GNSSSDR_MATIO_LOCAL_VERSION}
-        )
-    endif()
-else()
-    if(NOT MATIO_FOUND)
-        add_dependencies(tracking_gr_blocks
-            matio-${GNSSSDR_MATIO_LOCAL_VERSION}
-        )
-    endif()
+if(ENABLE_GENERIC_ARCH)
+    target_compile_definitions(tracking_gr_blocks PUBLIC -DGENERIC_ARCH=1)
 endif()
+
+set_property(TARGET tracking_gr_blocks
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
--- a/src/algorithms/tracking/libs/CMakeLists.txt
+++ b/src/algorithms/tracking/libs/CMakeLists.txt
@@ -67,17 +67,7 @@ if(ENABLE_FPGA)
 endif()

 include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${ARMADILLO_INCLUDE_DIRS}
-    ${VOLK_INCLUDE_DIRS}
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
    ${OPT_TRACKING_INCLUDES}
-    ${VOLK_GNSSSDR_INCLUDE_DIRS}
 )

 if(ENABLE_GENERIC_ARCH)
@@ -96,15 +86,19 @@ 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}
-    ${Boost_LIBRARIES}
-    ${GNURADIO_RUNTIME_LIBRARIES}
+    PUBLIC
+        Armadillo::armadillo
+        Boost::boost
+        Gnuradio::runtime
+        Volkgnsssdr::volkgnsssdr
+        gnss_system_parameters
+        ${OPT_TRACKING_LIBRARIES}
+    PRIVATE
+        Gflags::gflags
+        Glog::glog
 )

-if(VOLKGNSSSDR_FOUND)
-    add_dependencies(tracking_lib glog-${glog_RELEASE})
-else()
-    add_dependencies(tracking_lib glog-${glog_RELEASE} volk_gnsssdr_module)
-endif()
+set_property(TARGET tracking_lib
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)