Unify criteria in target definitions, more informative names

src/algorithms/PVT/adapters/CMakeLists.txt

@@ -8,7 +8,7 @@
 #
 
 
-if(CMAKE_VERSION VERSION_GREATER 3.13)
+if(USE_CMAKE_TARGET_SOURCES)
     add_library(pvt_adapters STATIC)
     target_sources(pvt_adapters
         PRIVATE
@@ -35,8 +35,11 @@ target_include_directories(pvt_adapters
         ${CMAKE_SOURCE_DIR}/src/core/interfaces
 )
 
-if(Boost_VERSION_STRING VERSION_LESS 1.58.0)
-    target_compile_definitions(pvt_adapters PRIVATE -DOLD_BOOST=1)
+if(USE_OLD_BOOST_MATH_COMMON_FACTOR)
+    target_compile_definitions(pvt_adapters
+        PRIVATE
+            -DUSE_OLD_BOOST_MATH_COMMON_FACTOR=1
+    )
 endif()
 
 if(ENABLE_CLANG_TIDY)

src/algorithms/PVT/adapters/rtklib_pvt.cc

@@ -30,7 +30,7 @@
 #include "rtklib_rtkpos.h"            // for rtkfree, rtkinit
 #include <glog/logging.h>             // for LOG
 #include <iostream>                   // for operator<<
-#if OLD_BOOST
+#if USE_OLD_BOOST_MATH_COMMON_FACTOR
 #include <boost/math/common_factor_rt.hpp>
 namespace bc = boost::math;
 #else

src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt

@@ -7,7 +7,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 
-if(CMAKE_VERSION VERSION_GREATER 3.13)
+if(USE_CMAKE_TARGET_SOURCES)
     add_library(pvt_gr_blocks STATIC)
     target_sources(pvt_gr_blocks
         PRIVATE
@@ -49,7 +49,7 @@ if(GNURADIO_USES_STD_POINTERS)
     )
 endif()
 
-if(CMAKE_VERSION VERSION_GREATER 3.1 AND NOT ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)))
+if(USE_GENERIC_LAMBDAS)
     set(has_generic_lambdas HAS_GENERIC_LAMBDA=1)
     set(no_has_generic_lambdas HAS_GENERIC_LAMBDA=0)
     target_compile_definitions(pvt_gr_blocks
@@ -73,14 +73,17 @@ if(ENABLE_CLANG_TIDY)
     endif()
 endif()
 
-if(Boost_VERSION_STRING VERSION_LESS 1.58.0)
-    target_compile_definitions(pvt_gr_blocks PRIVATE -DOLD_BOOST=1)
-endif()
-
-if(Boost_VERSION_STRING VERSION_GREATER 1.72.99)
+if(USE_OLD_BOOST_MATH_COMMON_FACTOR)
     target_compile_definitions(pvt_gr_blocks
         PRIVATE
-            -DBOOST_173_OR_GREATER=1
+            -DUSE_OLD_BOOST_MATH_COMMON_FACTOR=1
+    )
+endif()
+
+if(USE_BOOST_BIND_PLACEHOLDERS)
+    target_compile_definitions(pvt_gr_blocks
+        PRIVATE
+            -DUSE_BOOST_BIND_PLACEHOLDERS=1
     )
 endif()
 

src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc

@@ -96,7 +96,7 @@ namespace fs = boost::filesystem;
 namespace errorlib = boost::system;
 #endif
 
-#if OLD_BOOST
+#if USE_OLD_BOOST_MATH_COMMON_FACTOR
 #include <boost/math/common_factor_rt.hpp>
 namespace bc = boost::math;
 #else
@@ -194,7 +194,7 @@ rtklib_pvt_gs::rtklib_pvt_gs(uint32_t nchannels,
 #if HAS_GENERIC_LAMBDA
         [this](auto&& PH1) { msg_handler_telemetry(PH1); });
 #else
-#if BOOST_173_OR_GREATER
+#if USE_BOOST_BIND_PLACEHOLDERS
         boost::bind(&rtklib_pvt_gs::msg_handler_telemetry, this, boost::placeholders::_1));
 #else
         boost::bind(&rtklib_pvt_gs::msg_handler_telemetry, this, _1));

src/algorithms/PVT/libs/CMakeLists.txt

@@ -46,7 +46,7 @@ set(PVT_LIB_HEADERS
 list(SORT PVT_LIB_HEADERS)
 list(SORT PVT_LIB_SOURCES)
 
-if(CMAKE_VERSION VERSION_GREATER 3.13)
+if(USE_CMAKE_TARGET_SOURCES)
     add_library(pvt_libs STATIC)
     target_sources(pvt_libs
         PRIVATE
@@ -101,10 +101,10 @@ if(ENABLE_ARMA_NO_DEBUG)
     )
 endif()
 
-if(Boost_VERSION_STRING VERSION_GREATER 1.65.99)
+if(USE_BOOST_ASIO_IO_CONTEXT)
     target_compile_definitions(pvt_libs
         PUBLIC
-            -DBOOST_GREATER_1_65
+            -DUSE_BOOST_ASIO_IO_CONTEXT
     )
 endif()
 

src/algorithms/PVT/libs/monitor_pvt_udp_sink.h

@@ -28,7 +28,7 @@
 #include <string>
 #include <vector>
 
-#if BOOST_GREATER_1_65
+#if USE_BOOST_ASIO_IO_CONTEXT
 using b_io_context = boost::asio::io_context;
 #else
 using b_io_context = boost::asio::io_service;

src/algorithms/PVT/libs/rtcm.h

@@ -49,7 +49,7 @@
 #include <utility>
 #include <vector>
 
-#if BOOST_GREATER_1_65
+#if USE_BOOST_ASIO_IO_CONTEXT
 using b_io_context = boost::asio::io_context;
 #else
 using b_io_context = boost::asio::io_service;