From 2b8ab9dcee7c1c6702410d371565d4cd5c2e8b32 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 18 Feb 2018 12:23:55 +0100 Subject: [PATCH] Group all flags in a single file This makes easier to document and to add new ones. Shortened version of common files have been added: -c for -config_file -s for -signal_source --- src/algorithms/PVT/libs/CMakeLists.txt | 5 +- src/algorithms/PVT/libs/ls_pvt.cc | 1 - src/algorithms/PVT/libs/nmea_printer.cc | 20 +------- src/algorithms/PVT/libs/pvt_solution.cc | 2 - src/algorithms/PVT/libs/rinex_printer.cc | 4 +- src/algorithms/PVT/libs/rtcm_printer.cc | 1 - src/algorithms/libs/CMakeLists.txt | 9 +++- src/algorithms/libs/gnss_sdr_flags.cc | 43 ++++++++++++++++ src/algorithms/libs/gnss_sdr_flags.h | 51 +++++++++++++++++++ .../adapters/file_signal_source.cc | 11 ++-- .../adapters/gn3s_signal_source.cc | 1 - .../adapters/nsr_file_signal_source.cc | 10 ++-- .../adapters/spir_file_signal_source.cc | 10 ++-- .../two_bit_cpx_file_signal_source.cc | 5 +- .../two_bit_packed_file_signal_source.cc | 8 +-- src/core/receiver/control_thread.cc | 10 +++- src/main/CMakeLists.txt | 2 + src/main/main.cc | 8 +-- src/utils/front-end-cal/CMakeLists.txt | 3 -- src/utils/front-end-cal/front_end_cal.cc | 1 - 20 files changed, 143 insertions(+), 62 deletions(-) create mode 100644 src/algorithms/libs/gnss_sdr_flags.cc create mode 100644 src/algorithms/libs/gnss_sdr_flags.h diff --git a/src/algorithms/PVT/libs/CMakeLists.txt b/src/algorithms/PVT/libs/CMakeLists.txt index 5e30040d5..96aace272 100644 --- a/src/algorithms/PVT/libs/CMakeLists.txt +++ b/src/algorithms/PVT/libs/CMakeLists.txt @@ -36,24 +36,25 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/core/interfaces ${CMAKE_SOURCE_DIR}/src/core/receiver ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/adapters + ${CMAKE_SOURCE_DIR}/src/algorithms/libs ${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib ${Boost_INCLUDE_DIRS} ${ARMADILLO_INCLUDE_DIRS} ${GFlags_INCLUDE_DIRS} ${GLOG_INCLUDE_DIRS} ) + file(GLOB PVT_LIB_HEADERS "*.h") list(SORT PVT_LIB_HEADERS) add_library(pvt_lib ${PVT_LIB_SOURCES} ${PVT_LIB_HEADERS}) source_group(Headers FILES ${PVT_LIB_HEADERS}) add_dependencies(pvt_lib rtklib_lib armadillo-${armadillo_RELEASE} glog-${glog_RELEASE}) - target_link_libraries( pvt_lib rtklib_lib + gnss_sdr_flags ${Boost_LIBRARIES} - ${GFlags_LIBS} ${GLOG_LIBRARIES} ${ARMADILLO_LIBRARIES} ${BLAS} diff --git a/src/algorithms/PVT/libs/ls_pvt.cc b/src/algorithms/PVT/libs/ls_pvt.cc index b8ec551e8..91620e8ce 100644 --- a/src/algorithms/PVT/libs/ls_pvt.cc +++ b/src/algorithms/PVT/libs/ls_pvt.cc @@ -33,7 +33,6 @@ #include #include #include "GPS_L1_CA.h" -#include #include diff --git a/src/algorithms/PVT/libs/nmea_printer.cc b/src/algorithms/PVT/libs/nmea_printer.cc index b7d55d67f..5398af18b 100644 --- a/src/algorithms/PVT/libs/nmea_printer.cc +++ b/src/algorithms/PVT/libs/nmea_printer.cc @@ -38,13 +38,10 @@ #include #include #include -#include - using google::LogMessage; -//DEFINE_string(NMEA_version, "2.1", "Specifies the NMEA version (2.1)"); Nmea_Printer::Nmea_Printer(std::string filename, bool flag_nmea_tty_port, std::string nmea_dump_devname) { @@ -72,8 +69,6 @@ Nmea_Printer::Nmea_Printer(std::string filename, bool flag_nmea_tty_port, std::s } - - Nmea_Printer::~Nmea_Printer() { if (nmea_file_descriptor.is_open()) @@ -84,8 +79,6 @@ Nmea_Printer::~Nmea_Printer() } - - int Nmea_Printer::init_serial (std::string serial_device) { /*! @@ -123,7 +116,6 @@ int Nmea_Printer::init_serial (std::string serial_device) } - void Nmea_Printer::close_serial () { if (nmea_dev_descriptor != -1) @@ -200,7 +192,6 @@ bool Nmea_Printer::Print_Nmea_Line(const std::shared_ptr& pvt_data } - char Nmea_Printer::checkSum(std::string sentence) { char check = 0; @@ -214,7 +205,6 @@ char Nmea_Printer::checkSum(std::string sentence) } - std::string Nmea_Printer::latitude_to_hm(double lat) { bool north; @@ -253,7 +243,6 @@ std::string Nmea_Printer::latitude_to_hm(double lat) } - std::string Nmea_Printer::longitude_to_hm(double longitude) { bool east; @@ -291,7 +280,6 @@ std::string Nmea_Printer::longitude_to_hm(double longitude) } - std::string Nmea_Printer::get_UTC_NMEA_time(boost::posix_time::ptime d_position_UTC_time) { //UTC Time: hhmmss.sss @@ -336,7 +324,6 @@ std::string Nmea_Printer::get_UTC_NMEA_time(boost::posix_time::ptime d_position_ } - std::string Nmea_Printer::get_GPRMC() { // Sample -> $GPRMC,161229.487,A,3723.2475,N,12158.3416,W,0.13,309.62,120598,*10 @@ -438,7 +425,6 @@ std::string Nmea_Printer::get_GPRMC() } - std::string Nmea_Printer::get_GPGSA() { //$GPGSA,A,3,07,02,26,27,09,04,15, , , , , ,1.8,1.0,1.5*33 @@ -523,8 +509,6 @@ std::string Nmea_Printer::get_GPGSA() } - - std::string Nmea_Printer::get_GPGSV() { // GSV-GNSS Satellites in View @@ -613,9 +597,6 @@ std::string Nmea_Printer::get_GPGSV() } - - - std::string Nmea_Printer::get_GPGGA() { //boost::posix_time::ptime d_position_UTC_time=boost::posix_time::microsec_clock::universal_time(); @@ -727,3 +708,4 @@ std::string Nmea_Printer::get_GPGGA() return sentence_str.str(); //$GPGGA,104427.591,5920.7009,N,01803.2938,E,1,05,3.3,78.2,M,23.2,M,0.0,0000*4A } + diff --git a/src/algorithms/PVT/libs/pvt_solution.cc b/src/algorithms/PVT/libs/pvt_solution.cc index 8b9842411..5e53dc9d0 100644 --- a/src/algorithms/PVT/libs/pvt_solution.cc +++ b/src/algorithms/PVT/libs/pvt_solution.cc @@ -32,13 +32,11 @@ #include "pvt_solution.h" #include #include "GPS_L1_CA.h" -#include #include using google::LogMessage; -DEFINE_bool(tropo, true, "Apply tropospheric correction"); Pvt_Solution::Pvt_Solution() { diff --git a/src/algorithms/PVT/libs/rinex_printer.cc b/src/algorithms/PVT/libs/rinex_printer.cc index d3ca165ac..b2dfa2a68 100644 --- a/src/algorithms/PVT/libs/rinex_printer.cc +++ b/src/algorithms/PVT/libs/rinex_printer.cc @@ -42,14 +42,12 @@ #include #include #include -#include #include +#include "gnss_sdr_flags.h" using google::LogMessage; -DEFINE_string(RINEX_version, "3.02", "Specifies the RINEX version (2.11 or 3.02)"); - Rinex_Printer::Rinex_Printer(int conf_version) { diff --git a/src/algorithms/PVT/libs/rtcm_printer.cc b/src/algorithms/PVT/libs/rtcm_printer.cc index 9bd55b6c1..3d6a1e56b 100644 --- a/src/algorithms/PVT/libs/rtcm_printer.cc +++ b/src/algorithms/PVT/libs/rtcm_printer.cc @@ -37,7 +37,6 @@ #include // for O_RDWR #include // for tcgetattr #include -#include #include using google::LogMessage; diff --git a/src/algorithms/libs/CMakeLists.txt b/src/algorithms/libs/CMakeLists.txt index 6ce1d3987..798741a3c 100644 --- a/src/algorithms/libs/CMakeLists.txt +++ b/src/algorithms/libs/CMakeLists.txt @@ -39,7 +39,6 @@ set(GNSS_SPLIBS_SOURCES conjugate_ic.cc ) - if(OPENCL_FOUND) set(GNSS_SPLIBS_SOURCES ${GNSS_SPLIBS_SOURCES} fft_execute.cc # Needs OpenCL @@ -71,7 +70,10 @@ if(OPENCL_FOUND) endif(OS_IS_MACOSX) endif(OPENCL_FOUND) +add_definitions(-DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}") + file(GLOB GNSS_SPLIBS_HEADERS "*.h") +list(REMOVE_ITEM GNSS_SPLIBS_HEADERS gnss_sdr_flags.h) list(SORT GNSS_SPLIBS_HEADERS) add_library(gnss_sp_libs ${GNSS_SPLIBS_SOURCES} ${GNSS_SPLIBS_HEADERS}) source_group(Headers FILES ${GNSS_SPLIBS_HEADERS}) @@ -79,6 +81,7 @@ source_group(Headers FILES ${GNSS_SPLIBS_HEADERS}) target_link_libraries(gnss_sp_libs ${GNURADIO_RUNTIME_LIBRARIES} ${VOLK_LIBRARIES} ${ORC_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${ORC_LIBRARIES} + ${GFlags_LIBS} ${GNURADIO_BLOCKS_LIBRARIES} ${GNURADIO_FFT_LIBRARIES} ${GNURADIO_FILTER_LIBRARIES} @@ -89,3 +92,7 @@ target_link_libraries(gnss_sp_libs ${GNURADIO_RUNTIME_LIBRARIES} if(NOT VOLK_GNSSSDR_FOUND) add_dependencies(gnss_sp_libs volk_gnsssdr_module) endif(NOT VOLK_GNSSSDR_FOUND) + +add_library(gnss_sdr_flags gnss_sdr_flags.cc gnss_sdr_flags.h) +source_group(Headers FILES gnss_sdr_flags.h) +target_link_libraries(gnss_sdr_flags ${GFlags_LIBS}) \ No newline at end of file diff --git a/src/algorithms/libs/gnss_sdr_flags.cc b/src/algorithms/libs/gnss_sdr_flags.cc new file mode 100644 index 000000000..3601e4c3f --- /dev/null +++ b/src/algorithms/libs/gnss_sdr_flags.cc @@ -0,0 +1,43 @@ +/*! + * \file gnss_sdr_flags.cc + * \brief Helper file for gnss-sdr commandline flags + * \author Carles Fernandez-Prades, 2018. cfernandez(at)cttc.es + * + * ------------------------------------------------------------------------- + * + * Copyright (C) 2010-2018 (see AUTHORS file for a list of contributors) + * + * GNSS-SDR is a software defined Global Navigation + * Satellite Systems receiver + * + * This file is part of GNSS-SDR. + * + * GNSS-SDR is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * GNSS-SDR is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNSS-SDR. If not, see . + * + * ------------------------------------------------------------------------- + */ + + +#include + + +DEFINE_string(c, "-", "Path to the configuration file (if set, overrides --config_file)"); + +DEFINE_string(s, "-", + "If defined, path to the file containing the signal samples (overrides the configuration file and --signal_source)"); + +DEFINE_string(signal_source, "-", + "If defined, path to the file containing the signal samples (overrides the configuration file)"); + +DEFINE_string(RINEX_version, "3.02", "Specifies the RINEX version (2.11 or 3.02)"); diff --git a/src/algorithms/libs/gnss_sdr_flags.h b/src/algorithms/libs/gnss_sdr_flags.h new file mode 100644 index 000000000..7297d79b1 --- /dev/null +++ b/src/algorithms/libs/gnss_sdr_flags.h @@ -0,0 +1,51 @@ +/*! + * \file gnss_sdr_flags.h + * \brief Helper file for gnss-sdr commandline flags + * \author Carles Fernandez-Prades, 2018. cfernandez(at)cttc.es + * + * ------------------------------------------------------------------------- + * + * Copyright (C) 2010-2018 (see AUTHORS file for a list of contributors) + * + * GNSS-SDR is a software defined Global Navigation + * Satellite Systems receiver + * + * This file is part of GNSS-SDR. + * + * GNSS-SDR is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * GNSS-SDR is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNSS-SDR. If not, see . + * + * ------------------------------------------------------------------------- + */ + +#ifndef GNSS_SDR_FLAGS_H_ +#define GNSS_SDR_FLAGS_H_ + + +#include + + +DECLARE_string(c); // #include #include -#include #include -#include "gnss_sdr_valve.h" #include "configuration_interface.h" +#include "gnss_sdr_flags.h" +#include "gnss_sdr_valve.h" + + using google::LogMessage; -DEFINE_string(signal_source, "-", - "If defined, path to the file containing the signal samples (overrides the configuration file)"); - - FileSignalSource::FileSignalSource(ConfigurationInterface* configuration, std::string role, unsigned int in_streams, unsigned int out_streams, boost::shared_ptr queue) : @@ -64,6 +62,7 @@ FileSignalSource::FileSignalSource(ConfigurationInterface* configuration, // override value with commandline flag, if present if (FLAGS_signal_source.compare("-") != 0) filename_= FLAGS_signal_source; + if (FLAGS_s.compare("-") != 0) filename_= FLAGS_s; item_type_ = configuration->property(role + ".item_type", default_item_type); repeat_ = configuration->property(role + ".repeat", false); diff --git a/src/algorithms/signal_source/adapters/gn3s_signal_source.cc b/src/algorithms/signal_source/adapters/gn3s_signal_source.cc index f3f7aa8cb..17ac8513c 100644 --- a/src/algorithms/signal_source/adapters/gn3s_signal_source.cc +++ b/src/algorithms/signal_source/adapters/gn3s_signal_source.cc @@ -31,7 +31,6 @@ #include "gn3s_signal_source.h" #include #include -#include #include #include #include "configuration_interface.h" diff --git a/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc b/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc index d721d4c4a..00d374d55 100644 --- a/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc @@ -35,17 +35,14 @@ #include #include #include -#include #include -#include "gnss_sdr_valve.h" #include "configuration_interface.h" +#include "gnss_sdr_flags.h" +#include "gnss_sdr_valve.h" using google::LogMessage; -DEFINE_string(nsr_signal_source, "-", - "If defined, path to the file containing the NSR (byte to 2-bit packed) signal samples (overrides the configuration file)"); - NsrFileSignalSource::NsrFileSignalSource(ConfigurationInterface* configuration, std::string role, unsigned int in_streams, unsigned int out_streams, @@ -61,7 +58,8 @@ NsrFileSignalSource::NsrFileSignalSource(ConfigurationInterface* configuration, filename_ = configuration->property(role + ".filename", default_filename); // override value with commandline flag, if present - if (FLAGS_nsr_signal_source.compare("-") != 0) filename_= FLAGS_nsr_signal_source; + if (FLAGS_signal_source.compare("-") != 0) filename_= FLAGS_signal_source; + if (FLAGS_s.compare("-") != 0) filename_= FLAGS_s; item_type_ = configuration->property(role + ".item_type", default_item_type); repeat_ = configuration->property(role + ".repeat", false); diff --git a/src/algorithms/signal_source/adapters/spir_file_signal_source.cc b/src/algorithms/signal_source/adapters/spir_file_signal_source.cc index e2e461376..3446406bb 100644 --- a/src/algorithms/signal_source/adapters/spir_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/spir_file_signal_source.cc @@ -34,17 +34,14 @@ #include #include #include -#include #include -#include "gnss_sdr_valve.h" #include "configuration_interface.h" +#include "gnss_sdr_flags.h" +#include "gnss_sdr_valve.h" using google::LogMessage; -DEFINE_string(spir_signal_source, "-", - "If defined, path to the file containing the NSR (byte to 2-bit packed) signal samples (overrides the configuration file)"); - SpirFileSignalSource::SpirFileSignalSource(ConfigurationInterface* configuration, std::string role, unsigned int in_streams, unsigned int out_streams, @@ -60,7 +57,8 @@ SpirFileSignalSource::SpirFileSignalSource(ConfigurationInterface* configuration filename_ = configuration->property(role + ".filename", default_filename); // override value with commandline flag, if present - if (FLAGS_spir_signal_source.compare("-") != 0) filename_= FLAGS_spir_signal_source; + if (FLAGS_signal_source.compare("-") != 0) filename_= FLAGS_signal_source; + if (FLAGS_s.compare("-") != 0) filename_= FLAGS_s; item_type_ = configuration->property(role + ".item_type", default_item_type); repeat_ = configuration->property(role + ".repeat", false); diff --git a/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc b/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc index a797edfa4..4aa79fb12 100644 --- a/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc @@ -34,8 +34,8 @@ #include #include #include -#include #include +#include "gnss_sdr_flags.h" #include "gnss_sdr_valve.h" #include "configuration_interface.h" @@ -57,7 +57,8 @@ TwoBitCpxFileSignalSource::TwoBitCpxFileSignalSource(ConfigurationInterface* con filename_ = configuration->property(role + ".filename", default_filename); // override value with commandline flag, if present - //if (FLAGS_nsr_signal_source.compare("-") != 0) filename_= FLAGS_nsr_signal_source; + if (FLAGS_signal_source.compare("-") != 0) filename_= FLAGS_signal_source; + if (FLAGS_s.compare("-") != 0) filename_= FLAGS_s; item_type_ = configuration->property(role + ".item_type", default_item_type); repeat_ = configuration->property(role + ".repeat", false); diff --git a/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc b/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc index d4550d4fe..3e0712c8a 100644 --- a/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc @@ -35,11 +35,12 @@ #include #include #include -#include #include +#include +#include "gnss_sdr_flags.h" #include "gnss_sdr_valve.h" #include "configuration_interface.h" -#include + using google::LogMessage; @@ -61,7 +62,8 @@ TwoBitPackedFileSignalSource::TwoBitPackedFileSignalSource(ConfigurationInterfac filename_ = configuration->property(role + ".filename", default_filename); // override value with commandline flag, if present - //if (FLAGS_nsr_signal_source.compare("-") != 0) filename_= FLAGS_nsr_signal_source; + if (FLAGS_signal_source.compare("-") != 0) filename_= FLAGS_signal_source; + if (FLAGS_s.compare("-") != 0) filename_= FLAGS_s; item_type_ = configuration->property(role + ".item_type", default_item_type); big_endian_items_ = configuration->property(role + ".big_endian_items", true); diff --git a/src/core/receiver/control_thread.cc b/src/core/receiver/control_thread.cc index 73b05651c..72b91e956 100644 --- a/src/core/receiver/control_thread.cc +++ b/src/core/receiver/control_thread.cc @@ -57,6 +57,7 @@ #include "concurrent_queue.h" #include "concurrent_map.h" #include "gnss_flowgraph.h" +#include "gnss_sdr_flags.h" #include "file_configuration.h" #include "control_message_factory.h" @@ -66,11 +67,18 @@ extern concurrent_queue global_gps_acq_assist_queue; using google::LogMessage; DEFINE_string(config_file, std::string(GNSSSDR_INSTALL_DIR "/share/gnss-sdr/conf/default.conf"), - "File containing the configuration parameters"); + "Path to the configuration file"); ControlThread::ControlThread() { + if(!FLAGS_c.compare("-")) + { configuration_ = std::make_shared(FLAGS_config_file); + } + else + { + configuration_ = std::make_shared(FLAGS_c); + } delete_configuration_ = false; init(); } diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt index e1c2870cb..cbacdafff 100644 --- a/src/main/CMakeLists.txt +++ b/src/main/CMakeLists.txt @@ -57,6 +57,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/core/libs/supl ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl + ${CMAKE_SOURCE_DIR}/src/algorithms/libs ${GLOG_INCLUDE_DIRS} ${GFlags_INCLUDE_DIRS} ${ARMADILLO_INCLUDE_DIRS} @@ -95,6 +96,7 @@ target_link_libraries(gnss-sdr ${MAC_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${GNSS_SDR_OPTIONAL_LIBS} gnss_sp_libs + gnss_sdr_flags gnss_rx ) diff --git a/src/main/main.cc b/src/main/main.cc index ede009fb9..af45ab3a7 100644 --- a/src/main/main.cc +++ b/src/main/main.cc @@ -8,7 +8,7 @@ * * ------------------------------------------------------------------------- * -* Copyright (C) 2010-2017 (see AUTHORS file for a list of contributors) +* Copyright (C) 2010-2018 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -30,6 +30,7 @@ * * ------------------------------------------------------------------------- */ + #ifndef GNSS_SDR_VERSION #define GNSS_SDR_VERSION "0.0.9" #endif @@ -44,11 +45,11 @@ #include #include #include -#include #include #include "control_thread.h" #include "concurrent_queue.h" #include "concurrent_map.h" +#include "gnss_sdr_flags.h" #if CUDA_GPU_ACCEL // For the CUDA runtime routines (prefixed with "cuda_") @@ -58,7 +59,6 @@ using google::LogMessage; -DECLARE_string(log_dir); /* * Concurrent queues that communicates the Telemetry Decoder @@ -74,7 +74,7 @@ int main(int argc, char** argv) const std::string intro_help( std::string("\nGNSS-SDR is an Open Source GNSS Software Defined Receiver\n") + - "Copyright (C) 2010-2017 (see AUTHORS file for a list of contributors)\n" + "Copyright (C) 2010-2018 (see AUTHORS file for a list of contributors)\n" + "This program comes with ABSOLUTELY NO WARRANTY;\n" + diff --git a/src/utils/front-end-cal/CMakeLists.txt b/src/utils/front-end-cal/CMakeLists.txt index ce1457bd3..0402cfa45 100644 --- a/src/utils/front-end-cal/CMakeLists.txt +++ b/src/utils/front-end-cal/CMakeLists.txt @@ -31,7 +31,6 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/core/libs/supl ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl - ${CMAKE_SOURCE_DIR}/src/algorithms/libs ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/adapters ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/gnuradio_blocks ${GLOG_INCLUDE_DIRS} @@ -62,7 +61,6 @@ target_link_libraries(front_end_cal_lib ${MAC_LIBRARIES} rx_core_lib gnss_rx channel_fsm - gnss_sp_libs ) add_dependencies(front_end_cal_lib glog-${glog_RELEASE} armadillo-${armadillo_RELEASE}) @@ -90,7 +88,6 @@ target_link_libraries(front-end-cal ${MAC_LIBRARIES} ${GNSS_SDR_OPTIONAL_LIBS} rx_core_lib gnss_rx - gnss_sp_libs front_end_cal_lib ) diff --git a/src/utils/front-end-cal/front_end_cal.cc b/src/utils/front-end-cal/front_end_cal.cc index 233abc45a..506054363 100644 --- a/src/utils/front-end-cal/front_end_cal.cc +++ b/src/utils/front-end-cal/front_end_cal.cc @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include