mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-10-02 17:00:50 +00:00
Fix compilation in GNU Radio 3.7.12.git
This commit is contained in:
parent
149ceaa366
commit
3988a68592
@ -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 )
|
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")
|
file(GLOB RESAMPLER_ADAPTER_HEADERS "*.h")
|
||||||
|
@ -34,7 +34,11 @@
|
|||||||
#define GNSS_SDR_FRACTIONAL_RESAMPLER_CONDITIONER_H_
|
#define GNSS_SDR_FRACTIONAL_RESAMPLER_CONDITIONER_H_
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#ifdef GR_GREATER_38
|
||||||
|
#include <gnuradio/filter/mmse_resampler_cc.h>
|
||||||
|
#else
|
||||||
#include <gnuradio/filter/fractional_resampler_cc.h>
|
#include <gnuradio/filter/fractional_resampler_cc.h>
|
||||||
|
#endif
|
||||||
#include "gnss_block_interface.h"
|
#include "gnss_block_interface.h"
|
||||||
|
|
||||||
class ConfigurationInterface;
|
class ConfigurationInterface;
|
||||||
@ -82,7 +86,11 @@ private:
|
|||||||
std::string dump_filename_;
|
std::string dump_filename_;
|
||||||
double sample_freq_in_;
|
double sample_freq_in_;
|
||||||
double sample_freq_out_;
|
double sample_freq_out_;
|
||||||
|
#ifdef GR_GREATER_38
|
||||||
|
gr::filter::mmse_resampler_cc::sptr resampler_;
|
||||||
|
#else
|
||||||
gr::filter::fractional_resampler_cc::sptr resampler_;
|
gr::filter::fractional_resampler_cc::sptr resampler_;
|
||||||
|
#endif
|
||||||
gr::block_sptr file_sink_;
|
gr::block_sptr file_sink_;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -92,9 +92,9 @@ endif(ENABLE_FMCOMMS2)
|
|||||||
|
|
||||||
add_definitions(-DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}")
|
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 )
|
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(
|
include_directories(
|
||||||
|
Loading…
Reference in New Issue
Block a user