mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-07 07:50:32 +00:00
Code Issues Releases Wiki Activity

Fix build with latest GNU Radio master (towards 3.8)

Browse Source
This commit is contained in:
Carles Fernandez 2018-08-31 13:58:45 +02:00
parent e4303d0fac
commit 01b6cad75d
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/algorithms/input_filter/adapters/pulse_blanking_filter.h
View File

@ -35,7 +35,11 @@
#include "gnss_block_interface.h" #include "gnss_block_interface.h"
#include "pulse_blanking_cc.h" #include "pulse_blanking_cc.h"
#include <gnuradio/blocks/file_sink.h> #include <gnuradio/blocks/file_sink.h>
#ifdef GR_GREATER_38
#include <gnuradio/filter/freq_xlating_fir_filter.h>
#else
#include <gnuradio/filter/freq_xlating_fir_filter_ccf.h> #include <gnuradio/filter/freq_xlating_fir_filter_ccf.h>
#endif
#include <string> #include <string>
class ConfigurationInterface; class ConfigurationInterface;

4
src/algorithms/resampler/adapters/CMakeLists.txt
View File

@ -32,9 +32,9 @@ include_directories(
) )
if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.15" ) if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4" )
add_definitions( -DGR_GREATER_38=1 ) add_definitions( -DGR_GREATER_38=1 )
endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.15" ) endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4" )
file(GLOB RESAMPLER_ADAPTER_HEADERS "*.h") file(GLOB RESAMPLER_ADAPTER_HEADERS "*.h")

2
src/tests/CMakeLists.txt
View File

@ -139,7 +139,7 @@ endif(Boost_VERSION LESS 105000)
if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4" ) if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4" )
add_definitions( -DGR_GREATER_38=1 ) add_definitions( -DGR_GREATER_38=1 )
endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4" ) endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4" )
message(STATUS "++++++++++++++++++++++++++++ ${PC_GNURADIO_RUNTIME_VERSION}")
if(OPENSSL_FOUND) if(OPENSSL_FOUND)
add_definitions( -DUSE_OPENSSL_FALLBACK=1 ) add_definitions( -DUSE_OPENSSL_FALLBACK=1 )
endif(OPENSSL_FOUND) endif(OPENSSL_FOUND)