1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-06-30 17:12:53 +00:00

Fix CMakeLists files, clean dependencies relationships

This commit is contained in:
Carles Fernandez 2020-02-10 12:17:10 +01:00
parent edc6444e5b
commit ce9d4b48e9
4 changed files with 6 additions and 17 deletions

View File

@ -27,8 +27,8 @@ target_link_libraries(obs_adapters
PUBLIC PUBLIC
obs_gr_blocks obs_gr_blocks
algorithms_libs algorithms_libs
observables_libs
PRIVATE PRIVATE
observables_libs
Gflags::gflags Gflags::gflags
Glog::glog Glog::glog
) )

View File

@ -36,8 +36,8 @@ target_link_libraries(obs_gr_blocks
PUBLIC PUBLIC
Boost::headers Boost::headers
Gnuradio::blocks Gnuradio::blocks
PRIVATE
observables_libs observables_libs
PRIVATE
algorithms_libs algorithms_libs
core_system_parameters core_system_parameters
Gflags::gflags Gflags::gflags

View File

@ -18,14 +18,6 @@ add_library(observables_libs
${OBSERVABLES_LIB_HEADERS} ${OBSERVABLES_LIB_HEADERS}
) )
target_link_libraries(observables_libs
PRIVATE
Gflags::gflags
Glog::glog
algorithms_libs
core_system_parameters
)
if(ENABLE_CLANG_TIDY) if(ENABLE_CLANG_TIDY)
if(CLANG_TIDY_EXE) if(CLANG_TIDY_EXE)
set_target_properties(observables_libs set_target_properties(observables_libs

View File

@ -18,11 +18,9 @@
* ------------------------------------------------------------------------- * -------------------------------------------------------------------------
*/ */
#ifndef GNSS_SDR_OBS_CONF_H_ #ifndef GNSS_SDR_OBS_CONF_H
#define GNSS_SDR_OBS_CONF_H_ #define GNSS_SDR_OBS_CONF_H
#include "configuration_interface.h"
#include <cstddef>
#include <cstdint> #include <cstdint>
#include <string> #include <string>
@ -31,13 +29,12 @@ class Obs_Conf
public: public:
bool enable_carrier_smoothing; bool enable_carrier_smoothing;
double smoothing_factor; double smoothing_factor;
unsigned int nchannels_in; uint32_t nchannels_in;
unsigned int nchannels_out; uint32_t nchannels_out;
bool dump; bool dump;
bool dump_mat; bool dump_mat;
std::string dump_filename; std::string dump_filename;
Obs_Conf(); Obs_Conf();
}; };