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

CMakeLists.txt

@@ -609,13 +609,38 @@ endif()
 ################################################################################
 # Log4cpp - http://log4cpp.sourceforge.net/
 ################################################################################
-find_package(LOG4CPP)
-set_package_properties(LOG4CPP PROPERTIES
-    PURPOSE "Required by GNU Radio."
-    TYPE REQUIRED
-)
-if(NOT LOG4CPP_FOUND)
-    message(FATAL_ERROR "*** Log4cpp is required to build gnss-sdr")
+if(GNURADIO_USES_LOG4CPP)
+    find_package(LOG4CPP)
+    set_package_properties(LOG4CPP PROPERTIES
+        PURPOSE "Required by GNU Radio."
+        TYPE REQUIRED
+    )
+endif()
+
+
+
+################################################################################
+# spdlog - https://github.com/gabime/spdlog
+################################################################################
+if(GNURADIO_USES_SPDLOG)
+    find_package(SPDLOG REQUIRED)
+    set_package_properties(SPDLOG PROPERTIES
+        PURPOSE "Required by GNU Radio."
+        TYPE REQUIRED
+    )
+endif()
+
+
+
+################################################################################
+# fmt - https://github.com/fmtlib/fmt
+################################################################################
+if(GNURADIO_USES_SPDLOG)
+    find_package(FMT REQUIRED)
+    set_package_properties(FMT PROPERTIES
+        PURPOSE "Required by GNU Radio."
+        TYPE REQUIRED
+    )
 endif()
 
 
@@ -630,7 +655,7 @@ if(NOT ENABLE_OWN_GPSTK)
         PURPOSE "Used in some Extra Tests."
     )
 endif()
-if(NOT (GNURADIO_VERSION VERSION_LESS 3.8) AND LOG4CPP_READY_FOR_CXX17)
+if(NOT (GNURADIO_VERSION VERSION_LESS 3.8) AND (LOG4CPP_READY_FOR_CXX17 OR GNURADIO_USES_SPDLOG))
     # Check if we have std::filesystem
     if(NOT (CMAKE_VERSION VERSION_LESS 3.8))
         if(NOT GPSTK_FOUND OR NOT (GPSTK_FOUND AND GPSTK_OLDER_THAN_8))  # Fix for GPSTk < 8.0.0
@@ -666,6 +691,7 @@ if((NOT PMT_USES_BOOST_ANY) AND (CMAKE_CXX_STANDARD VERSION_LESS 17))
 endif()
 
 
+
 ################################################################################
 # Boost - https://www.boost.org
 ################################################################################

cmake/Modules/FindFMT.cmake

