From 01b6cad75dbb27a2e3468fac42228baf49e33b07 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 31 Aug 2018 13:58:45 +0200
Subject: [PATCH] Fix build with latest GNU Radio master (towards 3.8)

---
 src/algorithms/input_filter/adapters/pulse_blanking_filter.h | 4 ++++
 src/algorithms/resampler/adapters/CMakeLists.txt             | 4 ++--
 src/tests/CMakeLists.txt                                     | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/algorithms/input_filter/adapters/pulse_blanking_filter.h b/src/algorithms/input_filter/adapters/pulse_blanking_filter.h
index 0d9d17cb4..87f8c4994 100644
--- a/src/algorithms/input_filter/adapters/pulse_blanking_filter.h
+++ b/src/algorithms/input_filter/adapters/pulse_blanking_filter.h
@@ -35,7 +35,11 @@
 #include "gnss_block_interface.h"
 #include "pulse_blanking_cc.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>
+#endif
 #include <string>
 
 class ConfigurationInterface;
diff --git a/src/algorithms/resampler/adapters/CMakeLists.txt b/src/algorithms/resampler/adapters/CMakeLists.txt
index 886ad5487..7c3dc92a5 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.15" )
+if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4" )
      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")
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index ad11216d7..b9ee6a474 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -139,7 +139,7 @@ endif(Boost_VERSION LESS 105000)
 if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4" )
      add_definitions( -DGR_GREATER_38=1 )
 endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4" )
-message(STATUS "++++++++++++++++++++++++++++ ${PC_GNURADIO_RUNTIME_VERSION}")
+
 if(OPENSSL_FOUND)
     add_definitions( -DUSE_OPENSSL_FALLBACK=1 )
 endif(OPENSSL_FOUND)