diff --git a/src/algorithms/resampler/adapters/CMakeLists.txt b/src/algorithms/resampler/adapters/CMakeLists.txt index 15bbff019..1a506dbe6 100644 --- a/src/algorithms/resampler/adapters/CMakeLists.txt +++ b/src/algorithms/resampler/adapters/CMakeLists.txt @@ -32,9 +32,9 @@ include_directories( ) -if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.11" ) +if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13" ) add_definitions( -DGR_GREATER_38=1 ) -endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.11" ) +endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13" ) file(GLOB RESAMPLER_ADAPTER_HEADERS "*.h") diff --git a/src/algorithms/resampler/adapters/fractional_resampler_conditioner.h b/src/algorithms/resampler/adapters/fractional_resampler_conditioner.h index 32d99da70..080d9c985 100644 --- a/src/algorithms/resampler/adapters/fractional_resampler_conditioner.h +++ b/src/algorithms/resampler/adapters/fractional_resampler_conditioner.h @@ -34,7 +34,11 @@ #define GNSS_SDR_FRACTIONAL_RESAMPLER_CONDITIONER_H_ #include +#ifdef GR_GREATER_38 +#include +#else #include +#endif #include "gnss_block_interface.h" class ConfigurationInterface; @@ -82,7 +86,11 @@ private: std::string dump_filename_; double sample_freq_in_; double sample_freq_out_; + #ifdef GR_GREATER_38 + gr::filter::mmse_resampler_cc::sptr resampler_; + #else gr::filter::fractional_resampler_cc::sptr resampler_; + #endif gr::block_sptr file_sink_; }; diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt index 7f981c472..aa96cb4dd 100644 --- a/src/core/receiver/CMakeLists.txt +++ b/src/core/receiver/CMakeLists.txt @@ -92,9 +92,9 @@ endif(ENABLE_FMCOMMS2) add_definitions(-DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}") -if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.11" ) +if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13" ) add_definitions( -DGR_GREATER_38=1 ) -endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.11" ) +endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13" ) include_directories(