@@ -0,0 +1,76 @@
+# GNSS-SDR is a Global Navigation Satellite System software-defined receiver.
+# This file is part of GNSS-SDR.
+#
+# SPDX-FileCopyrightText: 2021 C. Fernandez-Prades cfernandez(at)cttc.es
+# SPDX-License-Identifier: BSD-3-Clause
+
+if(NOT COMMAND feature_summary)
+    include(FeatureSummary)
+endif()
+
+# Locate header
+find_path(FMT_INCLUDE_DIR fmt/core.h
+    HINTS ${FMT_ROOT_DIR}/include
+    PATHS
+        /usr/include
+        /usr/local/include
+        /opt/local/include
+)
+
+# Locate library
+find_library(FMT_LIBRARY NAMES fmt
+    HINTS ${FMT_ROOT_DIR}/lib ${FMT_ROOT_DIR}/lib64
+    PATHS
+        /usr/lib
+        /usr/lib64
+        /usr/lib/x86_64-linux-gnu
+        /usr/lib/i386-linux-gnu
+        /usr/lib/arm-linux-gnueabihf
+        /usr/lib/arm-linux-gnueabi
+        /usr/lib/aarch64-linux-gnu
+        /usr/lib/mipsel-linux-gnu
+        /usr/lib/mips-linux-gnu
+        /usr/lib/mips64el-linux-gnuabi64
+        /usr/lib/powerpc-linux-gnu
+        /usr/lib/powerpc64-linux-gnu
+        /usr/lib/powerpc64le-linux-gnu
+        /usr/lib/powerpc-linux-gnuspe
+        /usr/lib/hppa-linux-gnu
+        /usr/lib/s390x-linux-gnu
+        /usr/lib/i386-gnu
+        /usr/lib/hppa-linux-gnu
+        /usr/lib/x86_64-kfreebsd-gnu
+        /usr/lib/i386-kfreebsd-gnu
+        /usr/lib/m68k-linux-gnu
+        /usr/lib/sh4-linux-gnu
+        /usr/lib/sparc64-linux-gnu
+        /usr/lib/x86_64-linux-gnux32
+        /usr/lib/alpha-linux-gnu
+        /usr/lib/riscv64-linux-gnu
+        /usr/local/lib
+        /usr/local/lib64
+        /opt/local/lib
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(FMT DEFAULT_MSG FMT_INCLUDE_DIR FMT_LIBRARY)
+
+set_package_properties(FMT PROPERTIES
+    URL "https://github.com/fmtlib/fmt"
+    DESCRIPTION "An open-source formatting library"
+)
+
+# Add imported target.
+if(FMT_FOUND)
+    set(FMT_INCLUDE_DIRS "${FMT_INCLUDE_DIR}")
+
+    if(NOT TARGET fmt::fmt)
+        add_library(fmt::fmt UNKNOWN IMPORTED)
+        set_target_properties(fmt::fmt PROPERTIES
+            INTERFACE_INCLUDE_DIRECTORIES "${FMT_INCLUDE_DIRS}"
+        )
+        set_property(TARGET fmt::fmt APPEND PROPERTY
+            IMPORTED_LOCATION "${FMT_LIBRARY}"
+        )
+    endif()
+endif()

cmake/Modules/FindGNURADIO.cmake

@@ -392,6 +392,30 @@ if(GNURADIO_PMT_INCLUDE_DIRS)
     endif()
 endif()
 
+# Check if GNU Radio uses log4cpp or spdlog
+if(GNURADIO_RUNTIME_INCLUDE_DIRS)
+    if(EXISTS "${GNURADIO_RUNTIME_INCLUDE_DIRS}/gnuradio/logger.h")
+        file(STRINGS ${GNURADIO_RUNTIME_INCLUDE_DIRS}/gnuradio/logger.h _logger_content)
+        set(_uses_log4cpp FALSE)
+        set(_uses_spdlog FALSE)
+        foreach(_loop_var IN LISTS _logger_content)
+            string(STRIP "${_loop_var}" _file_line)
+            if("#include <log4cpp/Category.hh>" STREQUAL "${_file_line}")
+                set(_uses_log4cpp TRUE)
+            endif()
+            if("#include <spdlog/common.h>" STREQUAL "${_file_line}")
+                set(_uses_spdlog TRUE)
+            endif()
+        endforeach()
+        if(${_uses_log4cpp})
+            set(GNURADIO_USES_LOG4CPP TRUE)
+        endif()
+        if(${_uses_spdlog})
+            set(GNURADIO_USES_SPDLOG TRUE)
+        endif()
+    endif()
+endif()
+
 set_package_properties(GNURADIO PROPERTIES
     URL "https://www.gnuradio.org/"
 )

cmake/Modules/FindSPDLOG.cmake

@@ -0,0 +1,84 @@
+# GNSS-SDR is a Global Navigation Satellite System software-defined receiver.
+# This file is part of GNSS-SDR.
+#
+# SPDX-FileCopyrightText: 2021 C. Fernandez-Prades cfernandez(at)cttc.es
+# SPDX-License-Identifier: BSD-3-Clause
+
+if(NOT COMMAND feature_summary)
+    include(FeatureSummary)
+endif()
+
+# Locate header
+find_path(SPDLOG_INCLUDE_DIR spdlog/spdlog.h
+    HINTS ${SPDLOG_ROOT_DIR}/include
+    PATHS
+        /usr/include
+        /usr/local/include
+        /opt/local/include
+)
+
+# Locate library
+find_library(SPDLOG_LIBRARY NAMES spdlog spdlogd
+    HINTS ${SPDLOG_ROOT_DIR}/lib ${SPDLOG_ROOT_DIR}/lib64
+    PATHS
+        /usr/lib
+        /usr/lib64
+        /usr/lib/x86_64-linux-gnu
+        /usr/lib/i386-linux-gnu
+        /usr/lib/arm-linux-gnueabihf
+        /usr/lib/arm-linux-gnueabi
+        /usr/lib/aarch64-linux-gnu
+        /usr/lib/mipsel-linux-gnu
+        /usr/lib/mips-linux-gnu
+        /usr/lib/mips64el-linux-gnuabi64
+        /usr/lib/powerpc-linux-gnu
+        /usr/lib/powerpc64-linux-gnu
+        /usr/lib/powerpc64le-linux-gnu
+        /usr/lib/powerpc-linux-gnuspe
+        /usr/lib/hppa-linux-gnu
+        /usr/lib/s390x-linux-gnu
+        /usr/lib/i386-gnu
+        /usr/lib/hppa-linux-gnu
+        /usr/lib/x86_64-kfreebsd-gnu
+        /usr/lib/i386-kfreebsd-gnu
+        /usr/lib/m68k-linux-gnu
+        /usr/lib/sh4-linux-gnu
+        /usr/lib/sparc64-linux-gnu
+        /usr/lib/x86_64-linux-gnux32
+        /usr/lib/alpha-linux-gnu
+        /usr/lib/riscv64-linux-gnu
+        /usr/local/lib
+        /usr/local/lib64
+        /opt/local/lib
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SPDLOG DEFAULT_MSG SPDLOG_INCLUDE_DIR SPDLOG_LIBRARY)
+
+set_package_properties(SPDLOG PROPERTIES
+    URL "https://github.com/gabime/spdlog"
+    DESCRIPTION "Very fast, header-only/compiled, C++ logging library"
+)
+
+# Add imported target.
+if(SPDLOG_FOUND)
+    set(SPDLOG_INCLUDE_DIRS "${SPDLOG_INCLUDE_DIR}")
+
+    if(NOT TARGET spdlog::spdlog)
+        add_library(spdlog::spdlog UNKNOWN IMPORTED)
+        set_target_properties(spdlog::spdlog PROPERTIES
+            INTERFACE_INCLUDE_DIRECTORIES "${SPDLOG_INCLUDE_DIRS}"
+        )
+        set_property(TARGET spdlog::spdlog APPEND PROPERTY
+            IMPORTED_LOCATION "${SPDLOG_LIBRARY}"
+        )
+    endif()
+
+    if(CMAKE_VERSION VERSION_GREATER 3.11.0)
+        target_compile_definitions(spdlog::spdlog INTERFACE -DSPDLOG_FMT_EXTERNAL=1)
+    else()
+        set_property(TARGET spdlog::spdlog APPEND PROPERTY
+            INTERFACE_COMPILE_DEFINITIONS SPDLOG_FMT_EXTERNAL=1
+        )
+    endif()
+endif()

src/algorithms/PVT/adapters/CMakeLists.txt

@@ -39,6 +39,14 @@ if(USE_OLD_BOOST_MATH_COMMON_FACTOR)
     )
 endif()
 
