Merge branch 'improve-design' of https://github.com/carlesfernandez/gnss-sdr into next

CMakeLists.txt

@@ -1121,6 +1121,9 @@ endif()
 # Check that BLAS (Basic Linear Algebra Subprograms) is found in the system
 # See http://www.netlib.org/blas/
 #############################################################################
+if(OS_IS_MACOSX)
+    set(BLA_VENDOR "Apple")
+endif()
 find_library(BLAS blas)
 if(NOT BLAS)
     message(" The BLAS library has not been found.")

README.md

@@ -112,12 +112,12 @@ Once you have installed these packages, you can jump directly to [download the s
 
 #### Arch Linux
 
-If you are using Arch Linux (with base-devel group installed):
+If you are using Arch Linux:
 
 ~~~~~~
-$ pacman -S cmake git boost boost-libs log4cpp libvolk gnuradio gnuradio-osmosdr \
+$ pacman -S gcc make cmake git boost boost-libs log4cpp libvolk gnuradio \
-       blas lapack gflags google-glog openssl pugixml python-mako python-six \
+       gnuradio-osmosdr blas lapack gflags google-glog openssl pugixml \
-       libmatio libpcap gtest
+       python-mako python-six libmatio libpcap gtest
 ~~~~~~
 
 Once you have installed these packages, you can jump directly to [download the source code and build GNSS-SDR](#download-and-build-linux).
@@ -596,7 +596,7 @@ $ pip install six
 $ brew install openssl
 ~~~~~~
 
-In the last step, Homebrew installs OpenSSL but it does not link it into `/usr/local`. Thus, you must manually link it instead:
+In the last step, Homebrew installs OpenSSL but it does not link it to `/usr/local`. Thus, you must manually link it instead:
 
 ~~~~~~
 $ ln -s /usr/local/opt/openssl/include/openssl /usr/local/include

cmake/Modules/FindVOLKGNSSSDR.cmake

@@ -59,7 +59,7 @@ find_package_handle_standard_args(VOLKGNSSSDR DEFAULT_MSG VOLK_GNSSSDR_LIBRARIES
 mark_as_advanced(VOLK_GNSSSDR_LIBRARIES VOLK_GNSSSDR_INCLUDE_DIRS)
 
 
-if(GFLAGS_FOUND AND NOT TARGET Volkgnsssdr::volkgnsssdr)
+if(VOLKGNSSSDR_FOUND AND NOT TARGET Volkgnsssdr::volkgnsssdr)
     add_library(Volkgnsssdr::volkgnsssdr SHARED IMPORTED)
     set_target_properties(Volkgnsssdr::volkgnsssdr PROPERTIES
         IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"

src/algorithms/PVT/adapters/CMakeLists.txt

@@ -36,11 +36,15 @@ target_link_libraries(pvt_adapters
         pvt_gr_blocks
         pvt_lib
         gnss_system_parameters
-        gnss_rx
     PRIVATE
         Boost::serialization
 )
 
+target_include_directories(pvt_adapters
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/core/interfaces
+)
+
 if(Boost_VERSION LESS 105800)
     target_compile_definitions(pvt_adapters PRIVATE -DOLD_BOOST=1)
 endif()

src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt

@@ -33,19 +33,17 @@ target_link_libraries(pvt_gr_blocks
         Boost::date_time
         Gnuradio::runtime
         pvt_lib
-        gnss_system_parameters
-        gnss_rx
     PRIVATE
         Gflags::gflags
         Glog::glog
         Boost::filesystem
         Boost::system
+        gnss_system_parameters
 )
 
 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)

src/algorithms/PVT/libs/CMakeLists.txt

@@ -62,7 +62,6 @@ target_link_libraries(pvt_lib
         gnss_sp_libs
         rtklib_lib
         gnss_system_parameters
-        gnss_rx
     PRIVATE
         Boost::filesystem
         Boost::system
@@ -75,6 +74,7 @@ target_include_directories(pvt_lib
     PUBLIC
         ${CMAKE_SOURCE_DIR}/src/algorithms/libs
         ${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib
+        ${CMAKE_SOURCE_DIR}/src/core/receiver
 )
 
 target_compile_definitions(pvt_lib PRIVATE -DGNSS_SDR_VERSION="${VERSION}")

src/algorithms/PVT/libs/monitor_pvt.h

@@ -28,8 +28,8 @@
  * -------------------------------------------------------------------------
  */
 
-#ifndef MONITOR_PVT_H_
+#ifndef GNSS_SDR_MONITOR_PVT_H_
-#define MONITOR_PVT_H_
+#define GNSS_SDR_MONITOR_PVT_H_
 
 #include <boost/serialization/nvp.hpp>
 #include <cstdint>
@@ -137,4 +137,4 @@ public:
     }
 };
 
-#endif /* MONITOR_PVT_H_ */
+#endif /* GNSS_SDR_MONITOR_PVT_H_ */

src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc

@@ -31,7 +31,6 @@
 
 #include "monitor_pvt_udp_sink.h"
 #include <boost/archive/binary_oarchive.hpp>
-//#include <boost/serialization/vector.hpp>
 #include <iostream>
 #include <sstream>
 

src/algorithms/PVT/libs/monitor_pvt_udp_sink.h

@@ -29,8 +29,8 @@
  * -------------------------------------------------------------------------
  */
 
-#ifndef MONITOR_PVT_UDP_SINK_H_
+#ifndef GNSS_SDR_MONITOR_PVT_UDP_SINK_H_
-#define MONITOR_PVT_UDP_SINK_H_
+#define GNSS_SDR_MONITOR_PVT_UDP_SINK_H_
 
 #include "monitor_pvt.h"
 #include <boost/asio.hpp>
@@ -50,4 +50,4 @@ private:
 };
 
 
-#endif /* MONITOR_PVT_UDP_SINK_H_ */
+#endif /* GNSS_SDR_MONITOR_PVT_UDP_SINK_H_ */

src/algorithms/acquisition/adapters/CMakeLists.txt

@@ -96,7 +96,6 @@ target_link_libraries(acq_adapters
         gnss_sp_libs
         gnss_sdr_flags
         acq_gr_blocks
-        rx_core_lib
         gnss_system_parameters
     PRIVATE
         Boost::boost
@@ -106,6 +105,11 @@ target_link_libraries(acq_adapters
         acquisition_lib
 )
 
+target_include_directories(acq_adapters
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/core/interfaces
+)
+
 set_property(TARGET acq_adapters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>

src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt

@@ -81,15 +81,19 @@ target_link_libraries(acq_gr_blocks
         Matio::matio
         Volkgnsssdr::volkgnsssdr
         gnss_sp_libs
-        gnss_rx
+)
+
+target_include_directories(acq_gr_blocks
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/algorithms/libs
+    PRIVATE
+        ${CMAKE_SOURCE_DIR}/src/core/receiver
 )
 
 if(OPENCL_FOUND)
     target_include_directories(acq_gr_blocks PUBLIC ${OPENCL_INCLUDE_DIRS})
 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}>

src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc

@@ -36,7 +36,6 @@
  */
 
 #include "galileo_e5a_noncoherent_iq_acquisition_caf_cc.h"
-#include "control_message_factory.h"
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>

src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc

@@ -30,7 +30,6 @@
  */
 
 #include "galileo_pcps_8ms_acquisition_cc.h"
-#include "control_message_factory.h"
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>

src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc

@@ -32,7 +32,6 @@
 
 #include "pcps_acquisition_fine_doppler_cc.h"
 #include "GPS_L1_CA.h"
-#include "control_message_factory.h"
 #include "gnss_sdr_create_directory.h"
 #include "gps_sdr_signal_processing.h"
 #include <boost/filesystem/path.hpp>

src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc

@@ -33,7 +33,6 @@
 #include "pcps_assisted_acquisition_cc.h"
 #include "GPS_L1_CA.h"
 #include "concurrent_map.h"
-#include "control_message_factory.h"
 #include "gps_acq_assist.h"
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>

src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc

@@ -36,7 +36,6 @@
 
 #include "pcps_cccwsr_acquisition_cc.h"
 #include "GPS_L1_CA.h"  // GPS_TWO_PI
-#include "control_message_factory.h"
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>

src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc

@@ -50,7 +50,6 @@
 
 #include "pcps_opencl_acquisition_cc.h"
 #include "GPS_L1_CA.h"  //GPS_TWO_PI
-#include "control_message_factory.h"
 #include "opencl/fft_base_kernels.h"
 #include "opencl/fft_internal.h"
 #include <glog/logging.h>

src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc

@@ -30,7 +30,6 @@
 
 #include "pcps_quicksync_acquisition_cc.h"
 #include "GPS_L1_CA.h"
-#include "control_message_factory.h"
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>

src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc

@@ -50,7 +50,6 @@
 
 #include "pcps_tong_acquisition_cc.h"
 #include "GPS_L1_CA.h"  // for GPS_TWO_PI
-#include "control_message_factory.h"
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>

src/algorithms/acquisition/libs/CMakeLists.txt

@@ -43,7 +43,6 @@ target_link_libraries(acquisition_lib
         Glog::glog
         gnss_sp_libs
         gnss_system_parameters
-        gnss_rx
 )
 
 set_property(TARGET acquisition_lib

src/algorithms/channel/adapters/CMakeLists.txt

@@ -30,13 +30,17 @@ target_link_libraries(channel_adapters
     PUBLIC
         Gnuradio::runtime
         channel_fsm
-        gnss_rx
     PRIVATE
         Gflags::gflags
         Glog::glog
         gnss_sdr_flags
 )
 
+target_include_directories(channel_adapters
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/core/interfaces
+)
+
 set_property(TARGET channel_adapters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>

src/algorithms/channel/libs/CMakeLists.txt

@@ -36,10 +36,11 @@ add_library(channel_fsm ${CHANNEL_FSM_SOURCES} ${CHANNEL_FSM_HEADERS})
 target_link_libraries(channel_fsm
     PUBLIC
         Gnuradio::runtime
-        gnss_rx
+        gnss_system_parameters
     PRIVATE
         Gflags::gflags
         Glog::glog
+        gnss_rx
 )
 
 set_property(TARGET channel_fsm

src/algorithms/conditioner/adapters/CMakeLists.txt

@@ -37,12 +37,16 @@ add_library(conditioner_adapters ${COND_ADAPTER_SOURCES} ${COND_ADAPTER_HEADERS}
 target_link_libraries(conditioner_adapters
     PUBLIC
         Gnuradio::runtime
-        gnss_rx
     PRIVATE
         Gflags::gflags
         Glog::glog
 )
 
+target_include_directories(conditioner_adapters
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/core/interfaces
+)
+
 set_property(TARGET conditioner_adapters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>

src/algorithms/data_type_adapter/adapters/CMakeLists.txt

@@ -51,7 +51,6 @@ target_link_libraries(datatype_adapters
         data_type_gr_blocks
         gnss_sp_libs
         gnss_system_parameters
-        gnss_rx
     PRIVATE
         Gflags::gflags
         Glog::glog
@@ -61,6 +60,7 @@ target_link_libraries(datatype_adapters
 target_include_directories(datatype_adapters
     PUBLIC
         ${CMAKE_SOURCE_DIR}/src/algorithms/libs
+        ${CMAKE_SOURCE_DIR}/src/core/interfaces
 )
 
 set_property(TARGET datatype_adapters

src/algorithms/input_filter/adapters/CMakeLists.txt

@@ -50,13 +50,14 @@ target_link_libraries(input_filter_adapters
         Gnuradio::filter
         input_filter_gr_blocks
         gnss_sp_libs
-        gnss_rx
     PRIVATE
         Volk::volk
 )
 
 target_include_directories(input_filter_adapters
-    PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/algorithms/libs
+        ${CMAKE_SOURCE_DIR}/src/core/interfaces
 )
 
 if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")

src/algorithms/libs/CMakeLists.txt

@@ -22,7 +22,6 @@ set(GNSS_SPLIBS_SOURCES
     gps_l2c_signal.cc
     gps_l5_signal.cc
     galileo_e1_signal_processing.cc
-    gnss_sdr_valve.cc
     gnss_sdr_sample_counter.cc
     gnss_signal_processing.cc
     gps_sdr_signal_processing.cc
@@ -41,13 +40,13 @@ set(GNSS_SPLIBS_SOURCES
     conjugate_ic.cc
     gnss_sdr_create_directory.cc
     geofunctions.cc
+    rtcm.cc
 )
 
 set(GNSS_SPLIBS_HEADERS
     gps_l2c_signal.h
     gps_l5_signal.h
     galileo_e1_signal_processing.h
-    gnss_sdr_valve.h
     gnss_sdr_sample_counter.h
     gnss_signal_processing.h
     gps_sdr_signal_processing.h
@@ -67,6 +66,7 @@ set(GNSS_SPLIBS_HEADERS
     gnss_sdr_create_directory.h
     gnss_circular_deque.h
     geofunctions.h
+    rtcm.h
 )
 
 if(ENABLE_FPGA)
@@ -122,7 +122,12 @@ target_link_libraries(gnss_sp_libs
         Boost::filesystem
         Gflags::gflags
         Glog::glog
-        gnss_rx
+)
+
+target_include_directories(gnss_sp_libs
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/core/interfaces
+        ${CMAKE_SOURCE_DIR}/src/core/receiver
 )
 
 target_compile_definitions(gnss_sp_libs

src/algorithms/libs/rtklib/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.
 #
@@ -65,20 +65,14 @@ source_group(Headers FILES ${RTKLIB_LIB_HEADERS})
 
 add_library(rtklib_lib ${RTKLIB_LIB_SOURCES} ${RTKLIB_LIB_HEADERS})
 
-if(OS_IS_MACOSX)
-    set(MAC_LIBRARIES "-framework Accelerate")
-endif()
-
 target_link_libraries(rtklib_lib
     PUBLIC
-        gnss_rx
         gnss_system_parameters
     PRIVATE
         Gflags::gflags
         Glog::glog
         ${BLAS}
         ${LAPACK}
-        ${MAC_LIBRARIES}
 )
 
 set_property(TARGET rtklib_lib

src/algorithms/observables/adapters/CMakeLists.txt

@@ -31,12 +31,12 @@ add_library(obs_adapters ${OBS_ADAPTER_SOURCES} ${OBS_ADAPTER_HEADERS})
 target_include_directories(obs_adapters
     PUBLIC
         ${CMAKE_SOURCE_DIR}/src/algorithms/libs
+        ${CMAKE_SOURCE_DIR}/src/core/interfaces
 )
 
 target_link_libraries(obs_adapters
     PUBLIC
         obs_gr_blocks
-        gnss_rx
         gnss_sp_libs
     PRIVATE
         Gflags::gflags

src/algorithms/resampler/adapters/CMakeLists.txt

@@ -41,13 +41,17 @@ target_link_libraries(resampler_adapters
     PUBLIC
         Gnuradio::runtime
         resampler_gr_blocks
-        gnss_rx
     PRIVATE
         Gflags::gflags
         Glog::glog
         Volk::volk
 )
 
+target_include_directories(resampler_adapters
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/core/interfaces
+)
+
 if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
     target_compile_definitions(resampler_adapters PUBLIC -DGR_GREATER_38=1)
 endif()

src/algorithms/signal_generator/adapters/CMakeLists.txt

@@ -30,13 +30,17 @@ target_link_libraries(signal_generator_adapters
     PUBLIC
         Gnuradio::blocks
         signal_generator_blocks
-        gnss_rx
     PRIVATE
         Gflags::gflags
         Glog::glog
         gnss_sp_libs
 )
 
+target_include_directories(signal_generator_adapters
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/core/interfaces
+)
+
 set_property(TARGET signal_generator_adapters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>

src/algorithms/signal_source/adapters/CMakeLists.txt

@@ -179,7 +179,8 @@ add_library(signal_source_adapters
 )
 
 target_include_directories(signal_source_adapters
-    PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/core/interfaces
 )
 
 target_link_libraries(signal_source_adapters
@@ -189,9 +190,9 @@ target_link_libraries(signal_source_adapters
         Gnuradio::blocks
         signal_source_gr_blocks
         signal_source_lib
-        gnss_sp_libs
-        gnss_rx
     PRIVATE
+        gnss_sdr_flags
+        gnss_system_parameters
         Gflags::gflags
         Glog::glog
         Volk::volk

src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt

@@ -75,6 +75,6 @@ if(ENABLE_RAW_UDP AND PCAP_FOUND)
     )
 endif()
 
-set_property(TARGET signal_source_gr_blocks APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+set_property(TARGET signal_source_gr_blocks APPEND PROPERTY
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    INTERFACE_INCLUDE_DIRECTORIES $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )

src/algorithms/signal_source/libs/CMakeLists.txt

@@ -49,12 +49,14 @@ endif()
 set(SIGNAL_SOURCE_LIB_SOURCES
     rtl_tcp_commands.cc
     rtl_tcp_dongle_info.cc
+    gnss_sdr_valve.cc
     ${OPT_SIGNAL_SOURCE_LIB_SOURCES}
 )
 
 set(SIGNAL_SOURCE_LIB_HEADERS
     rtl_tcp_commands.h
     rtl_tcp_dongle_info.h
+    gnss_sdr_valve.h
     ${OPT_SIGNAL_SOURCE_LIB_HEADERS}
 )
 
@@ -68,9 +70,11 @@ add_library(signal_source_lib ${SIGNAL_SOURCE_LIB_SOURCES} ${SIGNAL_SOURCE_LIB_H
 target_link_libraries(signal_source_lib
     PUBLIC
         Boost::boost
+        Gnuradio::runtime
     PRIVATE
         Gflags::gflags
         Glog::glog
+        gnss_rx
 )
 
 if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2)

src/algorithms/telemetry_decoder/adapters/CMakeLists.txt

@@ -55,7 +55,6 @@ target_link_libraries(telemetry_decoder_adapters
     PUBLIC
         telemetry_decoder_gr_blocks
         gnss_system_parameters
-        gnss_rx
     PRIVATE
         Gflags::gflags
         Glog::glog
@@ -63,6 +62,11 @@ target_link_libraries(telemetry_decoder_adapters
         telemetry_decoder_lib
 )
 
+target_include_directories(telemetry_decoder_adapters
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/core/interfaces
+)
+
 set_property(TARGET telemetry_decoder_adapters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>

src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt

@@ -55,7 +55,6 @@ target_link_libraries(telemetry_decoder_gr_blocks
         telemetry_decoder_libswiftcnav
         telemetry_decoder_lib
         gnss_system_parameters
-        gnss_rx
     PRIVATE
         Boost::boost
         Gflags::gflags

src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.cc

@@ -33,7 +33,6 @@
 
 
 #include "beidou_b1i_telemetry_decoder_cc.h"
-#include "control_message_factory.h"
 #include "convolutional.h"
 #include "display.h"
 #include "gnss_synchro.h"

src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_cc.cc

@@ -30,7 +30,6 @@
 
 
 #include "galileo_telemetry_decoder_cc.h"
-#include "control_message_factory.h"
 #include "convolutional.h"
 #include "display.h"
 #include "gnss_synchro.h"

src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc

@@ -30,7 +30,6 @@
  */
 
 #include "gps_l1_ca_telemetry_decoder_cc.h"
-#include "control_message_factory.h"
 #include <boost/lexical_cast.hpp>
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>

src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc

@@ -29,7 +29,6 @@
  */
 
 #include "sbas_l1_telemetry_decoder_cc.h"
-#include "control_message_factory.h"
 #include "gnss_synchro.h"
 #include <boost/lexical_cast.hpp>
 #include <glog/logging.h>

src/algorithms/telemetry_decoder/libs/CMakeLists.txt

@@ -39,9 +39,6 @@ add_library(telemetry_decoder_lib
 )
 
 target_link_libraries(telemetry_decoder_lib
-    PUBLIC
-        gnss_system_parameters
-        gnss_rx
     PRIVATE
         Gflags::gflags
         Glog::glog

src/algorithms/tracking/adapters/CMakeLists.txt

@@ -100,6 +100,11 @@ target_link_libraries(tracking_adapters
         gnss_sdr_flags
 )
 
+target_include_directories(tracking_adapters
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/core/interfaces
+)
+
 if(ENABLE_CUDA)
     target_link_libraries(tracking_adapters
         PUBLIC

src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt

@@ -88,7 +88,6 @@ target_link_libraries(tracking_gr_blocks
         Volkgnsssdr::volkgnsssdr
         gnss_sdr_flags
         gnss_sp_libs
-        gnss_rx
         tracking_lib
 )
 

src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc

@@ -43,7 +43,6 @@
 #include "Galileo_E5a.h"
 #include "MATH_CONSTANTS.h"
 #include "beidou_b1i_signal_processing.h"
-#include "control_message_factory.h"
 #include "galileo_e1_signal_processing.h"
 #include "galileo_e5_signal_processing.h"
 #include "gnss_sdr_create_directory.h"

src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc

@@ -42,7 +42,6 @@
 #include "Galileo_E1.h"
 #include "Galileo_E5a.h"
 #include "MATH_CONSTANTS.h"
-#include "control_message_factory.h"
 #include "gnss_sdr_create_directory.h"
 #include "gps_l2c_signal.h"
 #include "gps_l5_signal.h"

src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc

@@ -39,7 +39,6 @@
 #include "galileo_e1_tcp_connector_tracking_cc.h"
 #include "GPS_L1_CA.h"
 #include "Galileo_E1.h"
-#include "control_message_factory.h"
 #include "galileo_e1_signal_processing.h"
 #include "gnss_sdr_flags.h"
 #include "lock_detectors.h"

src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc

@@ -38,7 +38,6 @@
 
 #include "glonass_l1_ca_dll_pll_c_aid_tracking_cc.h"
 #include "GLONASS_L1_L2_CA.h"
-#include "control_message_factory.h"
 #include "glonass_l1_signal_processing.h"
 #include "gnss_sdr_flags.h"
 #include "lock_detectors.h"

src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc

@@ -38,7 +38,6 @@
 
 #include "glonass_l1_ca_dll_pll_c_aid_tracking_sc.h"
 #include "GLONASS_L1_L2_CA.h"
-#include "control_message_factory.h"
 #include "glonass_l1_signal_processing.h"
 #include "gnss_sdr_flags.h"
 #include "lock_detectors.h"

src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc

@@ -38,7 +38,6 @@
 
 #include "glonass_l1_ca_dll_pll_tracking_cc.h"
 #include "GLONASS_L1_L2_CA.h"
-#include "control_message_factory.h"
 #include "glonass_l1_signal_processing.h"
 #include "gnss_sdr_flags.h"
 #include "lock_detectors.h"

src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc

@@ -36,7 +36,6 @@
 
 #include "glonass_l2_ca_dll_pll_c_aid_tracking_cc.h"
 #include "GLONASS_L1_L2_CA.h"
-#include "control_message_factory.h"
 #include "glonass_l2_signal_processing.h"
 #include "gnss_sdr_flags.h"
 #include "lock_detectors.h"

src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc

@@ -36,7 +36,6 @@
 
 #include "glonass_l2_ca_dll_pll_c_aid_tracking_sc.h"
 #include "GLONASS_L1_L2_CA.h"
-#include "control_message_factory.h"
 #include "glonass_l2_signal_processing.h"
 #include "gnss_sdr_flags.h"
 #include "lock_detectors.h"

src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc

@@ -38,7 +38,6 @@
 
 #include "glonass_l2_ca_dll_pll_tracking_cc.h"
 #include "GLONASS_L1_L2_CA.h"
-#include "control_message_factory.h"
 #include "glonass_l2_signal_processing.h"
 #include "gnss_sdr_flags.h"
 #include "lock_detectors.h"

src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc

@@ -30,7 +30,6 @@
 
 #include "gps_l1_ca_dll_pll_c_aid_tracking_cc.h"
 #include "GPS_L1_CA.h"
-#include "control_message_factory.h"
 #include "gnss_sdr_flags.h"
 #include "gps_sdr_signal_processing.h"
 #include "lock_detectors.h"

src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.cc

@@ -30,7 +30,6 @@
 
 #include "gps_l1_ca_dll_pll_c_aid_tracking_sc.h"
 #include "GPS_L1_CA.h"
-#include "control_message_factory.h"
 #include "gnss_sdr_flags.h"
 #include "gps_sdr_signal_processing.h"
 #include "lock_detectors.h"

src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.cc

@@ -30,7 +30,6 @@
 
 #include "gps_l1_ca_dll_pll_tracking_gpu_cc.h"
 #include "GPS_L1_CA.h"
-#include "control_message_factory.h"
 #include "gnss_sdr_flags.h"
 #include "gps_sdr_signal_processing.h"
 #include "lock_detectors.h"

src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc

@@ -39,7 +39,6 @@
 
 #include "gps_l1_ca_kf_tracking_cc.h"
 #include "GPS_L1_CA.h"
-#include "control_message_factory.h"
 #include "gnss_sdr_flags.h"
 #include "gps_sdr_signal_processing.h"
 #include "lock_detectors.h"

src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc

@@ -37,7 +37,6 @@
 
 #include "gps_l1_ca_tcp_connector_tracking_cc.h"
 #include "GPS_L1_CA.h"
-#include "control_message_factory.h"
 #include "gnss_sdr_flags.h"
 #include "gps_sdr_signal_processing.h"
 #include "lock_detectors.h"

src/core/libs/supl/CMakeLists.txt

@@ -35,18 +35,25 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_C_FLAGS}")
 
 add_library(supl_library STATIC ${ASN_RRLP_SOURCES} ${ASN_SUPL_SOURCES} ${SUPL_SOURCES})
 
+if(OPENSSL_FOUND)
+    target_compile_definitions(supl_library PUBLIC -DUSE_OPENSSL_FALLBACK=1)
+endif()
+
 target_link_libraries(supl_library
     PUBLIC
         ${GNUTLS_LIBRARIES}
         ${GNUTLS_OPENSSL_LIBRARY}
-        gnss_system_parameters
+)
+
+target_include_directories(supl_library
+    PUBLIC
+        ${GNUTLS_INCLUDE_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl
+        ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp
 )
 
 set_target_properties(supl_library PROPERTIES
     LINKER_LANGUAGE C
     INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl;${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp;${GNUTLS_INCLUDE_DIR}"
 )
-
-if(OPENSSL_FOUND)
-    target_compile_definitions(supl_library PUBLIC -DUSE_OPENSSL_FALLBACK=1)
-endif()

src/core/monitor/gnss_synchro_monitor.h

@@ -34,12 +34,11 @@
 #ifndef GNSS_SDR_GNSS_SYNCHRO_MONITOR_H
 #define GNSS_SDR_GNSS_SYNCHRO_MONITOR_H
 
-
 #include "gnss_synchro_udp_sink.h"
 #include <gnuradio/sync_block.h>
-#include <fstream>
+#include <memory>
 #include <string>
-#include <utility>
+#include <vector>
 
 
 class gnss_synchro_monitor;

src/core/monitor/gnss_synchro_udp_sink.h

@@ -29,16 +29,20 @@
  * -------------------------------------------------------------------------
  */
 
-#ifndef GNSS_SYNCHRO_UDP_SINK_H_
+#ifndef GNSS_SDR_GNSS_SYNCHRO_UDP_SINK_H_
-#define GNSS_SYNCHRO_UDP_SINK_H_
+#define GNSS_SDR_GNSS_SYNCHRO_UDP_SINK_H_
 
 #include "gnss_synchro.h"
 #include <boost/asio.hpp>
+#include <boost/system/error_code.hpp>
+#include <string>
+#include <vector>
+
 
 class Gnss_Synchro_Udp_Sink
 {
 public:
-    Gnss_Synchro_Udp_Sink(std::vector<std::string> addresses, const uint16_t &port);
+    Gnss_Synchro_Udp_Sink(std::vector<std::string> addresses, const uint16_t& port);
     bool write_gnss_synchro(const std::vector<Gnss_Synchro>& stocks);
 
 private:
@@ -50,4 +54,4 @@ private:
 };
 
 
-#endif /* GNSS_SYNCHRO_UDP_SINK_H_ */
+#endif /* GNSS_SDR_GNSS_SYNCHRO_UDP_SINK_H_ */

src/core/receiver/CMakeLists.txt

@@ -142,7 +142,6 @@ target_link_libraries(gnss_rx
         Gnuradio::runtime
         rx_core_lib
         core_monitor_lib
-        gnss_system_parameters
     PRIVATE
         Boost::chrono
         Gflags::gflags

src/core/system_parameters/CMakeLists.txt

@@ -45,7 +45,6 @@ set(SYSTEM_PARAMETERS_SOURCES
     gps_cnav_navigation_message.cc
     gps_cnav_iono.cc
     gps_cnav_utc_model.cc
-    rtcm.cc
     glonass_gnav_ephemeris.cc
     glonass_gnav_almanac.cc
     glonass_gnav_utc_model.cc
@@ -75,7 +74,6 @@ set(SYSTEM_PARAMETERS_HEADERS
     gps_cnav_navigation_message.h
     gps_cnav_iono.h
     gps_cnav_utc_model.h
-    rtcm.h
     glonass_gnav_ephemeris.h
     glonass_gnav_almanac.h
     glonass_gnav_utc_model.h
@@ -115,7 +113,6 @@ target_link_libraries(gnss_system_parameters
         Boost::date_time
         Boost::serialization
         Glog::glog
-        gnss_rx
     PRIVATE
         Gflags::gflags
 )

src/main/CMakeLists.txt

@@ -34,7 +34,7 @@ target_compile_definitions(gnss-sdr PRIVATE -DGNSS_SDR_VERSION="${VERSION}")
 
 # Disable internal logging
 if(NOT ENABLE_LOG)
-    target_compile_definitions(gnss-sdr PRIVATE -DGOOGLE_STRIP_LOG=1)
+    target_compile_definitions(gnss-sdr PUBLIC -DGOOGLE_STRIP_LOG=1)
 endif()
 
 if(ENABLE_CUDA)

src/tests/CMakeLists.txt

@@ -362,9 +362,9 @@ if(ENABLE_UNIT_TESTING)
             Matio::matio
             Volk::volk
             Volkgnsssdr::volkgnsssdr
-            gnss_sp_libs
-            core_monitor_lib
             signal_source_adapters
+            signal_source_gr_blocks
+            signal_source_lib
             datatype_adapters
             input_filter_adapters
             resampler_adapters
@@ -377,10 +377,12 @@ if(ENABLE_UNIT_TESTING)
             signal_generator_adapters
             pvt_adapters
             pvt_lib
+            gnss_sp_libs
+            core_monitor_lib
             signal_processing_testing_lib
             system_testing_lib
-            gnss_system_parameters
             gnss_rx
+            gnss_system_parameters
     )
     if(ENABLE_UNIT_TESTING_EXTRA)
         target_link_libraries(run_tests PUBLIC Gpstk::gpstk)
@@ -435,12 +437,12 @@ if(ENABLE_FPGA)
             Matio::matio
             Volk::volk
             channel_fsm
-            gnss_sp_libs
             datatype_adapters
-            signal_processing_testing_lib
             tracking_adapters
-            gnss_system_parameters
+            signal_processing_testing_lib
+            gnss_sp_libs
             gnss_rx
+            gnss_system_parameters
     )
     install(TARGETS gps_l1_ca_dll_pll_tracking_test_fpga
         RUNTIME DESTINATION bin
@@ -496,7 +498,7 @@ if(ENABLE_SYSTEM_TESTING)
         Gnuradio::runtime GTest::GTest GTest::Main
         Gnuradio::blocks Gnuradio::filter
         Gnuradio::analog gnss_sp_libs
-        gnss_system_parameters gnss_rx
+        gnss_rx gnss_system_parameters
     )
     add_system_test(ttff)
 
@@ -507,7 +509,7 @@ if(ENABLE_SYSTEM_TESTING)
             GTest::GTest GTest::Main Gnuradio::runtime
             Gnuradio::blocks Gnuradio::filter
             Gnuradio::analog Matio::matio Volkgnsssdr::volkgnsssdr
-            gnss_sp_libs gnss_system_parameters gnss_rx
+            gnss_sp_libs gnss_rx gnss_system_parameters
             system_testing_lib signal_processing_testing_lib
         )
         add_system_test(position_test)
@@ -534,107 +536,131 @@ endif()
 set(CMAKE_CTEST_COMMAND ctest -V)
 add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
 
-add_executable(flowgraph_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
+if(NOT ENABLE_PACKAGING)
-    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/gnss_flowgraph_test.cc)
+    add_executable(flowgraph_test
+        ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/gnss_flowgraph_test.cc
+    )
 
-target_link_libraries(flowgraph_test PUBLIC
+    target_link_libraries(flowgraph_test
-    Boost::filesystem
+        PUBLIC
-    Boost::system
+            Boost::filesystem
-    Boost::thread
+            Boost::system
-    Gflags::gflags
+            Boost::thread
-    Glog::glog
+            Gflags::gflags
-    Gnuradio::runtime
+            Glog::glog
-    GTest::GTest
+            Gnuradio::runtime
-    GTest::Main
+            GTest::GTest
-    Volkgnsssdr::volkgnsssdr
+            GTest::Main
-    gnss_sp_libs
+            Volkgnsssdr::volkgnsssdr
-    gnss_rx
+            signal_source_adapters
-    gnss_system_parameters
+            signal_source_gr_blocks
-    signal_source_adapters
+            signal_source_lib
-    signal_source_gr_blocks
+            input_filter_adapters
-    input_filter_adapters
+            channel_adapters
-    channel_adapters
+            gnss_rx
-)
+            gnss_sp_libs
+            gnss_system_parameters
+    )
 
-target_include_directories(flowgraph_test PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
+    target_include_directories(flowgraph_test
+        PUBLIC
+            ${CMAKE_SOURCE_DIR}/src/algorithms/libs
+    )
 
-add_test(flowgraph_test flowgraph_test)
+    add_test(flowgraph_test flowgraph_test)
+
+    set_property(TEST flowgraph_test PROPERTY TIMEOUT 30)
+endif()
 
-set_property(TEST flowgraph_test PROPERTY TIMEOUT 30)
 
 #########################################################
+if(NOT ENABLE_PACKAGING)
+    add_executable(gnss_block_test
+        ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/sources/file_signal_source_test.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/pulse_blanking_filter_test.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/notch_filter_test.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/notch_filter_lite_test.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/adapter/pass_through_test.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/adapter/adapter_test.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/gnss_block_factory_test.cc
+    )
 
-add_executable(gnss_block_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
+    target_link_libraries(gnss_block_test
-    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/sources/file_signal_source_test.cc
+        PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc
+            Boost::filesystem
-    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/pulse_blanking_filter_test.cc
+            Boost::system
-    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/notch_filter_test.cc
+            Boost::thread
-    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/notch_filter_lite_test.cc
+            Gflags::gflags
-    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/adapter/pass_through_test.cc
+            Glog::glog
-    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/adapter/adapter_test.cc
+            Gnuradio::runtime
-    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/gnss_block_factory_test.cc
+            Gnuradio::blocks
-)
+            Gnuradio::filter
-target_link_libraries(gnss_block_test PUBLIC
+            Gnuradio::analog
-    Boost::filesystem
+            GTest::GTest
-    Boost::system
+            GTest::Main
-    Boost::thread
+            Volkgnsssdr::volkgnsssdr
-    Gflags::gflags
+            signal_source_adapters
-    Glog::glog
+            signal_source_gr_blocks
-    Gnuradio::runtime
+            signal_source_lib
-    Gnuradio::blocks
+            datatype_adapters
-    Gnuradio::filter
+            input_filter_adapters
-    Gnuradio::analog
+            channel_adapters
-    GTest::GTest
+            gnss_rx
-    GTest::Main
+            gnss_sp_libs
-    Volkgnsssdr::volkgnsssdr
+            gnss_system_parameters
-    signal_source_adapters
+    )
-    datatype_adapters
-    input_filter_adapters
-    channel_adapters
-    gnss_sp_libs
-    gnss_system_parameters
-    gnss_rx
-)
 
-target_include_directories(gnss_block_test PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
+    target_include_directories(gnss_block_test PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
 
-add_test(gnss_block_test gnss_block_test)
+    add_test(gnss_block_test gnss_block_test)
+
+    set_property(TEST gnss_block_test PROPERTY TIMEOUT 60)
+endif()
 
-set_property(TEST gnss_block_test PROPERTY TIMEOUT 60)
 
 #########################################################
+if(NOT ENABLE_PACKAGING)
+    add_executable(gnuradio_block_test
+        ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/sources/unpack_2bit_samples_test.cc
+    )
 
-add_executable(gnuradio_block_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
+    target_link_libraries(gnuradio_block_test
-    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/sources/unpack_2bit_samples_test.cc
+        PUBLIC
-)
+            Boost::filesystem
-target_link_libraries(gnuradio_block_test PUBLIC
+            Boost::system
-    Boost::filesystem
+            Boost::thread
-    Boost::system
+            Gflags::gflags
-    Boost::thread
+            Glog::glog
-    Gflags::gflags
+            Gnuradio::runtime
-    Glog::glog
+            Gnuradio::blocks
-    Gnuradio::runtime
+            Gnuradio::filter
-    Gnuradio::blocks
+            Gnuradio::analog
-    Gnuradio::filter
+            GTest::GTest
-    Gnuradio::analog
+            GTest::Main
-    GTest::GTest
+            Volkgnsssdr::volkgnsssdr
-    GTest::Main
+            signal_source_gr_blocks
-    Volkgnsssdr::volkgnsssdr
+            signal_source_lib
-    gnss_sp_libs
+            gnss_rx
-    signal_source_gr_blocks
+            gnss_sp_libs
-    gnss_system_parameters
+            gnss_system_parameters
-    gnss_rx
+    )
-)
 
-add_test(gnuradio_block_test gnuradio_block_test)
+    add_test(gnuradio_block_test gnuradio_block_test)
+
+    set_property(TEST gnuradio_block_test PROPERTY TIMEOUT 30)
+endif()
 
-set_property(TEST gnuradio_block_test PROPERTY TIMEOUT 30)
 
 #########################################################
-
+add_executable(matio_test
-add_executable(matio_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/arithmetic/matio_test.cc
 )
+
 target_link_libraries(matio_test
     PUBLIC
         Gflags::gflags
@@ -642,100 +668,115 @@ target_link_libraries(matio_test
         GTest::GTest
         GTest::Main
         Matio::matio
-        gnss_system_parameters
         gnss_rx
+        gnss_system_parameters
 )
 
 add_test(matio_test matio_test)
 
 set_property(TEST matio_test PROPERTY TIMEOUT 30)
 
-#########################################################
-
-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)
-target_link_libraries(acq_test
-    PUBLIC
-        Boost::filesystem
-        Boost::system
-        Boost::thread
-        Gflags::gflags
-        Glog::glog
-        Gnuradio::runtime
-        Gnuradio::blocks
-        Gnuradio::filter
-        Gnuradio::analog
-        GTest::GTest
-        GTest::Main
-        Volkgnsssdr::volkgnsssdr
-        signal_generator_blocks
-        acq_adapters
-        acq_gr_blocks
-        gnss_sp_libs
-        signal_processing_testing_lib
-        gnss_system_parameters
-        gnss_rx
-)
-
-add_test(acq_test acq_test)
-
-set_property(TEST acq_test PROPERTY TIMEOUT 30)
 
 #########################################################
+if(NOT ENABLE_PACKAGING)
+    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
+    )
 
-add_executable(trk_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
+    target_link_libraries(acq_test
-    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc
+        PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/tracking_loop_filter_test.cc
+            Boost::filesystem
-    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_real_codes_test.cc
+            Boost::system
-    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/bayesian_estimation_test.cc
+            Boost::thread
-)
+            Gflags::gflags
+            Glog::glog
+            Gnuradio::runtime
+            Gnuradio::blocks
+            Gnuradio::filter
+            Gnuradio::analog
+            GTest::GTest
+            GTest::Main
+            Volkgnsssdr::volkgnsssdr
+            signal_generator_blocks
+            signal_source_gr_blocks
+            signal_source_lib
+            acq_adapters
+            acq_gr_blocks
+            gnss_sp_libs
+            signal_processing_testing_lib
+            gnss_rx
+            gnss_system_parameters
+    )
 
-target_link_libraries(trk_test
+    add_test(acq_test acq_test)
-    PUBLIC
-        Boost::filesystem
-        Boost::system
-        Boost::thread
-        Gflags::gflags
-        Glog::glog
-        Gnuradio::runtime
-        Gnuradio::blocks
-        Gnuradio::filter
-        Gnuradio::analog
-        GTest::GTest
-        GTest::Main
-        Volkgnsssdr::volkgnsssdr
-        gnss_sp_libs
-        tracking_adapters
-        signal_generator_blocks
-        gnss_system_parameters
-        gnss_rx
-)
-add_test(trk_test trk_test)
 
-set_property(TEST trk_test PROPERTY TIMEOUT 30)
+    set_property(TEST acq_test PROPERTY TIMEOUT 30)
+endif()
 
 
+#########################################################
+if(NOT ENABLE_PACKAGING)
+    add_executable(trk_test
+        ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/tracking_loop_filter_test.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_real_codes_test.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/bayesian_estimation_test.cc
+    )
+
+    target_link_libraries(trk_test
+        PUBLIC
+            Boost::filesystem
+            Boost::system
+            Boost::thread
+            Gflags::gflags
+            Glog::glog
+            Gnuradio::runtime
+            Gnuradio::blocks
+            Gnuradio::filter
+            Gnuradio::analog
+            GTest::GTest
+            GTest::Main
+            Volkgnsssdr::volkgnsssdr
+            signal_source_gr_blocks
+            signal_source_lib
+            gnss_sp_libs
+            tracking_adapters
+            signal_generator_blocks
+            gnss_rx
+            gnss_system_parameters
+    )
+
+    add_test(trk_test trk_test)
+
+    set_property(TEST trk_test PROPERTY TIMEOUT 30)
+endif()
+
 #########################################################
 
 if(NOT ENABLE_PACKAGING)
-    add_executable(control_thread_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
+    add_executable(control_thread_test
+        ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
         ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/control_message_factory_test.cc
         ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/control_thread_test.cc
     )
 
-    target_link_libraries(control_thread_test PUBLIC
+    target_link_libraries(control_thread_test
-        Boost::filesystem
+        PUBLIC
-        Boost::system
+            Boost::filesystem
-        Boost::thread
+            Boost::system
-        Gflags::gflags
+            Boost::thread
-        Glog::glog
+            Gflags::gflags
-        GTest::GTest
+            Glog::glog
-        GTest::Main
+            GTest::GTest
-        signal_source_adapters
+            GTest::Main
-        gnss_sp_libs
+            signal_source_adapters
-        gnss_system_parameters
+            signal_source_gr_blocks
-        gnss_rx
+            signal_source_lib
+            gnss_sp_libs
+            gnss_rx
+            gnss_system_parameters
     )
 
     add_test(control_thread_test control_thread_test)