From 0df4277d3625b024600ff5c2fa856e683755cd88 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 13 Jun 2020 00:32:40 +0200 Subject: [PATCH] Unify criteria in target definitions, more informative names --- CMakeLists.txt | 26 ++++++++++++- src/algorithms/PVT/adapters/CMakeLists.txt | 9 +++-- src/algorithms/PVT/adapters/rtklib_pvt.cc | 2 +- .../PVT/gnuradio_blocks/CMakeLists.txt | 19 ++++++---- .../PVT/gnuradio_blocks/rtklib_pvt_gs.cc | 4 +- src/algorithms/PVT/libs/CMakeLists.txt | 6 +-- .../PVT/libs/monitor_pvt_udp_sink.h | 2 +- src/algorithms/PVT/libs/rtcm.h | 2 +- .../acquisition/adapters/CMakeLists.txt | 2 +- .../gnuradio_blocks/CMakeLists.txt | 2 +- .../acquisition/libs/CMakeLists.txt | 2 +- .../channel/adapters/CMakeLists.txt | 2 +- src/algorithms/channel/libs/CMakeLists.txt | 8 ++-- .../channel/libs/channel_msg_receiver_cc.cc | 2 +- .../conditioner/adapters/CMakeLists.txt | 2 +- .../data_type_adapter/adapters/CMakeLists.txt | 2 +- .../gnuradio_blocks/CMakeLists.txt | 2 +- .../input_filter/adapters/CMakeLists.txt | 2 +- .../gnuradio_blocks/CMakeLists.txt | 2 +- src/algorithms/libs/CMakeLists.txt | 4 +- src/algorithms/libs/rtklib/CMakeLists.txt | 2 +- .../observables/adapters/CMakeLists.txt | 2 +- .../gnuradio_blocks/CMakeLists.txt | 8 ++-- .../gnuradio_blocks/hybrid_observables_gs.cc | 2 +- .../observables/libs/CMakeLists.txt | 2 +- .../resampler/adapters/CMakeLists.txt | 2 +- .../resampler/gnuradio_blocks/CMakeLists.txt | 2 +- .../signal_generator/adapters/CMakeLists.txt | 2 +- .../gnuradio_blocks/CMakeLists.txt | 2 +- .../signal_source/adapters/CMakeLists.txt | 2 +- .../gnuradio_blocks/CMakeLists.txt | 12 +++--- .../rtl_tcp_signal_source_c.cc | 4 +- .../gnuradio_blocks/rtl_tcp_signal_source_c.h | 2 +- .../signal_source/libs/CMakeLists.txt | 2 +- .../telemetry_decoder/adapters/CMakeLists.txt | 2 +- .../gnuradio_blocks/CMakeLists.txt | 2 +- .../telemetry_decoder/libs/CMakeLists.txt | 2 +- .../libs/libswiftcnav/CMakeLists.txt | 2 +- .../tracking/adapters/CMakeLists.txt | 2 +- .../tracking/gnuradio_blocks/CMakeLists.txt | 8 ++-- .../gnuradio_blocks/dll_pll_veml_tracking.cc | 2 +- .../dll_pll_veml_tracking_fpga.cc | 2 +- ...glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc | 2 +- ...glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc | 2 +- ...glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc | 2 +- ...glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc | 2 +- src/algorithms/tracking/libs/CMakeLists.txt | 6 +-- .../tracking/libs/tcp_communication.h | 2 +- src/core/libs/CMakeLists.txt | 8 ++-- src/core/libs/channel_status_msg_receiver.cc | 2 +- src/core/libs/supl/CMakeLists.txt | 2 +- src/core/monitor/CMakeLists.txt | 6 +-- src/core/monitor/gnss_synchro_udp_sink.h | 2 +- src/core/receiver/CMakeLists.txt | 6 +-- src/core/receiver/tcp_cmd_interface.cc | 2 +- src/core/system_parameters/CMakeLists.txt | 2 +- src/main/CMakeLists.txt | 2 +- src/tests/CMakeLists.txt | 38 +++++++++---------- src/tests/system-tests/libs/CMakeLists.txt | 2 +- .../acquisition/acq_performance_test.cc | 2 +- .../beidou_b1i_pcps_acquisition_test.cc | 2 +- .../beidou_b3i_pcps_acquisition_test.cc | 2 +- ...8ms_ambiguous_acquisition_gsoc2013_test.cc | 2 +- ...cps_ambiguous_acquisition_gsoc2013_test.cc | 2 +- ...e1_pcps_ambiguous_acquisition_gsoc_test.cc | 2 +- ...ileo_e1_pcps_ambiguous_acquisition_test.cc | 2 +- ...wsr_ambiguous_acquisition_gsoc2013_test.cc | 2 +- ...ync_ambiguous_acquisition_gsoc2014_test.cc | 2 +- ...ong_ambiguous_acquisition_gsoc2013_test.cc | 2 +- ...cps_acquisition_gsoc2014_gensource_test.cc | 2 +- ...ss_l1_ca_pcps_acquisition_gsoc2017_test.cc | 2 +- .../glonass_l1_ca_pcps_acquisition_test.cc | 2 +- .../glonass_l2_ca_pcps_acquisition_test.cc | 2 +- ...ps_l1_ca_pcps_acquisition_gsoc2013_test.cc | 2 +- .../gps_l1_ca_pcps_acquisition_test.cc | 2 +- ...a_pcps_opencl_acquisition_gsoc2013_test.cc | 2 +- ...cps_quicksync_acquisition_gsoc2014_test.cc | 2 +- ..._ca_pcps_tong_acquisition_gsoc2013_test.cc | 2 +- .../gps_l2_m_pcps_acquisition_test.cc | 2 +- .../libs/CMakeLists.txt | 8 ++-- .../libs/acquisition_msg_rx.cc | 2 +- .../observables/hybrid_observables_test.cc | 4 +- .../hybrid_observables_test_fpga.cc | 2 +- .../gps_l1_ca_telemetry_decoder_test.cc | 2 +- ...onass_l1_ca_dll_pll_c_aid_tracking_test.cc | 2 +- .../glonass_l1_ca_dll_pll_tracking_test.cc | 2 +- .../gps_l1_ca_dll_pll_tracking_test.cc | 2 +- .../gps_l1_ca_dll_pll_tracking_test_fpga.cc | 2 +- .../tracking/gps_l1_ca_kf_tracking_test.cc | 2 +- .../gps_l2_m_dll_pll_tracking_test.cc | 2 +- .../tracking/tracking_pull-in_test.cc | 2 +- .../tracking/tracking_pull-in_test_fpga.cc | 2 +- src/utils/front-end-cal/CMakeLists.txt | 10 ++--- src/utils/front-end-cal/main.cc | 2 +- src/utils/rinex-tools/CMakeLists.txt | 2 +- src/utils/rinex2assist/CMakeLists.txt | 2 +- 96 files changed, 189 insertions(+), 159 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b912897de..459ce4d46 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -264,6 +264,18 @@ else() set(LOCAL_INSTALL_BASE_DIR ${CMAKE_BINARY_DIR}) endif() +# Determine if CMake scripts make use of target_sources() +if(CMAKE_VERSION VERSION_GREATER 3.13) + set(USE_CMAKE_TARGET_SOURCES ON) +endif() + +# Determine if we try to use generic lambdas +if(CMAKE_VERSION VERSION_GREATER 3.1 AND + NOT ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND + (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0))) + set(USE_GENERIC_LAMBDAS ON) +endif() + # Determine if we are using make or ninja if(CMAKE_MAKE_PROGRAM MATCHES "make") set(CMAKE_MAKE_PROGRAM_PRETTY_NAME "make") @@ -747,6 +759,14 @@ if(Boost_VERSION_STRING VERSION_GREATER 1.70.99) endif() endif() +if(Boost_VERSION_STRING VERSION_LESS 1.58.0) + set(USE_OLD_BOOST_MATH_COMMON_FACTOR ON) +endif() + +if(Boost_VERSION_STRING VERSION_GREATER 1.65.99) + set(USE_BOOST_ASIO_IO_CONTEXT ON) +endif() + if(Boost_VERSION_STRING VERSION_LESS 1.73) # Disable concepts to address https://github.com/boostorg/asio/issues/312 if(((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.9) OR @@ -778,6 +798,11 @@ if(Boost_VERSION_STRING VERSION_LESS 1.70.0) ) endif() +# Fix for Boost >= 1.73 +if(Boost_VERSION_STRING VERSION_GREATER 1.72.99) + set(USE_BOOST_BIND_PLACEHOLDERS ON) +endif() + ################################################################################ @@ -797,7 +822,6 @@ check_cxx_source_compiles(" ################################################################################ # Detect availability of std::put_time (Workaround for gcc < 5.0) ################################################################################ -include(CheckCXXSourceCompiles) check_cxx_source_compiles(" #include int main() diff --git a/src/algorithms/PVT/adapters/CMakeLists.txt b/src/algorithms/PVT/adapters/CMakeLists.txt index 2f0cf3f84..620dc6e7d 100644 --- a/src/algorithms/PVT/adapters/CMakeLists.txt +++ b/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) diff --git a/src/algorithms/PVT/adapters/rtklib_pvt.cc b/src/algorithms/PVT/adapters/rtklib_pvt.cc index 59be524cb..96827272a 100644 --- a/src/algorithms/PVT/adapters/rtklib_pvt.cc +++ b/src/algorithms/PVT/adapters/rtklib_pvt.cc @@ -30,7 +30,7 @@ #include "rtklib_rtkpos.h" // for rtkfree, rtkinit #include // for LOG #include // for operator<< -#if OLD_BOOST +#if USE_OLD_BOOST_MATH_COMMON_FACTOR #include namespace bc = boost::math; #else diff --git a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt index d5cb9dabc..87fb80cd9 100644 --- a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt +++ b/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() diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc index 77f2bef56..13c69ad4e 100644 --- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc +++ b/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 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)); diff --git a/src/algorithms/PVT/libs/CMakeLists.txt b/src/algorithms/PVT/libs/CMakeLists.txt index fdaf03804..4daa5f6f0 100644 --- a/src/algorithms/PVT/libs/CMakeLists.txt +++ b/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() diff --git a/src/algorithms/PVT/libs/monitor_pvt_udp_sink.h b/src/algorithms/PVT/libs/monitor_pvt_udp_sink.h index 297b140ec..bbecda420 100644 --- a/src/algorithms/PVT/libs/monitor_pvt_udp_sink.h +++ b/src/algorithms/PVT/libs/monitor_pvt_udp_sink.h @@ -28,7 +28,7 @@ #include #include -#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; diff --git a/src/algorithms/PVT/libs/rtcm.h b/src/algorithms/PVT/libs/rtcm.h index d90fd90b4..d5acace77 100644 --- a/src/algorithms/PVT/libs/rtcm.h +++ b/src/algorithms/PVT/libs/rtcm.h @@ -49,7 +49,7 @@ #include #include -#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; diff --git a/src/algorithms/acquisition/adapters/CMakeLists.txt b/src/algorithms/acquisition/adapters/CMakeLists.txt index b2747381d..fc0fc4477 100644 --- a/src/algorithms/acquisition/adapters/CMakeLists.txt +++ b/src/algorithms/acquisition/adapters/CMakeLists.txt @@ -80,7 +80,7 @@ endif() list(SORT ACQ_ADAPTER_HEADERS) list(SORT ACQ_ADAPTER_SOURCES) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(acquisition_adapters STATIC) target_sources(acquisition_adapters PRIVATE diff --git a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt index 6dc51cf5a..f414fbcf3 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt @@ -43,7 +43,7 @@ endif() list(SORT ACQ_GR_BLOCKS_HEADERS) list(SORT ACQ_GR_BLOCKS_SOURCES) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(acquisition_gr_blocks STATIC) target_sources(acquisition_gr_blocks PRIVATE diff --git a/src/algorithms/acquisition/libs/CMakeLists.txt b/src/algorithms/acquisition/libs/CMakeLists.txt index 0d766d601..d96efdcd7 100644 --- a/src/algorithms/acquisition/libs/CMakeLists.txt +++ b/src/algorithms/acquisition/libs/CMakeLists.txt @@ -18,7 +18,7 @@ endif() list(SORT ACQUISITION_LIB_HEADERS) list(SORT ACQUISITION_LIB_SOURCES) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(acquisition_libs STATIC) target_sources(acquisition_libs PRIVATE diff --git a/src/algorithms/channel/adapters/CMakeLists.txt b/src/algorithms/channel/adapters/CMakeLists.txt index 39a7993c7..774607f67 100644 --- a/src/algorithms/channel/adapters/CMakeLists.txt +++ b/src/algorithms/channel/adapters/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(channel_adapters STATIC) target_sources(channel_adapters PRIVATE diff --git a/src/algorithms/channel/libs/CMakeLists.txt b/src/algorithms/channel/libs/CMakeLists.txt index 5be88b305..4e933a3c3 100644 --- a/src/algorithms/channel/libs/CMakeLists.txt +++ b/src/algorithms/channel/libs/CMakeLists.txt @@ -20,7 +20,7 @@ set(CHANNEL_FSM_HEADERS list(SORT CHANNEL_FSM_HEADERS) list(SORT CHANNEL_FSM_SOURCES) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(channel_libs STATIC) target_sources(channel_libs PRIVATE @@ -56,7 +56,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(channel_libs @@ -71,10 +71,10 @@ else() ) endif() -if(Boost_VERSION_STRING VERSION_GREATER 1.72.99) +if(USE_BOOST_BIND_PLACEHOLDERS) target_compile_definitions(channel_libs PRIVATE - -DBOOST_173_OR_GREATER=1 + -DUSE_BOOST_BIND_PLACEHOLDERS=1 ) endif() diff --git a/src/algorithms/channel/libs/channel_msg_receiver_cc.cc b/src/algorithms/channel/libs/channel_msg_receiver_cc.cc index b168a4575..58da05f2c 100644 --- a/src/algorithms/channel/libs/channel_msg_receiver_cc.cc +++ b/src/algorithms/channel/libs/channel_msg_receiver_cc.cc @@ -44,7 +44,7 @@ channel_msg_receiver_cc::channel_msg_receiver_cc(std::shared_ptr cha #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&channel_msg_receiver_cc::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&channel_msg_receiver_cc::msg_handler_events, this, _1)); diff --git a/src/algorithms/conditioner/adapters/CMakeLists.txt b/src/algorithms/conditioner/adapters/CMakeLists.txt index 80c580960..f1f3509a6 100644 --- a/src/algorithms/conditioner/adapters/CMakeLists.txt +++ b/src/algorithms/conditioner/adapters/CMakeLists.txt @@ -21,7 +21,7 @@ set(COND_ADAPTER_HEADERS list(SORT COND_ADAPTER_HEADERS) list(SORT COND_ADAPTER_SOURCES) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(conditioner_adapters STATIC) target_sources(conditioner_adapters PRIVATE diff --git a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt index ebb2a094f..e1a94d151 100644 --- a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt +++ b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt @@ -29,7 +29,7 @@ set(DATATYPE_ADAPTER_HEADERS list(SORT DATATYPE_ADAPTER_HEADERS) list(SORT DATATYPE_ADAPTER_SOURCES) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(data_type_adapters STATIC) target_sources(data_type_adapters PRIVATE diff --git a/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt b/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt index 0297eee3d..495a9bcd4 100644 --- a/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt @@ -23,7 +23,7 @@ set(DATA_TYPE_GR_BLOCKS_HEADERS list(SORT DATA_TYPE_GR_BLOCKS_HEADERS) list(SORT DATA_TYPE_GR_BLOCKS_SOURCES) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(data_type_gr_blocks STATIC) target_sources(data_type_gr_blocks PRIVATE diff --git a/src/algorithms/input_filter/adapters/CMakeLists.txt b/src/algorithms/input_filter/adapters/CMakeLists.txt index f27169b04..39025e4d5 100644 --- a/src/algorithms/input_filter/adapters/CMakeLists.txt +++ b/src/algorithms/input_filter/adapters/CMakeLists.txt @@ -28,7 +28,7 @@ set(INPUT_FILTER_ADAPTER_HEADERS list(SORT INPUT_FILTER_ADAPTER_HEADERS) list(SORT INPUT_FILTER_ADAPTER_SOURCES) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(input_filter_adapters STATIC) target_sources(input_filter_adapters PRIVATE diff --git a/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt b/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt index 1105e6e98..46ed867d2 100644 --- a/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt @@ -25,7 +25,7 @@ set(INPUT_FILTER_GR_BLOCKS_HEADERS list(SORT INPUT_FILTER_GR_BLOCKS_HEADERS) list(SORT INPUT_FILTER_GR_BLOCKS_SOURCES) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(input_filter_gr_blocks STATIC) target_sources(input_filter_gr_blocks PRIVATE diff --git a/src/algorithms/libs/CMakeLists.txt b/src/algorithms/libs/CMakeLists.txt index 4b57638f6..a39884468 100644 --- a/src/algorithms/libs/CMakeLists.txt +++ b/src/algorithms/libs/CMakeLists.txt @@ -71,7 +71,7 @@ endif() list(SORT GNSS_SPLIBS_HEADERS) list(SORT GNSS_SPLIBS_SOURCES) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(algorithms_libs STATIC) target_sources(algorithms_libs PRIVATE @@ -189,7 +189,7 @@ endif() ############################################################################### -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(gnss_sdr_flags STATIC) target_sources(gnss_sdr_flags PRIVATE diff --git a/src/algorithms/libs/rtklib/CMakeLists.txt b/src/algorithms/libs/rtklib/CMakeLists.txt index d9e9491f8..ed59fe391 100644 --- a/src/algorithms/libs/rtklib/CMakeLists.txt +++ b/src/algorithms/libs/rtklib/CMakeLists.txt @@ -52,7 +52,7 @@ set(RTKLIB_LIB_HEADERS list(SORT RTKLIB_LIB_HEADERS) list(SORT RTKLIB_LIB_SOURCES) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(algorithms_libs_rtklib STATIC) target_sources(algorithms_libs_rtklib PRIVATE diff --git a/src/algorithms/observables/adapters/CMakeLists.txt b/src/algorithms/observables/adapters/CMakeLists.txt index d1dec4961..41323820d 100644 --- a/src/algorithms/observables/adapters/CMakeLists.txt +++ b/src/algorithms/observables/adapters/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(obs_adapters STATIC) target_sources(obs_adapters PRIVATE diff --git a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt index ca76de937..e29a4788d 100644 --- a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/observables/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(obs_gr_blocks STATIC) target_sources(obs_gr_blocks PRIVATE @@ -54,7 +54,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(obs_gr_blocks @@ -69,10 +69,10 @@ else() ) endif() -if(Boost_VERSION_STRING VERSION_GREATER 1.72.99) +if(USE_BOOST_BIND_PLACEHOLDERS) target_compile_definitions(obs_gr_blocks PRIVATE - -DBOOST_173_OR_GREATER=1 + -DUSE_BOOST_BIND_PLACEHOLDERS=1 ) endif() diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc index cbd9569ca..b0dcf280f 100644 --- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc +++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc @@ -76,7 +76,7 @@ hybrid_observables_gs::hybrid_observables_gs(const Obs_Conf &conf_) : gr::block( #if HAS_GENERIC_LAMBDA [this](auto &&PH1) { msg_handler_pvt_to_observables(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&hybrid_observables_gs::msg_handler_pvt_to_observables, this, boost::placeholders::_1)); #else boost::bind(&hybrid_observables_gs::msg_handler_pvt_to_observables, this, _1)); diff --git a/src/algorithms/observables/libs/CMakeLists.txt b/src/algorithms/observables/libs/CMakeLists.txt index 319620d74..c44657385 100644 --- a/src/algorithms/observables/libs/CMakeLists.txt +++ b/src/algorithms/observables/libs/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(observables_libs STATIC) target_sources(observables_libs PRIVATE diff --git a/src/algorithms/resampler/adapters/CMakeLists.txt b/src/algorithms/resampler/adapters/CMakeLists.txt index 4865dd107..51a42a49b 100644 --- a/src/algorithms/resampler/adapters/CMakeLists.txt +++ b/src/algorithms/resampler/adapters/CMakeLists.txt @@ -21,7 +21,7 @@ set(RESAMPLER_ADAPTER_HEADERS list(SORT RESAMPLER_ADAPTER_HEADERS) list(SORT RESAMPLER_ADAPTER_SOURCES) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(resampler_adapters STATIC) target_sources(resampler_adapters PRIVATE diff --git a/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt b/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt index 9b4e7473c..3524ba4fa 100644 --- a/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt @@ -23,7 +23,7 @@ set(RESAMPLER_GR_BLOCKS_HEADERS list(SORT RESAMPLER_GR_BLOCKS_HEADERS) list(SORT RESAMPLER_GR_BLOCKS_SOURCES) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(resampler_gr_blocks STATIC) target_sources(resampler_gr_blocks PRIVATE diff --git a/src/algorithms/signal_generator/adapters/CMakeLists.txt b/src/algorithms/signal_generator/adapters/CMakeLists.txt index 7c07bfe47..69dc589c0 100644 --- a/src/algorithms/signal_generator/adapters/CMakeLists.txt +++ b/src/algorithms/signal_generator/adapters/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(signal_generator_adapters STATIC) target_sources(signal_generator_adapters PRIVATE diff --git a/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt index bd81a3d3c..4da329d81 100644 --- a/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/signal_generator/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(signal_generator_gr_blocks STATIC) target_sources(signal_generator_gr_blocks PRIVATE diff --git a/src/algorithms/signal_source/adapters/CMakeLists.txt b/src/algorithms/signal_source/adapters/CMakeLists.txt index c49ae30cf..c007652cc 100644 --- a/src/algorithms/signal_source/adapters/CMakeLists.txt +++ b/src/algorithms/signal_source/adapters/CMakeLists.txt @@ -125,7 +125,7 @@ set(SIGNAL_SOURCE_ADAPTER_HEADERS list(SORT SIGNAL_SOURCE_ADAPTER_HEADERS) list(SORT SIGNAL_SOURCE_ADAPTER_SOURCES) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(signal_source_adapters STATIC) target_sources(signal_source_adapters PRIVATE diff --git a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt index d1bf439a5..185768fd2 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt @@ -43,7 +43,7 @@ set(SIGNAL_SOURCE_GR_BLOCKS_HEADERS list(SORT SIGNAL_SOURCE_GR_BLOCKS_HEADERS) list(SORT SIGNAL_SOURCE_GR_BLOCKS_SOURCES) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(signal_source_gr_blocks STATIC) target_sources(signal_source_gr_blocks PRIVATE @@ -104,21 +104,21 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") endif() endif() -if(Boost_VERSION_STRING VERSION_GREATER 1.65.99) +if(USE_BOOST_ASIO_IO_CONTEXT) target_compile_definitions(signal_source_gr_blocks PUBLIC - -DBOOST_GREATER_1_65 + -DUSE_BOOST_ASIO_IO_CONTEXT ) endif() -if(Boost_VERSION_STRING VERSION_GREATER 1.72.99) +if(USE_BOOST_BIND_PLACEHOLDERS) target_compile_definitions(signal_source_gr_blocks PRIVATE - -DBOOST_173_OR_GREATER=1 + -DUSE_BOOST_BIND_PLACEHOLDERS=1 ) 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(signal_source_gr_blocks diff --git a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc index c94c0195a..d3485f525 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc +++ b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc @@ -134,7 +134,7 @@ rtl_tcp_signal_source_c::rtl_tcp_signal_source_c(const std::string &address, } // 6. Start reading -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::asio::async_read(socket_, boost::asio::buffer(data_), boost::bind(&rtl_tcp_signal_source_c::handle_read, this, boost::placeholders::_1, boost::placeholders::_2)); // NOLINT(modernize-avoid-bind) #else @@ -319,7 +319,7 @@ void rtl_tcp_signal_source_c::handle_read(const boost::system::error_code &ec, // let woker know that more data is available not_empty_.notify_one(); // Read some more -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::asio::async_read(socket_, boost::asio::buffer(data_), boost::bind(&rtl_tcp_signal_source_c::handle_read, this, boost::placeholders::_1, boost::placeholders::_2)); // NOLINT(modernize-avoid-bind) diff --git a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h index f730c1ba8..ee33591f6 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h +++ b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h @@ -51,7 +51,7 @@ using rtl_tcp_signal_source_c_sptr = std::shared_ptr; using rtl_tcp_signal_source_c_sptr = boost::shared_ptr; #endif -#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; diff --git a/src/algorithms/signal_source/libs/CMakeLists.txt b/src/algorithms/signal_source/libs/CMakeLists.txt index c9aa09e94..4678b83d8 100644 --- a/src/algorithms/signal_source/libs/CMakeLists.txt +++ b/src/algorithms/signal_source/libs/CMakeLists.txt @@ -36,7 +36,7 @@ set(SIGNAL_SOURCE_LIB_HEADERS list(SORT SIGNAL_SOURCE_LIB_HEADERS) list(SORT SIGNAL_SOURCE_LIB_SOURCES) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(signal_source_libs STATIC) target_sources(signal_source_libs PRIVATE diff --git a/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt b/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt index ca74329ed..b3361d57c 100644 --- a/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt +++ b/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt @@ -37,7 +37,7 @@ set(TELEMETRY_DECODER_ADAPTER_HEADERS list(SORT TELEMETRY_DECODER_ADAPTER_HEADERS) list(SORT TELEMETRY_DECODER_ADAPTER_SOURCES) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(telemetry_decoder_adapters STATIC) target_sources(telemetry_decoder_adapters PRIVATE diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt b/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt index 7ffbfa98e..4a2403a36 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt @@ -34,7 +34,7 @@ set(TELEMETRY_DECODER_GR_BLOCKS_HEADERS list(SORT TELEMETRY_DECODER_GR_BLOCKS_HEADERS) list(SORT TELEMETRY_DECODER_GR_BLOCKS_SOURCES) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(telemetry_decoder_gr_blocks STATIC) target_sources(telemetry_decoder_gr_blocks PRIVATE diff --git a/src/algorithms/telemetry_decoder/libs/CMakeLists.txt b/src/algorithms/telemetry_decoder/libs/CMakeLists.txt index 5e5f3eb37..70b35b8fa 100644 --- a/src/algorithms/telemetry_decoder/libs/CMakeLists.txt +++ b/src/algorithms/telemetry_decoder/libs/CMakeLists.txt @@ -22,7 +22,7 @@ set(TELEMETRY_DECODER_LIB_HEADERS list(SORT TELEMETRY_DECODER_LIB_HEADERS) list(SORT TELEMETRY_DECODER_LIB_SOURCES) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(telemetry_decoder_libs STATIC) target_sources(telemetry_decoder_libs PRIVATE diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt b/src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt index 41456f235..33725d274 100644 --- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt +++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt @@ -25,7 +25,7 @@ set(TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS list(SORT TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS) list(SORT TELEMETRY_DECODER_LIBSWIFTCNAV_SOURCES) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(telemetry_decoder_libswiftcnav STATIC) target_sources(telemetry_decoder_libswiftcnav PRIVATE diff --git a/src/algorithms/tracking/adapters/CMakeLists.txt b/src/algorithms/tracking/adapters/CMakeLists.txt index e8c40d1b4..f19e66baa 100644 --- a/src/algorithms/tracking/adapters/CMakeLists.txt +++ b/src/algorithms/tracking/adapters/CMakeLists.txt @@ -76,7 +76,7 @@ set(TRACKING_ADAPTER_HEADERS list(SORT TRACKING_ADAPTER_HEADERS) list(SORT TRACKING_ADAPTER_SOURCES) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(tracking_adapters STATIC) target_sources(tracking_adapters PRIVATE diff --git a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt index bf49f2841..45e24a6f2 100644 --- a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt @@ -61,7 +61,7 @@ set(TRACKING_GR_BLOCKS_HEADERS list(SORT TRACKING_GR_BLOCKS_HEADERS) list(SORT TRACKING_GR_BLOCKS_SOURCES) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(tracking_gr_blocks STATIC) target_sources(tracking_gr_blocks PRIVATE @@ -120,7 +120,7 @@ if(ENABLE_ARMA_NO_DEBUG) ) 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(tracking_gr_blocks @@ -135,10 +135,10 @@ else() ) endif() -if(Boost_VERSION_STRING VERSION_GREATER 1.72.99) +if(USE_BOOST_BIND_PLACEHOLDERS) target_compile_definitions(tracking_gr_blocks PRIVATE - -DBOOST_173_OR_GREATER=1 + -DUSE_BOOST_BIND_PLACEHOLDERS=1 ) endif() diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc index 4e1a00b44..3573a25fe 100644 --- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc +++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc @@ -101,7 +101,7 @@ dll_pll_veml_tracking::dll_pll_veml_tracking(const Dll_Pll_Conf &conf_) : gr::bl #if HAS_GENERIC_LAMBDA [this](auto &&PH1) { msg_handler_telemetry_to_trk(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&dll_pll_veml_tracking::msg_handler_telemetry_to_trk, this, boost::placeholders::_1)); #else boost::bind(&dll_pll_veml_tracking::msg_handler_telemetry_to_trk, this, _1)); diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc index bb594b604..3552dd3be 100644 --- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc +++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc @@ -91,7 +91,7 @@ dll_pll_veml_tracking_fpga::dll_pll_veml_tracking_fpga(const Dll_Pll_Conf_Fpga & #if HAS_GENERIC_LAMBDA [this](auto &&PH1) { msg_handler_telemetry_to_trk(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&dll_pll_veml_tracking_fpga::msg_handler_telemetry_to_trk, this, boost::placeholders::_1)); #else boost::bind(&dll_pll_veml_tracking_fpga::msg_handler_telemetry_to_trk, this, _1)); diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc index e93b12164..0379df914 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc @@ -115,7 +115,7 @@ glonass_l1_ca_dll_pll_c_aid_tracking_cc::glonass_l1_ca_dll_pll_c_aid_tracking_cc #if HAS_GENERIC_LAMBDA [this](auto &&PH1) { msg_handler_preamble_index(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&glonass_l1_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index, this, boost::placeholders::_1)); #else boost::bind(&glonass_l1_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index, this, _1)); diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc index 0548192d5..35b12f51b 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc @@ -112,7 +112,7 @@ glonass_l1_ca_dll_pll_c_aid_tracking_sc::glonass_l1_ca_dll_pll_c_aid_tracking_sc #if HAS_GENERIC_LAMBDA [this](auto &&PH1) { msg_handler_preamble_index(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&glonass_l1_ca_dll_pll_c_aid_tracking_sc::msg_handler_preamble_index, this, boost::placeholders::_1)); #else boost::bind(&glonass_l1_ca_dll_pll_c_aid_tracking_sc::msg_handler_preamble_index, this, _1)); diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc index 8bf9acdb8..1b6ec0a27 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc @@ -112,7 +112,7 @@ glonass_l2_ca_dll_pll_c_aid_tracking_cc::glonass_l2_ca_dll_pll_c_aid_tracking_cc #if HAS_GENERIC_LAMBDA [this](auto &&PH1) { msg_handler_preamble_index(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&glonass_l2_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index, this, boost::placeholders::_1)); #else boost::bind(&glonass_l2_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index, this, _1)); diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc index 3bb646ce4..2449bb26b 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc @@ -110,7 +110,7 @@ glonass_l2_ca_dll_pll_c_aid_tracking_sc::glonass_l2_ca_dll_pll_c_aid_tracking_sc #if HAS_GENERIC_LAMBDA [this](auto &&PH1) { msg_handler_preamble_index(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&glonass_l2_ca_dll_pll_c_aid_tracking_sc::msg_handler_preamble_index, this, boost::placeholders::_1)); #else boost::bind(&glonass_l2_ca_dll_pll_c_aid_tracking_sc::msg_handler_preamble_index, this, _1)); diff --git a/src/algorithms/tracking/libs/CMakeLists.txt b/src/algorithms/tracking/libs/CMakeLists.txt index a92c0f714..2f9128a38 100644 --- a/src/algorithms/tracking/libs/CMakeLists.txt +++ b/src/algorithms/tracking/libs/CMakeLists.txt @@ -73,7 +73,7 @@ endif() list(SORT TRACKING_LIB_HEADERS) list(SORT TRACKING_LIB_SOURCES) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(tracking_libs STATIC) target_sources(tracking_libs PRIVATE @@ -111,10 +111,10 @@ if(NOT CMAKE_VERSION VERSION_GREATER 3.11) ) endif() -if(Boost_VERSION_STRING VERSION_GREATER 1.65.99) +if(USE_BOOST_ASIO_IO_CONTEXT) target_compile_definitions(tracking_libs PUBLIC - -DBOOST_GREATER_1_65 + -DUSE_BOOST_ASIO_IO_CONTEXT ) endif() diff --git a/src/algorithms/tracking/libs/tcp_communication.h b/src/algorithms/tracking/libs/tcp_communication.h index 55d56e5c8..0d789fa65 100644 --- a/src/algorithms/tracking/libs/tcp_communication.h +++ b/src/algorithms/tracking/libs/tcp_communication.h @@ -25,7 +25,7 @@ #include #include -#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; diff --git a/src/core/libs/CMakeLists.txt b/src/core/libs/CMakeLists.txt index dd80ee92c..933654aa8 100644 --- a/src/core/libs/CMakeLists.txt +++ b/src/core/libs/CMakeLists.txt @@ -47,7 +47,7 @@ endif() list(SORT CORE_LIBS_HEADERS) list(SORT CORE_LIBS_SOURCES) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(core_libs STATIC) target_sources(core_libs PRIVATE @@ -80,7 +80,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(core_libs @@ -95,10 +95,10 @@ else() ) endif() -if(Boost_VERSION_STRING VERSION_GREATER 1.72.99) +if(USE_BOOST_BIND_PLACEHOLDERS) target_compile_definitions(core_libs PRIVATE - -DBOOST_173_OR_GREATER=1 + -DUSE_BOOST_BIND_PLACEHOLDERS=1 ) endif() diff --git a/src/core/libs/channel_status_msg_receiver.cc b/src/core/libs/channel_status_msg_receiver.cc index ba8e61ba0..63afb7172 100644 --- a/src/core/libs/channel_status_msg_receiver.cc +++ b/src/core/libs/channel_status_msg_receiver.cc @@ -45,7 +45,7 @@ channel_status_msg_receiver::channel_status_msg_receiver() : gr::block("channel_ #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&channel_status_msg_receiver::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&channel_status_msg_receiver::msg_handler_events, this, _1)); diff --git a/src/core/libs/supl/CMakeLists.txt b/src/core/libs/supl/CMakeLists.txt index 151d86cba..61e33df0e 100644 --- a/src/core/libs/supl/CMakeLists.txt +++ b/src/core/libs/supl/CMakeLists.txt @@ -16,7 +16,7 @@ list(SORT ASN_SUPL_SOURCES) file(GLOB ASN_SUPL_HEADERS "${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl/*.h") list(SORT ASN_SUPL_HEADERS) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(core_libs_supl STATIC) target_sources(core_libs_supl PRIVATE diff --git a/src/core/monitor/CMakeLists.txt b/src/core/monitor/CMakeLists.txt index 650ca63fb..02d73304f 100644 --- a/src/core/monitor/CMakeLists.txt +++ b/src/core/monitor/CMakeLists.txt @@ -23,7 +23,7 @@ set(CORE_MONITOR_LIBS_HEADERS list(SORT CORE_MONITOR_LIBS_HEADERS) list(SORT CORE_MONITOR_LIBS_SOURCES) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(core_monitor STATIC) target_sources(core_monitor PRIVATE @@ -68,10 +68,10 @@ if(GNURADIO_USES_STD_POINTERS) ) endif() -if(Boost_VERSION_STRING VERSION_GREATER 1.65.99) +if(USE_BOOST_ASIO_IO_CONTEXT) target_compile_definitions(core_monitor PUBLIC - -DBOOST_GREATER_1_65 + -DUSE_BOOST_ASIO_IO_CONTEXT ) endif() diff --git a/src/core/monitor/gnss_synchro_udp_sink.h b/src/core/monitor/gnss_synchro_udp_sink.h index 379977586..7944849fc 100644 --- a/src/core/monitor/gnss_synchro_udp_sink.h +++ b/src/core/monitor/gnss_synchro_udp_sink.h @@ -29,7 +29,7 @@ #include #include -#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; diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt index 108185ac1..2c123336f 100644 --- a/src/core/receiver/CMakeLists.txt +++ b/src/core/receiver/CMakeLists.txt @@ -44,7 +44,7 @@ set(GNSS_RECEIVER_INTERFACE_HEADERS list(SORT GNSS_RECEIVER_INTERFACE_HEADERS) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(core_receiver STATIC) target_sources(core_receiver PRIVATE @@ -126,10 +126,10 @@ if(ENABLE_CUDA) target_compile_definitions(core_receiver PRIVATE -DCUDA_GPU_ACCEL=1) endif() -if(Boost_VERSION_STRING VERSION_GREATER 1.65.99) +if(USE_BOOST_ASIO_IO_CONTEXT) target_compile_definitions(core_receiver PRIVATE - -DBOOST_GREATER_1_65 + -DUSE_BOOST_ASIO_IO_CONTEXT ) endif() diff --git a/src/core/receiver/tcp_cmd_interface.cc b/src/core/receiver/tcp_cmd_interface.cc index 5355c2d8f..98ae522f3 100644 --- a/src/core/receiver/tcp_cmd_interface.cc +++ b/src/core/receiver/tcp_cmd_interface.cc @@ -28,7 +28,7 @@ #include // for stringstream #include // for move -#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; diff --git a/src/core/system_parameters/CMakeLists.txt b/src/core/system_parameters/CMakeLists.txt index e4e8e586a..392fd47f0 100644 --- a/src/core/system_parameters/CMakeLists.txt +++ b/src/core/system_parameters/CMakeLists.txt @@ -83,7 +83,7 @@ set(SYSTEM_PARAMETERS_HEADERS list(SORT SYSTEM_PARAMETERS_HEADERS) list(SORT SYSTEM_PARAMETERS_SOURCES) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(core_system_parameters STATIC) target_sources(core_system_parameters PRIVATE diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt index e43666196..575494c3a 100644 --- a/src/main/CMakeLists.txt +++ b/src/main/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_executable(gnss-sdr) target_sources(gnss-sdr PRIVATE main.cc) else() diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index c3dc43cf6..7ced3a1af 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -449,7 +449,7 @@ include_directories(${LIST_INCLUDE_DIRS}) # Unit testing ################################################################################ if(ENABLE_UNIT_TESTING) - if(CMAKE_VERSION VERSION_GREATER 3.13) + if(USE_CMAKE_TARGET_SOURCES) add_executable(run_tests) target_sources(run_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/test_main.cc) else() @@ -547,7 +547,7 @@ if(ENABLE_UNIT_TESTING) ${CUDA_INCLUDE_DIRS} ) 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(run_tests @@ -561,10 +561,10 @@ if(ENABLE_UNIT_TESTING) -DHAS_GENERIC_LAMBDA=0 ) endif() - if(Boost_VERSION_STRING VERSION_GREATER 1.72.99) + if(USE_BOOST_BIND_PLACEHOLDERS) target_compile_definitions(run_tests PRIVATE - -DBOOST_173_OR_GREATER=1 + -DUSE_BOOST_BIND_PLACEHOLDERS=1 ) endif() endif() @@ -574,7 +574,7 @@ if(ENABLE_FPGA) ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc ) - if(CMAKE_VERSION VERSION_GREATER 3.13) + if(USE_CMAKE_TARGET_SOURCES) add_executable(gps_l1_ca_dll_pll_tracking_test_fpga) target_sources(gps_l1_ca_dll_pll_tracking_test_fpga PRIVATE ${GPS_L1_CA_DLL_PLL_TRACKING_TEST_FPGA_SOURCES}) else() @@ -632,7 +632,7 @@ function(add_system_test executable) if(NOT EXISTS ${LOCAL_INSTALL_BASE_DIR}/install/${executable}) execute_process(COMMAND ${CMAKE_COMMAND} -E touch ${SYSTEM_TEST_SOURCES}) endif() - if(CMAKE_VERSION VERSION_GREATER 3.13) + if(USE_CMAKE_TARGET_SOURCES) add_executable(${executable}) target_sources(${executable} PRIVATE ${SYSTEM_TEST_SOURCES}) else() @@ -748,7 +748,7 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/gnss_flowgraph_test.cc ) - if(CMAKE_VERSION VERSION_GREATER 3.13) + if(USE_CMAKE_TARGET_SOURCES) add_executable(flowgraph_test) target_sources(flowgraph_test PRIVATE ${FLOWGRAPH_TEST_SOURCES}) else() @@ -803,7 +803,7 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/adapter/adapter_test.cc ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/gnss_block_factory_test.cc ) - if(CMAKE_VERSION VERSION_GREATER 3.13) + if(USE_CMAKE_TARGET_SOURCES) add_executable(gnss_block_test) target_sources(gnss_block_test PRIVATE ${GNSS_BLOCK_TEST_SOURCES}) else() @@ -856,7 +856,7 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/sources/unpack_2bit_samples_test.cc ) - if(CMAKE_VERSION VERSION_GREATER 3.13) + if(USE_CMAKE_TARGET_SOURCES) add_executable(gnuradio_block_test) target_sources(gnuradio_block_test PRIVATE ${GNURADIO_BLOCK_TEST_SOURCES}) else() @@ -900,7 +900,7 @@ set(MATIO_TEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/arithmetic/matio_test.cc ) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_executable(matio_test) target_sources(matio_test PRIVATE ${MATIO_TEST_SOURCES}) else() @@ -938,7 +938,7 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc ) - if(CMAKE_VERSION VERSION_GREATER 3.13) + if(USE_CMAKE_TARGET_SOURCES) add_executable(acq_test) target_sources(acq_test PRIVATE ${ACQ_TEST_SOURCES}) else() @@ -973,7 +973,7 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) add_test(acq_test acq_test) - 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(acq_test @@ -987,10 +987,10 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) -DHAS_GENERIC_LAMBDA=0 ) endif() - if(Boost_VERSION_STRING VERSION_GREATER 1.72.99) + if(USE_BOOST_BIND_PLACEHOLDERS) target_compile_definitions(acq_test PRIVATE - -DBOOST_173_OR_GREATER=1 + -DUSE_BOOST_BIND_PLACEHOLDERS=1 ) endif() set_property(TEST acq_test PROPERTY TIMEOUT 30) @@ -1014,7 +1014,7 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/bayesian_estimation_test.cc ${NONLINEAR_SOURCES} ) - if(CMAKE_VERSION VERSION_GREATER 3.13) + if(USE_CMAKE_TARGET_SOURCES) add_executable(trk_test) target_sources(trk_test PRIVATE ${TRKTEST_SOURCES}) else() @@ -1049,7 +1049,7 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) signal_generator_gr_blocks core_receiver ) - 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(trk_test @@ -1063,10 +1063,10 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) -DHAS_GENERIC_LAMBDA=0 ) endif() - if(Boost_VERSION_STRING VERSION_GREATER 1.72.99) + if(USE_BOOST_BIND_PLACEHOLDERS) target_compile_definitions(trk_test PRIVATE - -DBOOST_173_OR_GREATER=1 + -DUSE_BOOST_BIND_PLACEHOLDERS=1 ) endif() @@ -1082,7 +1082,7 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/control_thread_test.cc ) - if(CMAKE_VERSION VERSION_GREATER 3.13) + if(USE_CMAKE_TARGET_SOURCES) add_executable(control_thread_test) target_sources(control_thread_test PRIVATE ${CONTROL_THREAD_TEST_SOURCES}) else() diff --git a/src/tests/system-tests/libs/CMakeLists.txt b/src/tests/system-tests/libs/CMakeLists.txt index 3db9dca38..8f7033e0d 100644 --- a/src/tests/system-tests/libs/CMakeLists.txt +++ b/src/tests/system-tests/libs/CMakeLists.txt @@ -16,7 +16,7 @@ set(SYSTEM_TESTING_LIB_SOURCES file(GLOB SYSTEM_TESTING_LIB_HEADERS "*.h") list(SORT SYSTEM_TESTING_LIB_HEADERS) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(system_testing_lib STATIC) target_sources(system_testing_lib PRIVATE diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc index 75c8760b9..e5a8bbc8e 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc @@ -161,7 +161,7 @@ AcqPerfTest_msg_rx::AcqPerfTest_msg_rx(Concurrent_Queue& queue) : gr::block #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&AcqPerfTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&AcqPerfTest_msg_rx::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1i_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1i_pcps_acquisition_test.cc index fd20afc78..e673da15b 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1i_pcps_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1i_pcps_acquisition_test.cc @@ -114,7 +114,7 @@ BeidouB1iPcpsAcquisitionTest_msg_rx::BeidouB1iPcpsAcquisitionTest_msg_rx() : gr: #if HAS_GENERIC_LAMBDA [this](auto &&PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&BeidouB1iPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&BeidouB1iPcpsAcquisitionTest_msg_rx::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b3i_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b3i_pcps_acquisition_test.cc index f14dfdddd..f25bcd583 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b3i_pcps_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b3i_pcps_acquisition_test.cc @@ -114,7 +114,7 @@ BeidouB3iPcpsAcquisitionTest_msg_rx::BeidouB3iPcpsAcquisitionTest_msg_rx() : gr: #if HAS_GENERIC_LAMBDA [this](auto &&PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&BeidouB3iPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&BeidouB3iPcpsAcquisitionTest_msg_rx::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc index 884509345..77db3ad53 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc @@ -107,7 +107,7 @@ GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1Pcps8msAmbiguo #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc index d86af8e3c..b5fd9a326 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc @@ -105,7 +105,7 @@ GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1PcpsAmbiguousAcqu #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc index cefa11014..50a5087b3 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc @@ -114,7 +114,7 @@ GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::GalileoE1PcpsAmbiguousAcquisit #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc index 50bc63946..182b61f82 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc @@ -126,7 +126,7 @@ GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::GalileoE1PcpsAmbiguousAcquisitionT #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc index 8a39cfa36..983b64bb5 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc @@ -108,7 +108,7 @@ GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::GalileoE1PcpsCccwsrAmbiguous #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc index 06ae77566..574fb1d62 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc @@ -110,7 +110,7 @@ GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::GalileoE1PcpsQuic #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc index 2601bb252..958a7e077 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc @@ -105,7 +105,7 @@ GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1PcpsTongAmbig #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc index e1b742f36..93d176472 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc @@ -101,7 +101,7 @@ GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::GalileoE5aPcpsAcquisition #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc index 5c9ef5251..4e74d04f7 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc @@ -107,7 +107,7 @@ GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::GlonassL1CaPcpsAcquisitionGSoC201 #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc index 811faca5e..4a79fe557 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc @@ -100,7 +100,7 @@ GlonassL1CaPcpsAcquisitionTest_msg_rx::GlonassL1CaPcpsAcquisitionTest_msg_rx() : #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&GlonassL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&GlonassL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l2_ca_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l2_ca_pcps_acquisition_test.cc index e3a474876..2a388c687 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l2_ca_pcps_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l2_ca_pcps_acquisition_test.cc @@ -105,7 +105,7 @@ GlonassL2CaPcpsAcquisitionTest_msg_rx::GlonassL2CaPcpsAcquisitionTest_msg_rx(con #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&GlonassL2CaPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&GlonassL2CaPcpsAcquisitionTest_msg_rx::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc index 9b52e0d5e..fa358e582 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc @@ -108,7 +108,7 @@ GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsAcquisitionGSoC2013Test_ms #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc index 59ea1fdbb..72ed9373e 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc @@ -124,7 +124,7 @@ GpsL1CaPcpsAcquisitionTest_msg_rx::GpsL1CaPcpsAcquisitionTest_msg_rx() : gr::blo #if HAS_GENERIC_LAMBDA [this](auto &&PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&GpsL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&GpsL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc index 4cb39a048..cf39e8858 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc @@ -103,7 +103,7 @@ GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsOpenClAcquisitionGSo #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc index 39db80cbe..28882e13e 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc @@ -108,7 +108,7 @@ GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::GpsL1CaPcpsQuickSyncAcquisit #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc index 73bec7a58..7cefc205f 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc @@ -105,7 +105,7 @@ GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsTongAcquisitionGSoC201 #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc index f3d4b6e8a..0f896c6cd 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc @@ -116,7 +116,7 @@ GpsL2MPcpsAcquisitionTest_msg_rx::GpsL2MPcpsAcquisitionTest_msg_rx() : gr::block #if HAS_GENERIC_LAMBDA [this](auto &&PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&GpsL2MPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&GpsL2MPcpsAcquisitionTest_msg_rx::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt b/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt index 1e11782be..51fbd13a2 100644 --- a/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt +++ b/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt @@ -21,7 +21,7 @@ set(SIGNAL_PROCESSING_TESTING_LIB_SOURCES file(GLOB SIGNAL_PROCESSING_TESTING_LIB_HEADERS "*.h") list(SORT SIGNAL_PROCESSING_TESTING_LIB_HEADERS) -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(signal_processing_testing_lib STATIC) target_sources(signal_processing_testing_lib PRIVATE @@ -48,7 +48,7 @@ target_link_libraries(signal_processing_testing_lib Glog::glog ) -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(signal_processing_testing_lib @@ -63,10 +63,10 @@ else() ) endif() -if(Boost_VERSION_STRING VERSION_GREATER 1.72.99) +if(USE_BOOST_BIND_PLACEHOLDERS) target_compile_definitions(signal_processing_testing_lib PRIVATE - -DBOOST_173_OR_GREATER=1 + -DUSE_BOOST_BIND_PLACEHOLDERS=1 ) endif() diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.cc b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.cc index 253441b1a..f21534835 100644 --- a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.cc +++ b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.cc @@ -58,7 +58,7 @@ Acquisition_msg_rx::Acquisition_msg_rx() : gr::block("Acquisition_msg_rx", gr::i #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&Acquisition_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&Acquisition_msg_rx::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc index 8fa9bc5e6..858a651e1 100644 --- a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc @@ -142,7 +142,7 @@ HybridObservablesTest_msg_rx::HybridObservablesTest_msg_rx() : gr::block("Hybrid #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&HybridObservablesTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&HybridObservablesTest_msg_rx::msg_handler_events, this, _1)); @@ -208,7 +208,7 @@ HybridObservablesTest_tlm_msg_rx::HybridObservablesTest_tlm_msg_rx() : gr::block #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&HybridObservablesTest_tlm_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&HybridObservablesTest_tlm_msg_rx::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc index bef53b841..a32c764c1 100644 --- a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc +++ b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc @@ -138,7 +138,7 @@ HybridObservablesTest_msg_rx_Fpga::HybridObservablesTest_msg_rx_Fpga() : gr::blo #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&HybridObservablesTest_msg_rx_Fpga::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&HybridObservablesTest_msg_rx_Fpga::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc index da25899f5..ac078155b 100644 --- a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc @@ -110,7 +110,7 @@ GpsL1CADllPllTelemetryDecoderTest_msg_rx::GpsL1CADllPllTelemetryDecoderTest_msg_ #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&GpsL1CADllPllTelemetryDecoderTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&GpsL1CADllPllTelemetryDecoderTest_msg_rx::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc index 1d3eddfd2..99b579119 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc @@ -89,7 +89,7 @@ GlonassL1CaDllPllCAidTrackingTest_msg_rx::GlonassL1CaDllPllCAidTrackingTest_msg_ #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&GlonassL1CaDllPllCAidTrackingTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&GlonassL1CaDllPllCAidTrackingTest_msg_rx::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc index ed2b08811..e7679b61a 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc @@ -96,7 +96,7 @@ GlonassL1CaDllPllTrackingTest_msg_rx::GlonassL1CaDllPllTrackingTest_msg_rx() : g #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&GlonassL1CaDllPllTrackingTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&GlonassL1CaDllPllTrackingTest_msg_rx::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc index fa957667a..e47ec2875 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc @@ -126,7 +126,7 @@ GpsL1CADllPllTrackingTest_msg_rx::GpsL1CADllPllTrackingTest_msg_rx() : gr::block #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&GpsL1CADllPllTrackingTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&GpsL1CADllPllTrackingTest_msg_rx::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc index 91a864112..11d7d33fc 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc @@ -213,7 +213,7 @@ GpsL1CADllPllTrackingTestFpga_msg_rx::GpsL1CADllPllTrackingTestFpga_msg_rx() : g #if HAS_GENERIC_LAMBDA [this](auto &&PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&GpsL1CADllPllTrackingTestFpga_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&GpsL1CADllPllTrackingTestFpga_msg_rx::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc index 0e255c2c0..35911319f 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc @@ -127,7 +127,7 @@ GpsL1CAKfTrackingTest_msg_rx::GpsL1CAKfTrackingTest_msg_rx() : gr::block("GpsL1C #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&GpsL1CAKfTrackingTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&GpsL1CAKfTrackingTest_msg_rx::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc index 1d1607db2..b73d73ebb 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc @@ -103,7 +103,7 @@ GpsL2MDllPllTrackingTest_msg_rx::GpsL2MDllPllTrackingTest_msg_rx() : gr::block(" #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&GpsL2MDllPllTrackingTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&GpsL2MDllPllTrackingTest_msg_rx::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc index 31d2c241e..bf191adb8 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc @@ -142,7 +142,7 @@ TrackingPullInTest_msg_rx::TrackingPullInTest_msg_rx() : gr::block("TrackingPull #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&TrackingPullInTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&TrackingPullInTest_msg_rx::msg_handler_events, this, _1)); diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc index ab55d8d37..2268121a5 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc @@ -140,7 +140,7 @@ TrackingPullInTest_msg_rx_Fpga::TrackingPullInTest_msg_rx_Fpga() : gr::block("Tr #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&TrackingPullInTest_msg_rx_Fpga::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&TrackingPullInTest_msg_rx_Fpga::msg_handler_events, this, _1)); diff --git a/src/utils/front-end-cal/CMakeLists.txt b/src/utils/front-end-cal/CMakeLists.txt index 3f87f1c37..1f4af20d7 100644 --- a/src/utils/front-end-cal/CMakeLists.txt +++ b/src/utils/front-end-cal/CMakeLists.txt @@ -8,7 +8,7 @@ # -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_library(front_end_cal_lib STATIC) target_sources(front_end_cal_lib PRIVATE @@ -48,7 +48,7 @@ if(ENABLE_CLANG_TIDY) endif() endif() -if(CMAKE_VERSION VERSION_GREATER 3.13) +if(USE_CMAKE_TARGET_SOURCES) add_executable(front-end-cal) target_sources(front-end-cal PRIVATE main.cc) else() @@ -85,7 +85,7 @@ target_compile_definitions(front-end-cal PRIVATE -DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}" ) -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(front-end-cal @@ -100,10 +100,10 @@ else() ) endif() -if(Boost_VERSION_STRING VERSION_GREATER 1.72.99) +if(USE_BOOST_BIND_PLACEHOLDERS) target_compile_definitions(front-end-cal PRIVATE - -DBOOST_173_OR_GREATER=1 + -DUSE_BOOST_BIND_PLACEHOLDERS=1 ) endif() diff --git a/src/utils/front-end-cal/main.cc b/src/utils/front-end-cal/main.cc index 736cb64d5..2d9d944bd 100644 --- a/src/utils/front-end-cal/main.cc +++ b/src/utils/front-end-cal/main.cc @@ -150,7 +150,7 @@ FrontEndCal_msg_rx::FrontEndCal_msg_rx() : gr::block("FrontEndCal_msg_rx", gr::i #if HAS_GENERIC_LAMBDA [this](auto&& PH1) { msg_handler_events(PH1); }); #else -#if BOOST_173_OR_GREATER +#if USE_BOOST_BIND_PLACEHOLDERS boost::bind(&FrontEndCal_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #else boost::bind(&FrontEndCal_msg_rx::msg_handler_events, this, _1)); diff --git a/src/utils/rinex-tools/CMakeLists.txt b/src/utils/rinex-tools/CMakeLists.txt index 1fcad7dd5..bdcca99da 100644 --- a/src/utils/rinex-tools/CMakeLists.txt +++ b/src/utils/rinex-tools/CMakeLists.txt @@ -16,7 +16,7 @@ if("${ARMADILLO_VERSION_STRING}" VERSION_GREATER "9.800" OR (NOT ARMADILLO_FOUND set(GPSTK_INCLUDE_DIR ${CMAKE_BINARY_DIR}/thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/include) endif() - if(CMAKE_VERSION VERSION_GREATER 3.13) + if(USE_CMAKE_TARGET_SOURCES) add_executable(obsdiff) target_sources(obsdiff PRIVATE diff --git a/src/utils/rinex2assist/CMakeLists.txt b/src/utils/rinex2assist/CMakeLists.txt index 84ea001d6..dc6411f19 100644 --- a/src/utils/rinex2assist/CMakeLists.txt +++ b/src/utils/rinex2assist/CMakeLists.txt @@ -46,7 +46,7 @@ find_program(UNCOMPRESS_EXECUTABLE uncompress if(Boost_FOUND) message(STATUS "The rinex2assist utility tool will be built when doing '${CMAKE_MAKE_PROGRAM_PRETTY_NAME}'") - if(CMAKE_VERSION VERSION_GREATER 3.13) + if(USE_CMAKE_TARGET_SOURCES) add_executable(rinex2assist) target_sources(rinex2assist PRIVATE