+if(GNURADIO_USES_SPDLOG)
+    target_link_libraries(pvt_adapters
+        PUBLIC
+            fmt::fmt
+            spdlog::spdlog
+    )
+endif()
+
 if(ENABLE_CLANG_TIDY)
     if(CLANG_TIDY_EXE)
         set_target_properties(pvt_adapters

src/algorithms/channel/libs/CMakeLists.txt

@@ -54,6 +54,14 @@ if(GNURADIO_USES_STD_POINTERS)
     )
 endif()
 
+if(GNURADIO_USES_SPDLOG)
+    target_link_libraries(channel_libs
+        PUBLIC
+            fmt::fmt
+            spdlog::spdlog
+    )
+endif()
+
 if(USE_GENERIC_LAMBDAS)
     set(has_generic_lambdas HAS_GENERIC_LAMBDA=1)
     set(no_has_generic_lambdas HAS_GENERIC_LAMBDA=0)

src/algorithms/conditioner/adapters/CMakeLists.txt

@@ -42,6 +42,14 @@ target_link_libraries(conditioner_adapters
         Glog::glog
 )
 
+if(GNURADIO_USES_SPDLOG)
+    target_link_libraries(conditioner_adapters
+        PUBLIC
+            fmt::fmt
+            spdlog::spdlog
+    )
+endif()
+
 target_include_directories(conditioner_adapters
     PUBLIC
         ${CMAKE_SOURCE_DIR}/src/core/interfaces

src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt

@@ -55,6 +55,14 @@ if(GNURADIO_USES_STD_POINTERS)
     )
 endif()
 
