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

src/algorithms/PVT/adapters/CMakeLists.txt

@@ -34,8 +34,8 @@ target_link_libraries(pvt_adapters
         Armadillo::armadillo
         Gnuradio::runtime
         pvt_gr_blocks
-        pvt_lib
+        pvt_libs
-        gnss_system_parameters
+        core_system_parameters
     PRIVATE
         Boost::serialization
 )

src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt

@@ -32,13 +32,13 @@ target_link_libraries(pvt_gr_blocks
     PUBLIC
         Boost::date_time
         Gnuradio::runtime
-        pvt_lib
+        pvt_libs
     PRIVATE
         Gflags::gflags
         Glog::glog
         Boost::filesystem
         Boost::system
-        gnss_system_parameters
+        core_system_parameters
 )
 
 target_include_directories(pvt_gr_blocks

src/algorithms/PVT/libs/CMakeLists.txt

@@ -53,15 +53,15 @@ list(SORT PVT_LIB_SOURCES)
 
 source_group(Headers FILES ${PVT_LIB_HEADERS})
 
-add_library(pvt_lib ${PVT_LIB_SOURCES} ${PVT_LIB_HEADERS})
+add_library(pvt_libs ${PVT_LIB_SOURCES} ${PVT_LIB_HEADERS})
 
-target_link_libraries(pvt_lib
+target_link_libraries(pvt_libs
     PUBLIC
         Armadillo::armadillo
         Boost::date_time
-        gnss_sp_libs
+        algorithms_libs
-        rtklib_lib
+        algorithms_libs_rtklib
-        gnss_system_parameters
+        core_system_parameters
     PRIVATE
         Boost::filesystem
         Boost::system
@@ -70,16 +70,16 @@ target_link_libraries(pvt_lib
         Matio::matio
 )
 
-target_include_directories(pvt_lib
+target_include_directories(pvt_libs
     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}")
+target_compile_definitions(pvt_libs PRIVATE -DGNSS_SDR_VERSION="${VERSION}")
 
-set_property(TARGET pvt_lib APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+set_property(TARGET pvt_libs 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>

src/algorithms/acquisition/adapters/CMakeLists.txt

@@ -88,29 +88,29 @@ list(SORT ACQ_ADAPTER_SOURCES)
 
 source_group(Headers FILES ${ACQ_ADAPTER_HEADERS})
 
-add_library(acq_adapters ${ACQ_ADAPTER_SOURCES} ${ACQ_ADAPTER_HEADERS})
+add_library(acquisition_adapters ${ACQ_ADAPTER_SOURCES} ${ACQ_ADAPTER_HEADERS})
 
-target_link_libraries(acq_adapters
+target_link_libraries(acquisition_adapters
     PUBLIC
         Gnuradio::blocks
-        gnss_sp_libs
+        algorithms_libs
         gnss_sdr_flags
-        acq_gr_blocks
+        acquisition_gr_blocks
-        gnss_system_parameters
+        core_system_parameters
     PRIVATE
         Boost::boost
         Gflags::gflags
         Glog::glog
         Volkgnsssdr::volkgnsssdr
-        acquisition_lib
+        acquisition_libs
 )
 
-target_include_directories(acq_adapters
+target_include_directories(acquisition_adapters
     PUBLIC
         ${CMAKE_SOURCE_DIR}/src/core/interfaces
 )
 
-set_property(TARGET acq_adapters
+set_property(TARGET acquisition_adapters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )

src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt

@@ -64,15 +64,15 @@ list(SORT ACQ_GR_BLOCKS_SOURCES)
 
 source_group(Headers FILES ${ACQ_GR_BLOCKS_HEADERS})
 
-add_library(acq_gr_blocks ${ACQ_GR_BLOCKS_SOURCES} ${ACQ_GR_BLOCKS_HEADERS})
+add_library(acquisition_gr_blocks ${ACQ_GR_BLOCKS_SOURCES} ${ACQ_GR_BLOCKS_HEADERS})
 
-target_link_libraries(acq_gr_blocks
+target_link_libraries(acquisition_gr_blocks
     PUBLIC
         Gnuradio::runtime
         Gnuradio::fft
         Volk::volk
-        acquisition_lib
+        acquisition_libs
-        gnss_system_parameters
+        core_system_parameters
         ${OPT_LIBRARIES}
     PRIVATE
         Boost::filesystem
@@ -80,10 +80,10 @@ target_link_libraries(acq_gr_blocks
         Glog::glog
         Matio::matio
         Volkgnsssdr::volkgnsssdr
-        gnss_sp_libs
+        algorithms_libs
 )
 
-target_include_directories(acq_gr_blocks
+target_include_directories(acquisition_gr_blocks
     PUBLIC
         ${CMAKE_SOURCE_DIR}/src/algorithms/libs
     PRIVATE
@@ -91,10 +91,10 @@ target_include_directories(acq_gr_blocks
 )
 
 if(OPENCL_FOUND)
-    target_include_directories(acq_gr_blocks PUBLIC ${OPENCL_INCLUDE_DIRS})
+    target_include_directories(acquisition_gr_blocks PUBLIC ${OPENCL_INCLUDE_DIRS})
 endif()
 
-set_property(TARGET acq_gr_blocks
+set_property(TARGET acquisition_gr_blocks
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )

src/algorithms/acquisition/libs/CMakeLists.txt

@@ -29,23 +29,23 @@ list(SORT ACQUISITION_LIB_SOURCES)
 
 source_group(Headers FILES ${ACQUISITION_LIB_HEADERS})
 
-add_library(acquisition_lib
+add_library(acquisition_libs
     ${ACQUISITION_LIB_SOURCES}
     ${ACQUISITION_LIB_HEADERS}
 )
 
-target_link_libraries(acquisition_lib
+target_link_libraries(acquisition_libs
     PUBLIC
         Volk::volk
         Gnuradio::fft
     PRIVATE
         Gflags::gflags
         Glog::glog
-        gnss_sp_libs
+        algorithms_libs
-        gnss_system_parameters
+        core_system_parameters
 )
 
-set_property(TARGET acquisition_lib
+set_property(TARGET acquisition_libs
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )

src/algorithms/channel/adapters/CMakeLists.txt

@@ -29,7 +29,7 @@ source_group(Headers FILES ${CHANNEL_ADAPTER_HEADERS})
 target_link_libraries(channel_adapters
     PUBLIC
         Gnuradio::runtime
-        channel_fsm
+        channel_libs
     PRIVATE
         Gflags::gflags
         Glog::glog

src/algorithms/channel/libs/CMakeLists.txt

@@ -31,19 +31,19 @@ list(SORT CHANNEL_FSM_SOURCES)
 
 source_group(Headers FILES ${CHANNEL_FSM_HEADERS})
 
-add_library(channel_fsm ${CHANNEL_FSM_SOURCES} ${CHANNEL_FSM_HEADERS})
+add_library(channel_libs ${CHANNEL_FSM_SOURCES} ${CHANNEL_FSM_HEADERS})
 
-target_link_libraries(channel_fsm
+target_link_libraries(channel_libs
     PUBLIC
         Gnuradio::runtime
-        gnss_system_parameters
+        core_system_parameters
     PRIVATE
         Gflags::gflags
         Glog::glog
-        gnss_rx
+        core_receiver
 )
 
-set_property(TARGET channel_fsm
+set_property(TARGET channel_libs
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )

src/algorithms/data_type_adapter/adapters/CMakeLists.txt

@@ -40,30 +40,30 @@ list(SORT DATATYPE_ADAPTER_SOURCES)
 
 source_group(Headers FILES ${DATATYPE_ADAPTER_HEADERS})
 
-add_library(datatype_adapters
+add_library(data_type_adapters
     ${DATATYPE_ADAPTER_SOURCES}
     ${DATATYPE_ADAPTER_HEADERS}
 )
 
-target_link_libraries(datatype_adapters
+target_link_libraries(data_type_adapters
     PUBLIC
         Gnuradio::blocks
         data_type_gr_blocks
-        gnss_sp_libs
+        algorithms_libs
-        gnss_system_parameters
+        core_system_parameters
     PRIVATE
         Gflags::gflags
         Glog::glog
         Volk::volk
 )
 
-target_include_directories(datatype_adapters
+target_include_directories(data_type_adapters
     PUBLIC
         ${CMAKE_SOURCE_DIR}/src/algorithms/libs
         ${CMAKE_SOURCE_DIR}/src/core/interfaces
 )
 
-set_property(TARGET datatype_adapters
+set_property(TARGET data_type_adapters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )

src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt

@@ -43,7 +43,7 @@ target_link_libraries(data_type_gr_blocks
     PUBLIC
         Gnuradio::runtime
         Boost::boost
-        gnss_sp_libs
+        algorithms_libs
     PRIVATE
         Volk::volk
 )

src/algorithms/input_filter/adapters/CMakeLists.txt

@@ -49,7 +49,7 @@ target_link_libraries(input_filter_adapters
         Gnuradio::blocks
         Gnuradio::filter
         input_filter_gr_blocks
-        gnss_sp_libs
+        algorithms_libs
     PRIVATE
         Volk::volk
 )

src/algorithms/libs/CMakeLists.txt

@@ -105,9 +105,9 @@ list(SORT GNSS_SPLIBS_SOURCES)
 
 source_group(Headers FILES ${GNSS_SPLIBS_HEADERS})
 
-add_library(gnss_sp_libs ${GNSS_SPLIBS_SOURCES} ${GNSS_SPLIBS_HEADERS})
+add_library(algorithms_libs ${GNSS_SPLIBS_SOURCES} ${GNSS_SPLIBS_HEADERS})
 
-target_link_libraries(gnss_sp_libs
+target_link_libraries(algorithms_libs
     PUBLIC
         Armadillo::armadillo
         Boost::boost
@@ -116,7 +116,7 @@ target_link_libraries(gnss_sp_libs
         Gnuradio::blocks
         Volk::volk ${ORC_LIBRARIES}
         Volkgnsssdr::volkgnsssdr
-        gnss_system_parameters
+        core_system_parameters
         ${OPT_LIBRARIES}
     PRIVATE
         Boost::filesystem
@@ -124,17 +124,17 @@ target_link_libraries(gnss_sp_libs
         Glog::glog
 )
 
-target_include_directories(gnss_sp_libs
+target_include_directories(algorithms_libs
     PUBLIC
         ${CMAKE_SOURCE_DIR}/src/core/interfaces
         ${CMAKE_SOURCE_DIR}/src/core/receiver
 )
 
-target_compile_definitions(gnss_sp_libs
+target_compile_definitions(algorithms_libs
     PUBLIC -DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}"
 )
 
-set_property(TARGET gnss_sp_libs
+set_property(TARGET algorithms_libs
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )

src/algorithms/libs/rtklib/CMakeLists.txt

@@ -63,11 +63,11 @@ list(SORT RTKLIB_LIB_SOURCES)
 
 source_group(Headers FILES ${RTKLIB_LIB_HEADERS})
 
-add_library(rtklib_lib ${RTKLIB_LIB_SOURCES} ${RTKLIB_LIB_HEADERS})
+add_library(algorithms_libs_rtklib ${RTKLIB_LIB_SOURCES} ${RTKLIB_LIB_HEADERS})
 
-target_link_libraries(rtklib_lib
+target_link_libraries(algorithms_libs_rtklib
     PUBLIC
-        gnss_system_parameters
+        core_system_parameters
     PRIVATE
         Gflags::gflags
         Glog::glog
@@ -75,7 +75,7 @@ target_link_libraries(rtklib_lib
         ${LAPACK}
 )
 
-set_property(TARGET rtklib_lib
+set_property(TARGET algorithms_libs_rtklib
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/CMakeLists.txt

@@ -35,4 +35,4 @@ VOLK_PYTHON_INSTALL(
     volk_gnsssdr_modtool
     DESTINATION ${VOLK_RUNTIME_DIR}
     COMPONENT "volk_gnsssdr"
-)
+)

src/algorithms/observables/adapters/CMakeLists.txt

@@ -37,7 +37,7 @@ target_include_directories(obs_adapters
 target_link_libraries(obs_adapters
     PUBLIC
         obs_gr_blocks
-        gnss_sp_libs
+        algorithms_libs
     PRIVATE
         Gflags::gflags
         Glog::glog

src/algorithms/observables/gnuradio_blocks/CMakeLists.txt

@@ -37,13 +37,13 @@ target_link_libraries(obs_gr_blocks
     PUBLIC
         Boost::boost
         Gnuradio::blocks
-        gnss_system_parameters
+        core_system_parameters
     PRIVATE
         Gflags::gflags
         Glog::glog
         Boost::filesystem
         Matio::matio
-        gnss_sp_libs
+        algorithms_libs
 )
 
 set_property(TARGET obs_gr_blocks

src/algorithms/signal_generator/adapters/CMakeLists.txt

@@ -33,7 +33,7 @@ target_link_libraries(signal_generator_adapters
     PRIVATE
         Gflags::gflags
         Glog::glog
-        gnss_sp_libs
+        algorithms_libs
 )
 
 target_include_directories(signal_generator_adapters

src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt

@@ -30,10 +30,10 @@ target_link_libraries(signal_generator_blocks
     PUBLIC
         Boost::boost
         Gnuradio::runtime
-        gnss_system_parameters
+        core_system_parameters
     PRIVATE
         Volkgnsssdr::volkgnsssdr
-        gnss_sp_libs
+        algorithms_libs
 )
 
 target_include_directories(signal_generator_blocks

src/algorithms/signal_source/adapters/CMakeLists.txt

@@ -189,10 +189,10 @@ target_link_libraries(signal_source_adapters
         Gnuradio::runtime
         Gnuradio::blocks
         signal_source_gr_blocks
-        signal_source_lib
+        signal_source_libs
     PRIVATE
         gnss_sdr_flags
-        gnss_system_parameters
+        core_system_parameters
         Gflags::gflags
         Glog::glog
         Volk::volk

src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt

@@ -62,7 +62,7 @@ target_link_libraries(signal_source_gr_blocks
     PUBLIC
         Boost::thread
         Gnuradio::runtime
-        signal_source_lib
+        signal_source_libs
     PRIVATE
         Gflags::gflags
         Glog::glog

src/algorithms/signal_source/libs/CMakeLists.txt

@@ -65,20 +65,20 @@ list(SORT SIGNAL_SOURCE_LIB_SOURCES)
 
 source_group(Headers FILES ${SIGNAL_SOURCE_LIB_HEADERS})
 
-add_library(signal_source_lib ${SIGNAL_SOURCE_LIB_SOURCES} ${SIGNAL_SOURCE_LIB_HEADERS})
+add_library(signal_source_libs ${SIGNAL_SOURCE_LIB_SOURCES} ${SIGNAL_SOURCE_LIB_HEADERS})
 
-target_link_libraries(signal_source_lib
+target_link_libraries(signal_source_libs
     PUBLIC
         Boost::boost
         Gnuradio::runtime
     PRIVATE
         Gflags::gflags
         Glog::glog
-        gnss_rx
+        core_receiver
 )
 
 if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2)
-    target_link_libraries(signal_source_lib
+    target_link_libraries(signal_source_libs
         PUBLIC
             Gnuradio::iio
         PRIVATE
@@ -87,12 +87,12 @@ if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2)
 endif()
 
 if(ENABLE_FMCOMMS2 OR ENABLE_AD9361)
-    target_link_libraries(signal_source_lib
+    target_link_libraries(signal_source_libs
         PUBLIC
             Iio::iio
     )
 endif()
 
-set_property(TARGET signal_source_lib APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+set_property(TARGET signal_source_libs APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )

src/algorithms/telemetry_decoder/adapters/CMakeLists.txt

@@ -54,12 +54,12 @@ add_library(telemetry_decoder_adapters
 target_link_libraries(telemetry_decoder_adapters
     PUBLIC
         telemetry_decoder_gr_blocks
-        gnss_system_parameters
+        core_system_parameters
     PRIVATE
         Gflags::gflags
         Glog::glog
         Gnuradio::runtime
-        telemetry_decoder_lib
+        telemetry_decoder_libs
 )
 
 target_include_directories(telemetry_decoder_adapters

src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt

@@ -53,8 +53,8 @@ target_link_libraries(telemetry_decoder_gr_blocks
         Gnuradio::runtime
         Volkgnsssdr::volkgnsssdr
         telemetry_decoder_libswiftcnav
-        telemetry_decoder_lib
+        telemetry_decoder_libs
-        gnss_system_parameters
+        core_system_parameters
     PRIVATE
         Boost::boost
         Gflags::gflags

src/algorithms/telemetry_decoder/libs/CMakeLists.txt

@@ -33,18 +33,18 @@ list(SORT TELEMETRY_DECODER_LIB_SOURCES)
 
 source_group(Headers FILES ${TELEMETRY_DECODER_LIB_HEADERS})
 
-add_library(telemetry_decoder_lib
+add_library(telemetry_decoder_libs
     ${TELEMETRY_DECODER_LIB_SOURCES}
     ${TELEMETRY_DECODER_LIB_HEADERS}
 )
 
-target_link_libraries(telemetry_decoder_lib
+target_link_libraries(telemetry_decoder_libs
     PRIVATE
         Gflags::gflags
         Glog::glog
 )
 
-set_property(TARGET telemetry_decoder_lib
+set_property(TARGET telemetry_decoder_libs
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )

src/algorithms/tracking/CMakeLists.txt

@@ -18,4 +18,4 @@
 
 add_subdirectory(adapters)
 add_subdirectory(gnuradio_blocks)
-add_subdirectory(libs)
+add_subdirectory(libs)

src/algorithms/tracking/adapters/CMakeLists.txt

@@ -96,7 +96,7 @@ add_library(tracking_adapters
 target_link_libraries(tracking_adapters
     PUBLIC
         tracking_gr_blocks
-        gnss_sp_libs
+        algorithms_libs
         gnss_sdr_flags
 )
 

src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt

@@ -87,8 +87,8 @@ target_link_libraries(tracking_gr_blocks
         Matio::matio
         Volkgnsssdr::volkgnsssdr
         gnss_sdr_flags
-        gnss_sp_libs
+        algorithms_libs
-        tracking_lib
+        tracking_libs
 )
 
 if(ENABLE_CUDA)

src/algorithms/tracking/libs/CMakeLists.txt

@@ -71,27 +71,27 @@ list(SORT TRACKING_LIB_SOURCES)
 
 source_group(Headers FILES ${TRACKING_LIB_HEADERS})
 
-add_library(tracking_lib ${TRACKING_LIB_SOURCES} ${TRACKING_LIB_HEADERS})
+add_library(tracking_libs ${TRACKING_LIB_SOURCES} ${TRACKING_LIB_HEADERS})
 
-target_link_libraries(tracking_lib
+target_link_libraries(tracking_libs
     PUBLIC
         Armadillo::armadillo
         Boost::boost
         Gnuradio::runtime
         Volkgnsssdr::volkgnsssdr
-        gnss_system_parameters
+        core_system_parameters
         ${OPT_TRACKING_LIBRARIES}
     PRIVATE
         Gflags::gflags
         Glog::glog
 )
 
-target_include_directories(tracking_lib
+target_include_directories(tracking_libs
     PUBLIC
         ${OPT_TRACKING_INCLUDES}
 )
 
-set_property(TARGET tracking_lib
+set_property(TARGET tracking_libs
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )

src/core/libs/CMakeLists.txt

@@ -37,13 +37,13 @@ list(SORT CORE_LIBS_SOURCES)
 
 source_group(Headers FILES ${CORE_LIBS_HEADERS})
 
-add_library(rx_core_lib ${CORE_LIBS_SOURCES} ${CORE_LIBS_HEADERS})
+add_library(core_libs ${CORE_LIBS_SOURCES} ${CORE_LIBS_HEADERS})
 
-target_link_libraries(rx_core_lib
+target_link_libraries(core_libs
     PUBLIC
         Boost::boost
-        supl_library
+        core_libs_supl
-        gnss_system_parameters
+        core_system_parameters
     PRIVATE
         Boost::serialization
         Gflags::gflags
@@ -51,7 +51,7 @@ target_link_libraries(rx_core_lib
         Pugixml::pugixml
 )
 
-set_property(TARGET rx_core_lib
+set_property(TARGET core_libs
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
         $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/core/interfaces>

src/core/libs/supl/CMakeLists.txt

@@ -33,19 +33,19 @@ endif()
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_C_FLAGS}")
 
-add_library(supl_library STATIC ${ASN_RRLP_SOURCES} ${ASN_SUPL_SOURCES} ${SUPL_SOURCES})
+add_library(core_libs_supl STATIC ${ASN_RRLP_SOURCES} ${ASN_SUPL_SOURCES} ${SUPL_SOURCES})
 
 if(OPENSSL_FOUND)
-    target_compile_definitions(supl_library PUBLIC -DUSE_OPENSSL_FALLBACK=1)
+    target_compile_definitions(core_libs_supl PUBLIC -DUSE_OPENSSL_FALLBACK=1)
 endif()
 
-target_link_libraries(supl_library
+target_link_libraries(core_libs_supl
     PUBLIC
         ${GNUTLS_LIBRARIES}
         ${GNUTLS_OPENSSL_LIBRARY}
 )
 
-target_include_directories(supl_library
+target_include_directories(core_libs_supl
     PUBLIC
         ${GNUTLS_INCLUDE_DIR}
         ${CMAKE_CURRENT_SOURCE_DIR}
@@ -53,7 +53,7 @@ target_include_directories(supl_library
         ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp
 )
 
-set_target_properties(supl_library PROPERTIES
+set_target_properties(core_libs_supl 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}"
 )

src/core/monitor/CMakeLists.txt

@@ -32,24 +32,24 @@ list(SORT CORE_MONITOR_LIBS_SOURCES)
 
 source_group(Headers FILES ${CORE_MONITOR_LIBS_HEADERS})
 
-add_library(core_monitor_lib
+add_library(core_monitor
     ${CORE_MONITOR_LIBS_SOURCES}
     ${CORE_MONITOR_LIBS_HEADERS}
 )
 
-target_link_libraries(core_monitor_lib
+target_link_libraries(core_monitor
     PUBLIC
         Boost::serialization
         Boost::system
         Gnuradio::runtime
-        gnss_system_parameters
+        core_system_parameters
     PRIVATE
         Gflags::gflags
         Glog::glog
         Gnuradio::pmt
 )
 
-set_property(TARGET core_monitor_lib
+set_property(TARGET core_monitor
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )

src/core/receiver/CMakeLists.txt

@@ -66,92 +66,92 @@ source_group(Headers FILES ${GNSS_RECEIVER_HEADERS}
     ${GNSS_RECEIVER_INTERFACE_HEADERS}
 )
 
-add_library(gnss_rx
+add_library(core_receiver
     ${GNSS_RECEIVER_SOURCES}
     ${GNSS_RECEIVER_HEADERS}
     ${GNSS_RECEIVER_INTERFACE_HEADERS}
 )
 
 if(ENABLE_FPGA)
-    target_compile_definitions(gnss_rx PUBLIC -DENABLE_FPGA=1)
+    target_compile_definitions(core_receiver PUBLIC -DENABLE_FPGA=1)
 endif()
 
 if(ENABLE_RAW_UDP)
-    target_compile_definitions(gnss_rx PRIVATE -DRAW_UDP=1)
+    target_compile_definitions(core_receiver PRIVATE -DRAW_UDP=1)
 endif()
 
 if(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.3)
-    target_compile_definitions(gnss_rx PRIVATE -DMODERN_GNURADIO=1)
+    target_compile_definitions(core_receiver PRIVATE -DMODERN_GNURADIO=1)
 endif()
 
 if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
-    target_compile_definitions(gnss_rx PRIVATE -DGR_GREATER_38=1)
+    target_compile_definitions(core_receiver PRIVATE -DGR_GREATER_38=1)
 endif()
 
 if(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd)
-    target_compile_definitions(gnss_rx PRIVATE -DUHD_DRIVER=1)
+    target_compile_definitions(core_receiver PRIVATE -DUHD_DRIVER=1)
 endif()
 
 if(ENABLE_PLUTOSDR)
-    target_compile_definitions(gnss_rx PRIVATE -DPLUTOSDR_DRIVER=1)
+    target_compile_definitions(core_receiver PRIVATE -DPLUTOSDR_DRIVER=1)
 endif()
 
 if(ENABLE_FMCOMMS2)
-    target_compile_definitions(gnss_rx PRIVATE -DFMCOMMS2_DRIVER=1)
+    target_compile_definitions(core_receiver PRIVATE -DFMCOMMS2_DRIVER=1)
 endif()
 
 if(ENABLE_AD9361)
-    target_compile_definitions(gnss_rx PRIVATE -DAD9361_DRIVER=1)
+    target_compile_definitions(core_receiver PRIVATE -DAD9361_DRIVER=1)
 endif()
 
 if(ENABLE_OSMOSDR)
     if(GROSMOSDR_FOUND)
-        target_compile_definitions(gnss_rx PRIVATE -DOSMOSDR_DRIVER=1)
+        target_compile_definitions(core_receiver PRIVATE -DOSMOSDR_DRIVER=1)
     endif()
 endif()
 
 if(ENABLE_GN3S)
-    target_compile_definitions(gnss_rx PRIVATE -DGN3S_DRIVER=1)
+    target_compile_definitions(core_receiver PRIVATE -DGN3S_DRIVER=1)
 endif()
 
 if(ENABLE_ARRAY)
-    target_compile_definitions(gnss_rx PRIVATE -DRAW_ARRAY_DRIVER=1)
+    target_compile_definitions(core_receiver PRIVATE -DRAW_ARRAY_DRIVER=1)
 endif()
 
 if(ENABLE_FLEXIBAND)
-    target_compile_definitions(gnss_rx PRIVATE -DFLEXIBAND_DRIVER=1)
+    target_compile_definitions(core_receiver PRIVATE -DFLEXIBAND_DRIVER=1)
 endif()
 
 if(OPENCL_FOUND)
     message(STATUS "Adding processing blocks implemented using OpenCL")
-    target_compile_definitions(gnss_rx PRIVATE -DOPENCL_BLOCKS=1)
+    target_compile_definitions(core_receiver PRIVATE -DOPENCL_BLOCKS=1)
 else()
-    target_compile_definitions(gnss_rx PRIVATE -DOPENCL_BLOCKS=0)
+    target_compile_definitions(core_receiver PRIVATE -DOPENCL_BLOCKS=0)
 endif()
 
 if(ENABLE_CUDA)
-    target_compile_definitions(gnss_rx PRIVATE -DCUDA_GPU_ACCEL=1)
+    target_compile_definitions(core_receiver PRIVATE -DCUDA_GPU_ACCEL=1)
 endif()
 
 
-target_link_libraries(gnss_rx
+target_link_libraries(core_receiver
     PUBLIC
         Armadillo::armadillo
         Boost::boost
         Boost::thread
         Gnuradio::runtime
-        rx_core_lib
+        core_libs
-        core_monitor_lib
+        core_monitor
     PRIVATE
         Boost::chrono
         Gflags::gflags
         Glog::glog
         signal_source_adapters
-        datatype_adapters
+        data_type_adapters
         input_filter_adapters
         conditioner_adapters
         resampler_adapters
-        acq_adapters
+        acquisition_adapters
         tracking_adapters
         channel_adapters
         telemetry_decoder_adapters
@@ -159,7 +159,7 @@ target_link_libraries(gnss_rx
         pvt_adapters
 )
 
-set_property(TARGET gnss_rx APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+set_property(TARGET core_receiver APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/core/receiver>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/core/interfaces>
     $<BUILD_INTERFACE:${OPT_RECEIVER_INCLUDE_DIRS}>

src/core/system_parameters/CMakeLists.txt

@@ -103,12 +103,12 @@ list(SORT SYSTEM_PARAMETERS_SOURCES)
 
 source_group(Headers FILES ${SYSTEM_PARAMETERS_HEADERS})
 
-add_library(gnss_system_parameters
+add_library(core_system_parameters
     ${SYSTEM_PARAMETERS_SOURCES}
     ${SYSTEM_PARAMETERS_HEADERS}
 )
 
-target_link_libraries(gnss_system_parameters
+target_link_libraries(core_system_parameters
     PUBLIC
         Boost::date_time
         Boost::serialization
@@ -117,7 +117,7 @@ target_link_libraries(gnss_system_parameters
         Gflags::gflags
 )
 
-set_property(TARGET gnss_system_parameters
+set_property(TARGET core_system_parameters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )

src/main/CMakeLists.txt

@@ -26,7 +26,7 @@ target_link_libraries(gnss-sdr
         Gflags::gflags
         Glog::glog
         Threads::Threads
-        gnss_rx
+        core_receiver
         gnss_sdr_flags
 )
 

src/tests/CMakeLists.txt

@@ -364,25 +364,25 @@ if(ENABLE_UNIT_TESTING)
             Volkgnsssdr::volkgnsssdr
             signal_source_adapters
             signal_source_gr_blocks
-            signal_source_lib
+            signal_source_libs
-            datatype_adapters
+            data_type_adapters
             input_filter_adapters
             resampler_adapters
             channel_adapters
-            acq_adapters
+            acquisition_adapters
             tracking_adapters
-            tracking_lib
+            tracking_libs
             telemetry_decoder_adapters
             obs_adapters
             signal_generator_adapters
             pvt_adapters
-            pvt_lib
+            pvt_libs
-            gnss_sp_libs
+            algorithms_libs
-            core_monitor_lib
+            core_monitor
             signal_processing_testing_lib
             system_testing_lib
-            gnss_rx
+            core_receiver
-            gnss_system_parameters
+            core_system_parameters
     )
     if(ENABLE_UNIT_TESTING_EXTRA)
         target_link_libraries(run_tests PUBLIC Gpstk::gpstk)
@@ -436,13 +436,13 @@ if(ENABLE_FPGA)
             GTest::Main
             Matio::matio
             Volk::volk
-            channel_fsm
+            channel_libs
-            datatype_adapters
+            data_type_adapters
             tracking_adapters
             signal_processing_testing_lib
-            gnss_sp_libs
+            algorithms_libs
-            gnss_rx
+            core_receiver
-            gnss_system_parameters
+            core_system_parameters
     )
     install(TARGETS gps_l1_ca_dll_pll_tracking_test_fpga
         RUNTIME DESTINATION bin
@@ -465,7 +465,7 @@ function(add_system_test executable)
     add_executable(${executable} ${SYSTEM_TEST_SOURCES})
 
     target_include_directories(${executable} PUBLIC ${OPT_INCLUDES_} ${CMAKE_SOURCES_DIR}/src/algorithms/libs)
-    target_link_libraries(${executable} PUBLIC ${OPT_LIBS_} gnss_sp_libs)
+    target_link_libraries(${executable} PUBLIC ${OPT_LIBS_} algorithms_libs)
 
     if(ENABLE_INSTALL_TESTS)
         if(EXISTS ${CMAKE_SOURCE_DIR}/install/${executable})
@@ -497,8 +497,8 @@ if(ENABLE_SYSTEM_TESTING)
         Threads::Threads Gflags::gflags Glog::glog
         Gnuradio::runtime GTest::GTest GTest::Main
         Gnuradio::blocks Gnuradio::filter
-        Gnuradio::analog gnss_sp_libs
+        Gnuradio::analog algorithms_libs
-        gnss_rx gnss_system_parameters
+        core_receiver core_system_parameters
     )
     add_system_test(ttff)
 
@@ -509,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_rx gnss_system_parameters
+            algorithms_libs core_receiver core_system_parameters
             system_testing_lib signal_processing_testing_lib
         )
         add_system_test(position_test)
@@ -555,12 +555,12 @@ if(NOT ENABLE_PACKAGING)
             Volkgnsssdr::volkgnsssdr
             signal_source_adapters
             signal_source_gr_blocks
-            signal_source_lib
+            signal_source_libs
             input_filter_adapters
             channel_adapters
-            gnss_rx
+            core_receiver
-            gnss_sp_libs
+            algorithms_libs
-            gnss_system_parameters
+            core_system_parameters
     )
 
     target_include_directories(flowgraph_test
@@ -604,13 +604,13 @@ if(NOT ENABLE_PACKAGING)
             Volkgnsssdr::volkgnsssdr
             signal_source_adapters
             signal_source_gr_blocks
-            signal_source_lib
+            signal_source_libs
-            datatype_adapters
+            data_type_adapters
             input_filter_adapters
             channel_adapters
-            gnss_rx
+            core_receiver
-            gnss_sp_libs
+            algorithms_libs
-            gnss_system_parameters
+            core_system_parameters
     )
 
     target_include_directories(gnss_block_test PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
@@ -647,10 +647,10 @@ if(NOT ENABLE_PACKAGING)
             GTest::Main
             Volkgnsssdr::volkgnsssdr
             signal_source_gr_blocks
-            signal_source_lib
+            signal_source_libs
-            gnss_rx
+            core_receiver
-            gnss_sp_libs
+            algorithms_libs
-            gnss_system_parameters
+            core_system_parameters
     )
 
     add_test(gnuradio_block_test gnuradio_block_test)
@@ -672,8 +672,8 @@ target_link_libraries(matio_test
         GTest::GTest
         GTest::Main
         Matio::matio
-        gnss_rx
+        core_receiver
-        gnss_system_parameters
+        core_system_parameters
 )
 
 add_test(matio_test matio_test)
@@ -704,13 +704,13 @@ if(NOT ENABLE_PACKAGING)
             Volkgnsssdr::volkgnsssdr
             signal_generator_blocks
             signal_source_gr_blocks
-            signal_source_lib
+            signal_source_libs
-            acq_adapters
+            acquisition_adapters
-            acq_gr_blocks
+            acquisition_gr_blocks
-            gnss_sp_libs
+            algorithms_libs
             signal_processing_testing_lib
-            gnss_rx
+            core_receiver
-            gnss_system_parameters
+            core_system_parameters
     )
 
     add_test(acq_test acq_test)
@@ -744,12 +744,12 @@ if(NOT ENABLE_PACKAGING)
             GTest::Main
             Volkgnsssdr::volkgnsssdr
             signal_source_gr_blocks
-            signal_source_lib
+            signal_source_libs
-            gnss_sp_libs
+            algorithms_libs
             tracking_adapters
             signal_generator_blocks
-            gnss_rx
+            core_receiver
-            gnss_system_parameters
+            core_system_parameters
     )
 
     add_test(trk_test trk_test)
@@ -777,10 +777,10 @@ if(NOT ENABLE_PACKAGING)
             GTest::Main
             signal_source_adapters
             signal_source_gr_blocks
-            signal_source_lib
+            signal_source_libs
-            gnss_sp_libs
+            algorithms_libs
-            gnss_rx
+            core_receiver
-            gnss_system_parameters
+            core_system_parameters
     )
 
     add_test(control_thread_test control_thread_test)

src/utils/front-end-cal/CMakeLists.txt

@@ -27,16 +27,16 @@ target_link_libraries(front_end_cal_lib
     PUBLIC
         Armadillo::armadillo
         Threads::Threads
-        acq_adapters
         Volkgnsssdr::volkgnsssdr ${ORC_LIBRARIES}
         signal_source_adapters
         signal_source_gr_blocks
-        signal_source_lib
+        signal_source_libs
-        rx_core_lib
+        acquisition_adapters
         gnss_sdr_flags
-        gnss_rx
+        channel_libs
-        channel_fsm
+        algorithms_libs
-        gnss_sp_libs
+        core_receiver
+        core_libs
     PRIVATE
         Gflags::gflags
         Glog::glog
@@ -51,8 +51,8 @@ add_executable(front-end-cal ${CMAKE_CURRENT_SOURCE_DIR}/main.cc)
 target_link_libraries(front-end-cal
     PUBLIC
         Volkgnsssdr::volkgnsssdr ${ORC_LIBRARIES}
-        rx_core_lib
+        core_libs
-        gnss_rx
+        core_receiver
         front_end_cal_lib
         gnss_sdr_flags
     PRIVATE

src/utils/rinex2assist/CMakeLists.txt

@@ -65,9 +65,9 @@ if(Boost_FOUND)
             Boost::serialization
             ${GPSTK_LIBRARY}
             Gflags::gflags
-            gnss_system_parameters
+            algorithms_libs
-            gnss_sp_libs
+            core_receiver
-            gnss_rx
+            core_system_parameters
     )
 
     target_include_directories(rinex2assist