From ee84f60fb405c8bab4296346b68cf63e303065c8 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sat, 13 Jun 2020 10:56:49 +0200
Subject: [PATCH] Simplify CMake scripts

---
 CMakeLists.txt                                      | 3 +++
 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 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60abcb35c..dd040f4b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -535,6 +535,9 @@ set_package_properties(GNURADIO PROPERTIES
     TYPE REQUIRED
 )
 
+if(NOT (GNURADIO_VERSION VERSION_LESS "3.8"))
+    set(GNURADIO_IS_38_OR_GREATER ON)
+endif()
 
 
 ################################################################################
diff --git a/src/algorithms/input_filter/adapters/CMakeLists.txt b/src/algorithms/input_filter/adapters/CMakeLists.txt
index 39025e4d5..546332144 100644
--- a/src/algorithms/input_filter/adapters/CMakeLists.txt
+++ b/src/algorithms/input_filter/adapters/CMakeLists.txt
@@ -54,7 +54,7 @@ target_link_libraries(input_filter_adapters
         Volk::volk
 )
 
-if(NOT (GNURADIO_VERSION VERSION_LESS "3.8"))
+if(GNURADIO_IS_38_OR_GREATER)
     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 51a42a49b..fe494fdfe 100644
--- a/src/algorithms/resampler/adapters/CMakeLists.txt
+++ b/src/algorithms/resampler/adapters/CMakeLists.txt
@@ -51,7 +51,7 @@ target_include_directories(resampler_adapters
         ${CMAKE_SOURCE_DIR}/src/core/interfaces
 )
 
-if(NOT (GNURADIO_VERSION VERSION_LESS "3.8"))
+if(GNURADIO_IS_38_OR_GREATER)
     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 2c123336f..33730afa6 100644
--- a/src/core/receiver/CMakeLists.txt
+++ b/src/core/receiver/CMakeLists.txt
@@ -73,7 +73,7 @@ if(ENABLE_RAW_UDP)
     target_compile_definitions(core_receiver PRIVATE -DRAW_UDP=1)
 endif()
 
-if(NOT (GNURADIO_VERSION VERSION_LESS "3.8"))
+if(GNURADIO_IS_38_OR_GREATER)
     target_compile_definitions(core_receiver PRIVATE -DGR_GREATER_38=1)
 endif()
 
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 5b05850fc..3277e85d3 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -213,7 +213,7 @@ endif()
 # Definitions
 ################################################################################
 
-if(NOT (GNURADIO_VERSION VERSION_LESS "3.8"))
+if(GNURADIO_IS_38_OR_GREATER)
     add_definitions(-DGR_GREATER_38=1)
 endif()