+if(GNURADIO_USES_SPDLOG)
+    target_link_libraries(data_type_gr_blocks
+        PUBLIC
+            fmt::fmt
+            spdlog::spdlog
+    )
+endif()
+
 set_property(TARGET data_type_gr_blocks
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>

src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt

@@ -46,9 +46,23 @@ target_link_libraries(input_filter_gr_blocks
         algorithms_libs
     PRIVATE
         Volk::volk
-        Log4cpp::log4cpp
 )
 
+if(LOG4CPP_FOUND)
+    target_link_libraries(input_filter_gr_blocks
+        PRIVATE
+            Log4cpp::log4cpp
+    )
+endif()
+
+if(GNURADIO_USES_SPDLOG)
+    target_link_libraries(input_filter_gr_blocks
+        PUBLIC
+            fmt::fmt
+            spdlog::spdlog
+    )
+endif()
+
 target_include_directories(input_filter_gr_blocks
     PUBLIC
         ${CMAKE_SOURCE_DIR}/src/core/interfaces

src/algorithms/libs/CMakeLists.txt

@@ -117,6 +117,14 @@ if(GNURADIO_USES_STD_POINTERS)
     )
 endif()
 
+if(GNURADIO_USES_SPDLOG)
+    target_link_libraries(algorithms_libs
+        PUBLIC
+            fmt::fmt
+            spdlog::spdlog
+    )
+endif()
+
 if(FILESYSTEM_FOUND)
     target_compile_definitions(algorithms_libs PUBLIC -DHAS_STD_FILESYSTEM=1)
     if(find_experimental)

src/algorithms/observables/gnuradio_blocks/CMakeLists.txt

@@ -36,6 +36,14 @@ target_link_libraries(obs_gr_blocks
         Matio::matio
 )
 
+if(GNURADIO_USES_SPDLOG)
+    target_link_libraries(obs_gr_blocks
+        PUBLIC
+            fmt::fmt
+            spdlog::spdlog
+    )
+endif()
+
 target_include_directories(obs_gr_blocks
     PUBLIC
         ${CMAKE_SOURCE_DIR}/src/core/interfaces

src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt

@@ -50,6 +50,14 @@ if(GNURADIO_USES_STD_POINTERS)
     )
 endif()
 
+if(NOT GNURADIO_USES_LOG4CPP)
+    target_link_libraries(resampler_gr_blocks
+        PUBLIC
+            fmt::fmt
+            spdlog::spdlog
+    )
+endif()
+
 target_include_directories(resampler_gr_blocks
     PUBLIC
         ${CMAKE_SOURCE_DIR}/src/core/interfaces

src/algorithms/signal_generator/adapters/CMakeLists.txt

@@ -44,6 +44,14 @@ if(GNURADIO_USES_STD_POINTERS)
     )
 endif()
 
+if(GNURADIO_USES_SPDLOG)
+    target_link_libraries(signal_generator_adapters
+        PUBLIC
+            fmt::fmt
+            spdlog::spdlog
+    )
+endif()
+
 if(ENABLE_CLANG_TIDY)
     if(CLANG_TIDY_EXE)
         set_target_properties(signal_generator_adapters

src/algorithms/signal_source/gnuradio_blocks/labsat23_source.cc

@@ -21,12 +21,12 @@
 #include "INIReader.h"
 #include "command_event.h"
 #include "gnss_sdr_make_unique.h"
-#include <boost/any.hpp>
 #include <gnuradio/io_signature.h>
 #include <algorithm>
 #include <array>
 #include <bitset>
 #include <exception>
+#include <iomanip>
 #include <iostream>
 #include <memory>
 #include <sstream>

src/algorithms/signal_source/libs/CMakeLists.txt

@@ -76,6 +76,14 @@ if(GNURADIO_USES_STD_POINTERS)
     )
 endif()
 
+if(GNURADIO_USES_SPDLOG)
+    target_link_libraries(signal_source_libs
+        PUBLIC
+            fmt::fmt
+            spdlog::spdlog
+    )
+endif()
+
 if(ENABLE_FMCOMMS2 OR ENABLE_AD9361)
     target_link_libraries(signal_source_libs
         PUBLIC

src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt

@@ -67,6 +67,14 @@ if(GNURADIO_USES_STD_POINTERS)
     )
 endif()
 
+if(GNURADIO_USES_SPDLOG)
+    target_link_libraries(telemetry_decoder_gr_blocks
+        PUBLIC
+            fmt::fmt
+            spdlog::spdlog
+    )
+endif()
+
 target_include_directories(telemetry_decoder_gr_blocks
     PUBLIC
         ${CMAKE_SOURCE_DIR}/src/core/interfaces

src/core/monitor/CMakeLists.txt

@@ -73,6 +73,14 @@ if(GNURADIO_USES_STD_POINTERS)
     )
 endif()
 
+if(GNURADIO_USES_SPDLOG)
+    target_link_libraries(core_monitor
+        PUBLIC
+            fmt::fmt
+            spdlog::spdlog
+    )
+endif()
+
 if(USE_BOOST_ASIO_IO_CONTEXT)
     target_compile_definitions(core_monitor
         PUBLIC

src/tests/system-tests/position_test.cc

@@ -36,6 +36,8 @@
 #include "test_flags.h"
 #include "tracking_tests_flags.h"  // acquisition resampler
 #include <armadillo>
+#include <boost/exception/diagnostic_information.hpp>
+#include <boost/exception/exception.hpp>
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 #include <matio.h>

src/tests/system-tests/ttff.cc

@@ -24,6 +24,8 @@
 #include "gps_acq_assist.h"
 #include "in_memory_configuration.h"
 #include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/exception/diagnostic_information.hpp>
+#include <boost/exception/exception.hpp>
 #include <gflags/gflags.h>
 #include <glog/logging.h>
 #include <gtest/gtest.h>

src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt

@@ -53,6 +53,14 @@ target_include_directories(signal_processing_testing_lib
         ${CMAKE_SOURCE_DIR}/src/tests/common-files
 )
 
+if(GNURADIO_USES_SPDLOG)
+    target_link_libraries(signal_processing_testing_lib
+        PUBLIC
+            fmt::fmt
+            spdlog::spdlog
+    )
+endif()
+
 if(USE_GENERIC_LAMBDAS)
     set(has_generic_lambdas HAS_GENERIC_LAMBDA=1)
     set(no_has_generic_lambdas HAS_GENERIC_LAMBDA=0)

src/utils/rinex-tools/obsdiff.cc

@@ -53,6 +53,7 @@
 #include <algorithm>
 #include <array>
 #include <fstream>
+#include <iomanip>
 #include <map>
 #include <set>
 #include <stdexcept>