From f5f255b28d2c412355d8f26cd77ea47a030f567e Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 25 Apr 2019 10:41:57 +0200 Subject: [PATCH] Fix building with new version of GNU Radio 3.7.13.5 maint --- src/algorithms/input_filter/adapters/CMakeLists.txt | 2 +- src/algorithms/resampler/adapters/CMakeLists.txt | 2 +- src/core/receiver/CMakeLists.txt | 2 +- src/tests/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/algorithms/input_filter/adapters/CMakeLists.txt b/src/algorithms/input_filter/adapters/CMakeLists.txt index 8459dea90..19583570e 100644 --- a/src/algorithms/input_filter/adapters/CMakeLists.txt +++ b/src/algorithms/input_filter/adapters/CMakeLists.txt @@ -62,7 +62,7 @@ target_include_directories(input_filter_adapters ${CMAKE_SOURCE_DIR}/src/core/interfaces ) -if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4") +if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.20") target_compile_definitions(input_filter_adapters PUBLIC -DGR_GREATER_38=1) endif() diff --git a/src/algorithms/resampler/adapters/CMakeLists.txt b/src/algorithms/resampler/adapters/CMakeLists.txt index 18554d352..398187b46 100644 --- a/src/algorithms/resampler/adapters/CMakeLists.txt +++ b/src/algorithms/resampler/adapters/CMakeLists.txt @@ -52,7 +52,7 @@ target_include_directories(resampler_adapters ${CMAKE_SOURCE_DIR}/src/core/interfaces ) -if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4") +if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.20") target_compile_definitions(resampler_adapters PUBLIC -DGR_GREATER_38=1) endif() diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt index d18eaa976..7ce6380c3 100644 --- a/src/core/receiver/CMakeLists.txt +++ b/src/core/receiver/CMakeLists.txt @@ -84,7 +84,7 @@ if(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.3) target_compile_definitions(core_receiver PRIVATE -DMODERN_GNURADIO=1) endif() -if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4") +if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.20") target_compile_definitions(core_receiver PRIVATE -DGR_GREATER_38=1) endif() diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 4509fcf99..4e9e586c1 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -141,7 +141,7 @@ endif() # Definitions ################################################################################ -if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4") +if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.20") add_definitions(-DGR_GREATER_38=1) endif()