mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2025-10-24 12:07:40 +00:00
Soft transition from Gflags and Glog to Abseil. Some CI fixes
This commit is contained in:
@@ -74,11 +74,16 @@ target_link_libraries(signal_source_libs
|
||||
Boost::headers
|
||||
Gnuradio::runtime
|
||||
PRIVATE
|
||||
Gflags::gflags
|
||||
Glog::glog
|
||||
core_libs
|
||||
)
|
||||
|
||||
if(ENABLE_GLOG_AND_GFLAGS)
|
||||
target_link_libraries(signal_source_libs PRIVATE Gflags::gflags Glog::glog)
|
||||
target_compile_definitions(signal_source_libs PRIVATE -DUSE_GLOG_AND_GFLAGS=1)
|
||||
else()
|
||||
target_link_libraries(signal_source_libs PRIVATE absl::flags absl::log)
|
||||
endif()
|
||||
|
||||
target_include_directories(signal_source_libs
|
||||
PUBLIC
|
||||
${GNSSSDR_SOURCE_DIR}/src/core/receiver
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
* -----------------------------------------------------------------------------
|
||||
*/
|
||||
#include "ad9361_manager.h"
|
||||
#include <glog/logging.h>
|
||||
#include <ad9361.h>
|
||||
#include <cmath>
|
||||
#include <fstream> // for ifstream
|
||||
@@ -25,6 +24,12 @@
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#if USE_GLOG_AND_GFLAGS
|
||||
#include <glog/logging.h>
|
||||
#else
|
||||
#include <absl/log/log.h>
|
||||
#endif
|
||||
|
||||
/* check return value of attr_write function */
|
||||
void errchk(int v, const char *what)
|
||||
{
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
#include "ad936x_iio_custom.h"
|
||||
#include <boost/filesystem.hpp>
|
||||
#include <boost/lexical_cast.hpp>
|
||||
#include <glog/logging.h>
|
||||
#include <chrono>
|
||||
#include <cmath>
|
||||
#include <fstream>
|
||||
@@ -24,6 +23,12 @@
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#if USE_GLOG_AND_GFLAGS
|
||||
#include <glog/logging.h>
|
||||
#else
|
||||
#include <absl/log/log.h>
|
||||
#endif
|
||||
|
||||
ad936x_iio_custom::ad936x_iio_custom(int debug_level_, int log_level_)
|
||||
{
|
||||
receive_samples = false;
|
||||
|
||||
@@ -25,7 +25,6 @@
|
||||
#include "fpga_buffer_monitor.h"
|
||||
#include "gnss_sdr_create_directory.h"
|
||||
#include "gnss_sdr_filesystem.h"
|
||||
#include <glog/logging.h>
|
||||
#include <ctime> // for time, localtime
|
||||
#include <fcntl.h> // for open, O_RDWR, O_SYNC
|
||||
#include <fstream> // for string, ofstream
|
||||
@@ -34,6 +33,12 @@
|
||||
#include <unistd.h> // for close
|
||||
#include <utility> // for move
|
||||
|
||||
#if USE_GLOG_AND_GFLAGS
|
||||
#include <glog/logging.h>
|
||||
#else
|
||||
#include <absl/log/log.h>
|
||||
#endif
|
||||
|
||||
|
||||
Fpga_buffer_monitor::Fpga_buffer_monitor(const std::string &device_name,
|
||||
uint32_t num_freq_bands,
|
||||
|
||||
@@ -21,12 +21,17 @@
|
||||
|
||||
#include "fpga_dynamic_bit_selection.h"
|
||||
#include "uio_fpga.h"
|
||||
#include <glog/logging.h>
|
||||
#include <fcntl.h> // for open, O_RDWR, O_SYNC
|
||||
#include <iostream> // for cout
|
||||
#include <sys/mman.h> // for mmap
|
||||
#include <unistd.h> // for close
|
||||
|
||||
#if USE_GLOG_AND_GFLAGS
|
||||
#include <glog/logging.h>
|
||||
#else
|
||||
#include <absl/log/log.h>
|
||||
#endif
|
||||
|
||||
Fpga_dynamic_bit_selection::Fpga_dynamic_bit_selection(bool enable_rx1_band, bool enable_rx2_band)
|
||||
: d_map_base_freq_band_1(nullptr),
|
||||
d_map_base_freq_band_2(nullptr),
|
||||
|
||||
@@ -21,12 +21,17 @@
|
||||
*/
|
||||
|
||||
#include "fpga_switch.h"
|
||||
#include <glog/logging.h>
|
||||
#include <fcntl.h> // for open, O_RDWR, O_SYNC
|
||||
#include <iostream> // for cout
|
||||
#include <sys/mman.h> // for mmap
|
||||
#include <unistd.h> // for close
|
||||
|
||||
#if USE_GLOG_AND_GFLAGS
|
||||
#include <glog/logging.h>
|
||||
#else
|
||||
#include <absl/log/log.h>
|
||||
#endif
|
||||
|
||||
Fpga_Switch::Fpga_Switch(const std::string &device_name)
|
||||
{
|
||||
if ((d_device_descriptor = open(device_name.c_str(), O_RDWR | O_SYNC)) == -1)
|
||||
|
||||
@@ -19,11 +19,16 @@
|
||||
|
||||
#include "gnss_sdr_valve.h"
|
||||
#include "command_event.h"
|
||||
#include <glog/logging.h> // for LOG
|
||||
#include <gnuradio/io_signature.h> // for io_signature
|
||||
#include <algorithm> // for min
|
||||
#include <cstring> // for memcpy
|
||||
|
||||
#if USE_GLOG_AND_GFLAGS
|
||||
#include <glog/logging.h>
|
||||
#else
|
||||
#include <absl/log/log.h>
|
||||
#endif
|
||||
|
||||
Gnss_Sdr_Valve::Gnss_Sdr_Valve(size_t sizeof_stream_item,
|
||||
uint64_t nitems,
|
||||
Concurrent_Queue<pmt::pmt_t>* queue,
|
||||
|
||||
Reference in New Issue
Block a user