From 2a3d682f1f966cc1df0d42ef742df104cddfead0 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 8 Jun 2020 20:04:01 +0200 Subject: [PATCH] Make use of target_sources(), make use of target propagation to reduce redundancy in dependencies, some fixes for Clang and CMake < 3.11. Use generic lambdas with auto --- CMakeLists.txt | 4 +- src/algorithms/PVT/adapters/CMakeLists.txt | 24 +-- .../PVT/gnuradio_blocks/CMakeLists.txt | 26 ++-- .../PVT/gnuradio_blocks/rtklib_pvt_gs.cc | 4 +- src/algorithms/PVT/libs/CMakeLists.txt | 19 ++- .../acquisition/adapters/CMakeLists.txt | 22 +-- .../gnuradio_blocks/CMakeLists.txt | 15 +- .../acquisition/libs/CMakeLists.txt | 21 ++- .../channel/adapters/CMakeLists.txt | 29 ++-- src/algorithms/channel/libs/CMakeLists.txt | 17 ++- .../channel/libs/channel_msg_receiver_cc.cc | 2 +- .../conditioner/adapters/CMakeLists.txt | 18 ++- .../data_type_adapter/adapters/CMakeLists.txt | 29 ++-- .../gnuradio_blocks/CMakeLists.txt | 21 ++- .../input_filter/adapters/CMakeLists.txt | 30 ++-- .../gnuradio_blocks/CMakeLists.txt | 20 ++- src/algorithms/libs/CMakeLists.txt | 30 +++- src/algorithms/libs/rtklib/CMakeLists.txt | 18 ++- .../observables/adapters/CMakeLists.txt | 25 ++- .../gnuradio_blocks/CMakeLists.txt | 25 +-- .../gnuradio_blocks/hybrid_observables_gs.cc | 2 +- .../observables/libs/CMakeLists.txt | 18 ++- .../resampler/adapters/CMakeLists.txt | 22 ++- .../resampler/gnuradio_blocks/CMakeLists.txt | 21 ++- .../signal_generator/adapters/CMakeLists.txt | 24 +-- .../gnuradio_blocks/CMakeLists.txt | 24 +-- .../signal_source/adapters/CMakeLists.txt | 24 +-- .../gnuradio_blocks/CMakeLists.txt | 24 ++- .../signal_source/libs/CMakeLists.txt | 18 ++- .../telemetry_decoder/adapters/CMakeLists.txt | 22 ++- .../gnuradio_blocks/CMakeLists.txt | 21 ++- .../telemetry_decoder/libs/CMakeLists.txt | 21 ++- .../libs/libswiftcnav/CMakeLists.txt | 21 ++- .../tracking/adapters/CMakeLists.txt | 24 +-- .../tracking/gnuradio_blocks/CMakeLists.txt | 27 ++-- .../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 | 16 +- src/core/libs/CMakeLists.txt | 17 ++- src/core/libs/channel_status_msg_receiver.cc | 2 +- src/core/libs/supl/CMakeLists.txt | 29 +++- src/core/monitor/CMakeLists.txt | 27 +++- src/core/receiver/CMakeLists.txt | 29 ++-- src/core/system_parameters/CMakeLists.txt | 21 ++- src/main/CMakeLists.txt | 19 ++- src/tests/CMakeLists.txt | 144 +++++++++++------- src/tests/system-tests/libs/CMakeLists.txt | 21 ++- .../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 | 23 ++- .../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 | 4 +- ...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 | 37 +++-- src/utils/front-end-cal/main.cc | 2 +- src/utils/rinex-tools/CMakeLists.txt | 22 ++- src/utils/rinex2assist/CMakeLists.txt | 23 ++- 88 files changed, 801 insertions(+), 423 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 14ea9c468..84c1abf5d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -736,8 +736,8 @@ 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 - (CMAKE_CXX_COMPILER_ID MATCHES Clang)) + if(((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.9) OR + CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (CMAKE_VERSION VERSION_GREATER 3.11)) target_compile_definitions(Boost::headers INTERFACE -DBOOST_ASIO_DISABLE_CONCEPTS diff --git a/src/algorithms/PVT/adapters/CMakeLists.txt b/src/algorithms/PVT/adapters/CMakeLists.txt index 75661be5b..2f0cf3f84 100644 --- a/src/algorithms/PVT/adapters/CMakeLists.txt +++ b/src/algorithms/PVT/adapters/CMakeLists.txt @@ -8,22 +8,22 @@ # -set(PVT_ADAPTER_SOURCES - rtklib_pvt.cc -) - -set(PVT_ADAPTER_HEADERS - rtklib_pvt.h -) - -source_group(Headers FILES ${PVT_ADAPTER_HEADERS}) - -add_library(pvt_adapters ${PVT_ADAPTER_SOURCES} ${PVT_ADAPTER_HEADERS}) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(pvt_adapters STATIC) + target_sources(pvt_adapters + PRIVATE + rtklib_pvt.cc + PUBLIC + rtklib_pvt.h + ) +else() + source_group(Headers FILES rtklib_pvt.h) + add_library(pvt_adapters rtklib_pvt.cc rtklib_pvt.h) +endif() target_link_libraries(pvt_adapters PUBLIC pvt_gr_blocks - algorithms_libs_rtklib PRIVATE gnss_sdr_flags Glog::glog diff --git a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt index 220115e86..c52b217da 100644 --- a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt @@ -7,17 +7,18 @@ # SPDX-License-Identifier: GPL-3.0-or-later # -set(PVT_GR_BLOCKS_SOURCES - rtklib_pvt_gs.cc -) - -set(PVT_GR_BLOCKS_HEADERS - rtklib_pvt_gs.h -) - -source_group(Headers FILES ${PVT_GR_BLOCKS_HEADERS}) - -add_library(pvt_gr_blocks ${PVT_GR_BLOCKS_SOURCES} ${PVT_GR_BLOCKS_HEADERS}) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(pvt_gr_blocks STATIC) + target_sources(pvt_gr_blocks + PRIVATE + rtklib_pvt_gs.cc + PUBLIC + rtklib_pvt_gs.h + ) +else() + source_group(Headers FILES rtklib_pvt_gs.h) + add_library(pvt_gr_blocks rtklib_pvt_gs.cc rtklib_pvt_gs.h) +endif() if(${FILESYSTEM_FOUND}) target_compile_definitions(pvt_gr_blocks PRIVATE -DHAS_STD_FILESYSTEM=1) @@ -32,7 +33,6 @@ endif() target_link_libraries(pvt_gr_blocks PUBLIC algorithms_libs_rtklib - core_system_parameters Boost::date_time Gnuradio::pmt Gnuradio::runtime @@ -49,7 +49,7 @@ if(GNURADIO_USES_STD_POINTERS) ) endif() -if(CMAKE_VERSION VERSION_GREATER 3.1) +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(has_generic_lambdas HAS_GENERIC_LAMBDA=1) set(no_has_generic_lambdas HAS_GENERIC_LAMBDA=0) target_compile_definitions(pvt_gr_blocks diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc index f3f68f251..77f2bef56 100644 --- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc +++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc @@ -76,7 +76,7 @@ #if HAS_GENERIC_LAMBDA #else -#include +#include #endif #if HAS_STD_FILESYSTEM @@ -192,7 +192,7 @@ rtklib_pvt_gs::rtklib_pvt_gs(uint32_t nchannels, this->message_port_register_in(pmt::mp("telemetry")); this->set_msg_handler(pmt::mp("telemetry"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_telemetry(PH1); }); + [this](auto&& PH1) { msg_handler_telemetry(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&rtklib_pvt_gs::msg_handler_telemetry, this, boost::placeholders::_1)); diff --git a/src/algorithms/PVT/libs/CMakeLists.txt b/src/algorithms/PVT/libs/CMakeLists.txt index aacfe2da5..e8a2d1188 100644 --- a/src/algorithms/PVT/libs/CMakeLists.txt +++ b/src/algorithms/PVT/libs/CMakeLists.txt @@ -23,7 +23,6 @@ set(PVT_LIB_SOURCES rtklib_solver.cc pvt_conf.cc monitor_pvt_udp_sink.cc - ${PROTO_SRCS} ) set(PVT_LIB_HEADERS @@ -42,15 +41,25 @@ set(PVT_LIB_HEADERS monitor_pvt_udp_sink.h monitor_pvt.h serdes_monitor_pvt.h - ${PROTO_HDRS} ) list(SORT PVT_LIB_HEADERS) list(SORT PVT_LIB_SOURCES) -source_group(Headers FILES ${PVT_LIB_HEADERS}) - -add_library(pvt_libs ${PVT_LIB_SOURCES} ${PVT_LIB_HEADERS}) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(pvt_libs STATIC) + target_sources(pvt_libs + PRIVATE + ${PROTO_SRCS} + ${PROTO_HDRS} + ${PVT_LIB_SOURCES} + PUBLIC + ${PVT_LIB_HEADERS} + ) +else() + source_group(Headers FILES ${PVT_LIB_HEADERS} ${PROTO_HDRS}) + add_library(pvt_libs ${PVT_LIB_SOURCES} ${PROTO_SRCS} ${PVT_LIB_HEADERS} ${PROTO_HDRS}) +endif() if(${FILESYSTEM_FOUND}) target_compile_definitions(pvt_libs PRIVATE -DHAS_STD_FILESYSTEM=1) diff --git a/src/algorithms/acquisition/adapters/CMakeLists.txt b/src/algorithms/acquisition/adapters/CMakeLists.txt index 355be8398..b2747381d 100644 --- a/src/algorithms/acquisition/adapters/CMakeLists.txt +++ b/src/algorithms/acquisition/adapters/CMakeLists.txt @@ -80,24 +80,27 @@ endif() list(SORT ACQ_ADAPTER_HEADERS) list(SORT ACQ_ADAPTER_SOURCES) -source_group(Headers FILES ${ACQ_ADAPTER_HEADERS}) - -add_library(acquisition_adapters ${ACQ_ADAPTER_SOURCES} ${ACQ_ADAPTER_HEADERS}) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(acquisition_adapters STATIC) + target_sources(acquisition_adapters + PRIVATE + ${ACQ_ADAPTER_SOURCES} + PUBLIC + ${ACQ_ADAPTER_HEADERS} + ) +else() + source_group(Headers FILES ${ACQ_ADAPTER_HEADERS}) + add_library(acquisition_adapters ${ACQ_ADAPTER_SOURCES} ${ACQ_ADAPTER_HEADERS}) +endif() target_link_libraries(acquisition_adapters PUBLIC - algorithms_libs acquisition_gr_blocks - acquisition_libs - channel_libs - core_system_parameters Gnuradio::blocks PRIVATE gnss_sdr_flags Boost::headers - Gflags::gflags Glog::glog - Gnuradio::fft ) if(GNURADIO_USES_STD_POINTERS) @@ -115,6 +118,7 @@ endif() if(ENABLE_FPGA) target_link_libraries(acquisition_adapters PRIVATE + Gnuradio::fft Volk::volk Volkgnsssdr::volkgnsssdr ) diff --git a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt index 8ff77ec73..6dc51cf5a 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt @@ -43,9 +43,18 @@ endif() list(SORT ACQ_GR_BLOCKS_HEADERS) list(SORT ACQ_GR_BLOCKS_SOURCES) -source_group(Headers FILES ${ACQ_GR_BLOCKS_HEADERS}) - -add_library(acquisition_gr_blocks ${ACQ_GR_BLOCKS_SOURCES} ${ACQ_GR_BLOCKS_HEADERS}) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(acquisition_gr_blocks STATIC) + target_sources(acquisition_gr_blocks + PRIVATE + ${ACQ_GR_BLOCKS_SOURCES} + PUBLIC + ${ACQ_ADAPTER_HEADERS} + ) +else() + source_group(Headers FILES ${ACQ_GR_BLOCKS_HEADERS}) + add_library(acquisition_gr_blocks ${ACQ_GR_BLOCKS_SOURCES} ${ACQ_GR_BLOCKS_HEADERS}) +endif() if(${FILESYSTEM_FOUND}) target_compile_definitions(acquisition_gr_blocks PRIVATE -DHAS_STD_FILESYSTEM=1) diff --git a/src/algorithms/acquisition/libs/CMakeLists.txt b/src/algorithms/acquisition/libs/CMakeLists.txt index f2ffac081..0d766d601 100644 --- a/src/algorithms/acquisition/libs/CMakeLists.txt +++ b/src/algorithms/acquisition/libs/CMakeLists.txt @@ -18,12 +18,21 @@ endif() list(SORT ACQUISITION_LIB_HEADERS) list(SORT ACQUISITION_LIB_SOURCES) -source_group(Headers FILES ${ACQUISITION_LIB_HEADERS}) - -add_library(acquisition_libs - ${ACQUISITION_LIB_SOURCES} - ${ACQUISITION_LIB_HEADERS} -) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(acquisition_libs STATIC) + target_sources(acquisition_libs + PRIVATE + ${ACQUISITION_LIB_SOURCES} + PUBLIC + ${ACQUISITION_LIB_HEADERS} + ) +else() + source_group(Headers FILES ${ACQUISITION_LIB_HEADERS}) + add_library(acquisition_libs + ${ACQUISITION_LIB_SOURCES} + ${ACQUISITION_LIB_HEADERS} + ) +endif() target_link_libraries(acquisition_libs PRIVATE diff --git a/src/algorithms/channel/adapters/CMakeLists.txt b/src/algorithms/channel/adapters/CMakeLists.txt index f69e36136..39a7993c7 100644 --- a/src/algorithms/channel/adapters/CMakeLists.txt +++ b/src/algorithms/channel/adapters/CMakeLists.txt @@ -7,25 +7,28 @@ # SPDX-License-Identifier: GPL-3.0-or-later # -set(CHANNEL_ADAPTER_SOURCES channel.cc) -set(CHANNEL_ADAPTER_HEADERS channel.h) - -add_library(channel_adapters - ${CHANNEL_ADAPTER_SOURCES} - ${CHANNEL_ADAPTER_HEADERS} -) - -source_group(Headers FILES ${CHANNEL_ADAPTER_HEADERS}) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(channel_adapters STATIC) + target_sources(channel_adapters + PRIVATE + channel.cc + PUBLIC + channel.h + ) +else() + source_group(Headers FILES channel.h) + add_library(channel_adapters + channel.cc + channel.h + ) +endif() target_link_libraries(channel_adapters PUBLIC - Gnuradio::runtime channel_libs - core_system_parameters PRIVATE - Gflags::gflags - Glog::glog gnss_sdr_flags + Glog::glog ) target_include_directories(channel_adapters diff --git a/src/algorithms/channel/libs/CMakeLists.txt b/src/algorithms/channel/libs/CMakeLists.txt index 0c81f0f43..5be88b305 100644 --- a/src/algorithms/channel/libs/CMakeLists.txt +++ b/src/algorithms/channel/libs/CMakeLists.txt @@ -20,9 +20,18 @@ set(CHANNEL_FSM_HEADERS list(SORT CHANNEL_FSM_HEADERS) list(SORT CHANNEL_FSM_SOURCES) -source_group(Headers FILES ${CHANNEL_FSM_HEADERS}) - -add_library(channel_libs ${CHANNEL_FSM_SOURCES} ${CHANNEL_FSM_HEADERS}) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(channel_libs STATIC) + target_sources(channel_libs + PRIVATE + ${CHANNEL_FSM_SOURCES} + PUBLIC + ${CHANNEL_FSM_HEADERS} + ) +else() + source_group(Headers FILES ${CHANNEL_FSM_HEADERS}) + add_library(channel_libs ${CHANNEL_FSM_SOURCES} ${CHANNEL_FSM_HEADERS}) +endif() target_link_libraries(channel_libs PUBLIC @@ -47,7 +56,7 @@ if(GNURADIO_USES_STD_POINTERS) ) endif() -if(CMAKE_VERSION VERSION_GREATER 3.1) +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(has_generic_lambdas HAS_GENERIC_LAMBDA=1) set(no_has_generic_lambdas HAS_GENERIC_LAMBDA=0) target_compile_definitions(channel_libs diff --git a/src/algorithms/channel/libs/channel_msg_receiver_cc.cc b/src/algorithms/channel/libs/channel_msg_receiver_cc.cc index 4487685f3..b168a4575 100644 --- a/src/algorithms/channel/libs/channel_msg_receiver_cc.cc +++ b/src/algorithms/channel/libs/channel_msg_receiver_cc.cc @@ -42,7 +42,7 @@ channel_msg_receiver_cc::channel_msg_receiver_cc(std::shared_ptr cha this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&channel_msg_receiver_cc::msg_handler_events, this, boost::placeholders::_1)); diff --git a/src/algorithms/conditioner/adapters/CMakeLists.txt b/src/algorithms/conditioner/adapters/CMakeLists.txt index 839a138b3..80c580960 100644 --- a/src/algorithms/conditioner/adapters/CMakeLists.txt +++ b/src/algorithms/conditioner/adapters/CMakeLists.txt @@ -21,9 +21,21 @@ set(COND_ADAPTER_HEADERS list(SORT COND_ADAPTER_HEADERS) list(SORT COND_ADAPTER_SOURCES) -source_group(Headers FILES ${COND_ADAPTER_HEADERS}) - -add_library(conditioner_adapters ${COND_ADAPTER_SOURCES} ${COND_ADAPTER_HEADERS}) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(conditioner_adapters STATIC) + target_sources(conditioner_adapters + PRIVATE + ${COND_ADAPTER_SOURCES} + PUBLIC + ${COND_ADAPTER_HEADERS} + ) +else() + source_group(Headers FILES ${COND_ADAPTER_HEADERS}) + add_library(conditioner_adapters + ${COND_ADAPTER_SOURCES} + ${COND_ADAPTER_HEADERS} + ) +endif() target_link_libraries(conditioner_adapters PUBLIC diff --git a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt index 5a04a1e8c..ebb2a094f 100644 --- a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt +++ b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt @@ -29,15 +29,30 @@ set(DATATYPE_ADAPTER_HEADERS list(SORT DATATYPE_ADAPTER_HEADERS) list(SORT DATATYPE_ADAPTER_SOURCES) -source_group(Headers FILES ${DATATYPE_ADAPTER_HEADERS}) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(data_type_adapters STATIC) + target_sources(data_type_adapters + PRIVATE + ${DATATYPE_ADAPTER_SOURCES} + PUBLIC + ${DATATYPE_ADAPTER_HEADERS} + ) +else() + source_group(Headers FILES ${DATATYPE_ADAPTER_HEADERS}) + add_library(data_type_adapters + ${DATATYPE_ADAPTER_SOURCES} + ${DATATYPE_ADAPTER_HEADERS} + ) +endif() -add_library(data_type_adapters - ${DATATYPE_ADAPTER_SOURCES} - ${DATATYPE_ADAPTER_HEADERS} +target_include_directories(data_type_adapters + PUBLIC + ${CMAKE_SOURCE_DIR}/src/core/interfaces ) target_link_libraries(data_type_adapters PUBLIC + algorithms_libs Gnuradio::blocks data_type_gr_blocks PRIVATE @@ -46,12 +61,6 @@ target_link_libraries(data_type_adapters Volk::volk ) -target_include_directories(data_type_adapters - PUBLIC - ${CMAKE_SOURCE_DIR}/src/algorithms/libs - ${CMAKE_SOURCE_DIR}/src/core/interfaces -) - if(ENABLE_CLANG_TIDY) if(CLANG_TIDY_EXE) set_target_properties(data_type_adapters diff --git a/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt b/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt index 20ded2bd4..0297eee3d 100644 --- a/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt @@ -23,12 +23,21 @@ set(DATA_TYPE_GR_BLOCKS_HEADERS list(SORT DATA_TYPE_GR_BLOCKS_HEADERS) list(SORT DATA_TYPE_GR_BLOCKS_SOURCES) -source_group(Headers FILES ${DATA_TYPE_GR_BLOCKS_HEADERS}) - -add_library(data_type_gr_blocks - ${DATA_TYPE_GR_BLOCKS_SOURCES} - ${DATA_TYPE_GR_BLOCKS_HEADERS} -) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(data_type_gr_blocks STATIC) + target_sources(data_type_gr_blocks + PRIVATE + ${DATA_TYPE_GR_BLOCKS_SOURCES} + PUBLIC + ${DATA_TYPE_GR_BLOCKS_HEADERS} + ) +else() + source_group(Headers FILES ${DATA_TYPE_GR_BLOCKS_HEADERS}) + add_library(data_type_gr_blocks + ${DATA_TYPE_GR_BLOCKS_SOURCES} + ${DATA_TYPE_GR_BLOCKS_HEADERS} + ) +endif() target_link_libraries(data_type_gr_blocks PUBLIC diff --git a/src/algorithms/input_filter/adapters/CMakeLists.txt b/src/algorithms/input_filter/adapters/CMakeLists.txt index d64c964cc..f27169b04 100644 --- a/src/algorithms/input_filter/adapters/CMakeLists.txt +++ b/src/algorithms/input_filter/adapters/CMakeLists.txt @@ -28,17 +28,25 @@ set(INPUT_FILTER_ADAPTER_HEADERS list(SORT INPUT_FILTER_ADAPTER_HEADERS) list(SORT INPUT_FILTER_ADAPTER_SOURCES) -source_group(Headers FILES ${INPUT_FILTER_ADAPTER_HEADERS}) - -add_library(input_filter_adapters - ${INPUT_FILTER_ADAPTER_SOURCES} - ${INPUT_FILTER_ADAPTER_HEADERS} -) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(input_filter_adapters STATIC) + target_sources(input_filter_adapters + PRIVATE + ${INPUT_FILTER_ADAPTER_SOURCES} + PUBLIC + ${INPUT_FILTER_ADAPTER_HEADERS} + ) +else() + source_group(Headers FILES ${INPUT_FILTER_ADAPTER_HEADERS}) + add_library(input_filter_adapters + ${INPUT_FILTER_ADAPTER_SOURCES} + ${INPUT_FILTER_ADAPTER_HEADERS} + ) +endif() target_link_libraries(input_filter_adapters PUBLIC - Gnuradio::blocks - Gnuradio::filter + algorithms_libs input_filter_gr_blocks PRIVATE Gflags::gflags @@ -46,12 +54,6 @@ target_link_libraries(input_filter_adapters Volk::volk ) -target_include_directories(input_filter_adapters - PUBLIC - ${CMAKE_SOURCE_DIR}/src/algorithms/libs - ${CMAKE_SOURCE_DIR}/src/core/interfaces -) - if(NOT (GNURADIO_VERSION VERSION_LESS "3.8")) target_compile_definitions(input_filter_adapters PUBLIC -DGR_GREATER_38=1) endif() diff --git a/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt b/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt index a8f6d21a9..1105e6e98 100644 --- a/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt @@ -25,11 +25,21 @@ set(INPUT_FILTER_GR_BLOCKS_HEADERS list(SORT INPUT_FILTER_GR_BLOCKS_HEADERS) list(SORT INPUT_FILTER_GR_BLOCKS_SOURCES) -source_group(Headers FILES ${INPUT_FILTER_GR_BLOCKS_HEADERS}) - -add_library(input_filter_gr_blocks - ${INPUT_FILTER_GR_BLOCKS_SOURCES} - ${INPUT_FILTER_GR_BLOCKS_HEADERS}) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(input_filter_gr_blocks STATIC) + target_sources(input_filter_gr_blocks + PRIVATE + ${INPUT_FILTER_GR_BLOCKS_SOURCES} + PUBLIC + ${INPUT_FILTER_GR_BLOCKS_HEADERS} + ) +else() + source_group(Headers FILES ${INPUT_FILTER_GR_BLOCKS_HEADERS}) + add_library(input_filter_gr_blocks + ${INPUT_FILTER_GR_BLOCKS_SOURCES} + ${INPUT_FILTER_GR_BLOCKS_HEADERS} + ) +endif() target_link_libraries(input_filter_gr_blocks PUBLIC diff --git a/src/algorithms/libs/CMakeLists.txt b/src/algorithms/libs/CMakeLists.txt index 05d2da68f..4b57638f6 100644 --- a/src/algorithms/libs/CMakeLists.txt +++ b/src/algorithms/libs/CMakeLists.txt @@ -71,9 +71,18 @@ endif() list(SORT GNSS_SPLIBS_HEADERS) list(SORT GNSS_SPLIBS_SOURCES) -source_group(Headers FILES ${GNSS_SPLIBS_HEADERS}) - -add_library(algorithms_libs ${GNSS_SPLIBS_SOURCES} ${GNSS_SPLIBS_HEADERS}) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(algorithms_libs STATIC) + target_sources(algorithms_libs + PRIVATE + ${GNSS_SPLIBS_SOURCES} + PUBLIC + ${GNSS_SPLIBS_HEADERS} + ) +else() + source_group(Headers FILES ${GNSS_SPLIBS_HEADERS}) + add_library(algorithms_libs ${GNSS_SPLIBS_SOURCES} ${GNSS_SPLIBS_HEADERS}) +endif() if(${FILESYSTEM_FOUND}) target_compile_definitions(algorithms_libs PRIVATE -DHAS_STD_FILESYSTEM=1) @@ -180,9 +189,18 @@ endif() ############################################################################### -source_group(Headers FILES gnss_sdr_flags.h) - -add_library(gnss_sdr_flags gnss_sdr_flags.cc gnss_sdr_flags.h) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(gnss_sdr_flags STATIC) + target_sources(gnss_sdr_flags + PRIVATE + gnss_sdr_flags.cc + PUBLIC + gnss_sdr_flags.h + ) +else() + source_group(Headers FILES gnss_sdr_flags.h) + add_library(gnss_sdr_flags gnss_sdr_flags.cc gnss_sdr_flags.h) +endif() if(${FILESYSTEM_FOUND}) target_compile_definitions(gnss_sdr_flags PRIVATE -DHAS_STD_FILESYSTEM=1) diff --git a/src/algorithms/libs/rtklib/CMakeLists.txt b/src/algorithms/libs/rtklib/CMakeLists.txt index 184335d02..126d7ed67 100644 --- a/src/algorithms/libs/rtklib/CMakeLists.txt +++ b/src/algorithms/libs/rtklib/CMakeLists.txt @@ -52,9 +52,21 @@ set(RTKLIB_LIB_HEADERS list(SORT RTKLIB_LIB_HEADERS) list(SORT RTKLIB_LIB_SOURCES) -source_group(Headers FILES ${RTKLIB_LIB_HEADERS}) - -add_library(algorithms_libs_rtklib ${RTKLIB_LIB_SOURCES} ${RTKLIB_LIB_HEADERS}) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(algorithms_libs_rtklib STATIC) + target_sources(algorithms_libs_rtklib + PRIVATE + ${RTKLIB_LIB_SOURCES} + PUBLIC + ${RTKLIB_LIB_HEADERS} + ) +else() + source_group(Headers FILES ${RTKLIB_LIB_HEADERS}) + add_library(algorithms_libs_rtklib + ${RTKLIB_LIB_SOURCES} + ${RTKLIB_LIB_HEADERS} + ) +endif() target_link_libraries(algorithms_libs_rtklib PRIVATE diff --git a/src/algorithms/observables/adapters/CMakeLists.txt b/src/algorithms/observables/adapters/CMakeLists.txt index 55545df6e..d1dec4961 100644 --- a/src/algorithms/observables/adapters/CMakeLists.txt +++ b/src/algorithms/observables/adapters/CMakeLists.txt @@ -7,17 +7,18 @@ # SPDX-License-Identifier: GPL-3.0-or-later # -set(OBS_ADAPTER_SOURCES - hybrid_observables.cc -) - -set(OBS_ADAPTER_HEADERS - hybrid_observables.h -) - -source_group(Headers FILES ${OBS_ADAPTER_HEADERS}) - -add_library(obs_adapters ${OBS_ADAPTER_SOURCES} ${OBS_ADAPTER_HEADERS}) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(obs_adapters STATIC) + target_sources(obs_adapters + PRIVATE + hybrid_observables.cc + PUBLIC + hybrid_observables.h + ) +else() + source_group(Headers FILES hybrid_observables.h) + add_library(obs_adapters hybrid_observables.cc hybrid_observables.h) +endif() target_include_directories(obs_adapters PUBLIC @@ -29,8 +30,6 @@ target_link_libraries(obs_adapters obs_gr_blocks PRIVATE gnss_sdr_flags - observables_libs - Gflags::gflags Glog::glog ) diff --git a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt index 82f6c536a..ca76de937 100644 --- a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt @@ -7,17 +7,18 @@ # SPDX-License-Identifier: GPL-3.0-or-later # -set(OBS_GR_BLOCKS_SOURCES - hybrid_observables_gs.cc -) - -set(OBS_GR_BLOCKS_HEADERS - hybrid_observables_gs.h -) - -source_group(Headers FILES ${OBS_GR_BLOCKS_HEADERS}) - -add_library(obs_gr_blocks ${OBS_GR_BLOCKS_SOURCES} ${OBS_GR_BLOCKS_HEADERS}) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(obs_gr_blocks STATIC) + target_sources(obs_gr_blocks + PRIVATE + hybrid_observables_gs.cc + PUBLIC + hybrid_observables_gs.h + ) +else() + source_group(Headers FILES hybrid_observables_gs.h) + add_library(obs_gr_blocks hybrid_observables_gs.cc hybrid_observables_gs.h) +endif() if(${FILESYSTEM_FOUND}) target_compile_definitions(obs_gr_blocks PRIVATE -DHAS_STD_FILESYSTEM=1) @@ -53,7 +54,7 @@ if(GNURADIO_USES_STD_POINTERS) ) endif() -if(CMAKE_VERSION VERSION_GREATER 3.1) +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(has_generic_lambdas HAS_GENERIC_LAMBDA=1) set(no_has_generic_lambdas HAS_GENERIC_LAMBDA=0) target_compile_definitions(obs_gr_blocks diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc index ae3b93b9e..2d707a533 100644 --- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc +++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc @@ -74,7 +74,7 @@ hybrid_observables_gs::hybrid_observables_gs(const Obs_Conf &conf_) : gr::block( this->message_port_register_in(pmt::mp("pvt_to_observables")); this->set_msg_handler(pmt::mp("pvt_to_observables"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t &&PH1) { msg_handler_pvt_to_observables(PH1); }); + [this](auto &&PH1) { msg_handler_pvt_to_observables(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&hybrid_observables_gs::msg_handler_pvt_to_observables, this, boost::placeholders::_1)); diff --git a/src/algorithms/observables/libs/CMakeLists.txt b/src/algorithms/observables/libs/CMakeLists.txt index c666347ae..319620d74 100644 --- a/src/algorithms/observables/libs/CMakeLists.txt +++ b/src/algorithms/observables/libs/CMakeLists.txt @@ -7,12 +7,18 @@ # SPDX-License-Identifier: GPL-3.0-or-later # -source_group(Headers FILES obs_conf.h) - -add_library(observables_libs - obs_conf.cc - obs_conf.h -) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(observables_libs STATIC) + target_sources(observables_libs + PRIVATE + obs_conf.cc + PUBLIC + obs_conf.h + ) +else() + source_group(Headers FILES obs_conf.h) + add_library(observables_libs obs_conf.cc obs_conf.h) +endif() target_link_libraries(observables_libs PRIVATE diff --git a/src/algorithms/resampler/adapters/CMakeLists.txt b/src/algorithms/resampler/adapters/CMakeLists.txt index 0e35da746..4865dd107 100644 --- a/src/algorithms/resampler/adapters/CMakeLists.txt +++ b/src/algorithms/resampler/adapters/CMakeLists.txt @@ -21,16 +21,24 @@ set(RESAMPLER_ADAPTER_HEADERS list(SORT RESAMPLER_ADAPTER_HEADERS) list(SORT RESAMPLER_ADAPTER_SOURCES) -source_group(Headers FILES ${RESAMPLER_ADAPTER_HEADERS}) - -add_library(resampler_adapters - ${RESAMPLER_ADAPTER_SOURCES} - ${RESAMPLER_ADAPTER_HEADERS} -) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(resampler_adapters STATIC) + target_sources(resampler_adapters + PRIVATE + ${RESAMPLER_ADAPTER_SOURCES} + PUBLIC + ${RESAMPLER_ADAPTER_HEADERS} + ) +else() + source_group(Headers FILES ${RESAMPLER_ADAPTER_HEADERS}) + add_library(resampler_adapters + ${RESAMPLER_ADAPTER_SOURCES} + ${RESAMPLER_ADAPTER_HEADERS} + ) +endif() target_link_libraries(resampler_adapters PUBLIC - Gnuradio::runtime resampler_gr_blocks PRIVATE Gflags::gflags diff --git a/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt b/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt index 711377eb4..9b4e7473c 100644 --- a/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt @@ -23,12 +23,21 @@ set(RESAMPLER_GR_BLOCKS_HEADERS list(SORT RESAMPLER_GR_BLOCKS_HEADERS) list(SORT RESAMPLER_GR_BLOCKS_SOURCES) -source_group(Headers FILES ${RESAMPLER_GR_BLOCKS_HEADERS}) - -add_library(resampler_gr_blocks - ${RESAMPLER_GR_BLOCKS_SOURCES} - ${RESAMPLER_GR_BLOCKS_HEADERS} -) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(resampler_gr_blocks STATIC) + target_sources(resampler_gr_blocks + PRIVATE + ${RESAMPLER_GR_BLOCKS_SOURCES} + PUBLIC + ${RESAMPLER_GR_BLOCKS_HEADERS} + ) +else() + source_group(Headers FILES ${RESAMPLER_GR_BLOCKS_HEADERS}) + add_library(resampler_gr_blocks + ${RESAMPLER_GR_BLOCKS_SOURCES} + ${RESAMPLER_GR_BLOCKS_HEADERS} + ) +endif() target_link_libraries(resampler_gr_blocks PUBLIC diff --git a/src/algorithms/signal_generator/adapters/CMakeLists.txt b/src/algorithms/signal_generator/adapters/CMakeLists.txt index 159399846..7c07bfe47 100644 --- a/src/algorithms/signal_generator/adapters/CMakeLists.txt +++ b/src/algorithms/signal_generator/adapters/CMakeLists.txt @@ -7,15 +7,21 @@ # SPDX-License-Identifier: GPL-3.0-or-later # -set(SIGNAL_GENERATOR_ADAPTER_SOURCES signal_generator.cc) -set(SIGNAL_GENERATOR_ADAPTER_HEADERS signal_generator.h) - -source_group(Headers FILES ${SIGNAL_GENERATOR_ADAPTER_HEADERS}) - -add_library(signal_generator_adapters - ${SIGNAL_GENERATOR_ADAPTER_SOURCES} - ${SIGNAL_GENERATOR_ADAPTER_HEADERS} -) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(signal_generator_adapters STATIC) + target_sources(signal_generator_adapters + PRIVATE + signal_generator.cc + PUBLIC + signal_generator.h + ) +else() + source_group(Headers FILES signal_generator.h) + add_library(signal_generator_adapters + signal_generator.cc + signal_generator.h + ) +endif() target_link_libraries(signal_generator_adapters PUBLIC diff --git a/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt index f69f6a482..bd81a3d3c 100644 --- a/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt @@ -7,15 +7,21 @@ # SPDX-License-Identifier: GPL-3.0-or-later # -set(SIGNAL_GENERATOR_BLOCK_SOURCES signal_generator_c.cc) -set(SIGNAL_GENERATOR_BLOCK_HEADERS signal_generator_c.h) - -source_group(Headers FILES ${SIGNAL_GENERATOR_BLOCK_HEADERS}) - -add_library(signal_generator_gr_blocks - ${SIGNAL_GENERATOR_BLOCK_SOURCES} - ${SIGNAL_GENERATOR_BLOCK_HEADERS} -) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(signal_generator_gr_blocks STATIC) + target_sources(signal_generator_gr_blocks + PRIVATE + signal_generator_c.cc + PUBLIC + signal_generator_c.h + ) +else() + source_group(Headers FILES signal_generator_c.h) + add_library(signal_generator_gr_blocks + signal_generator_c.cc + signal_generator_c.h + ) +endif() target_link_libraries(signal_generator_gr_blocks PUBLIC diff --git a/src/algorithms/signal_source/adapters/CMakeLists.txt b/src/algorithms/signal_source/adapters/CMakeLists.txt index 3f6b1e090..c49ae30cf 100644 --- a/src/algorithms/signal_source/adapters/CMakeLists.txt +++ b/src/algorithms/signal_source/adapters/CMakeLists.txt @@ -125,12 +125,21 @@ set(SIGNAL_SOURCE_ADAPTER_HEADERS list(SORT SIGNAL_SOURCE_ADAPTER_HEADERS) list(SORT SIGNAL_SOURCE_ADAPTER_SOURCES) -source_group(Headers FILES ${SIGNAL_SOURCE_ADAPTER_HEADERS}) - -add_library(signal_source_adapters - ${SIGNAL_SOURCE_ADAPTER_SOURCES} - ${SIGNAL_SOURCE_ADAPTER_HEADERS} -) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(signal_source_adapters STATIC) + target_sources(signal_source_adapters + PRIVATE + ${SIGNAL_SOURCE_ADAPTER_SOURCES} + PUBLIC + ${SIGNAL_SOURCE_ADAPTER_HEADERS} + ) +else() + source_group(Headers FILES ${SIGNAL_SOURCE_ADAPTER_HEADERS}) + add_library(signal_source_adapters + ${SIGNAL_SOURCE_ADAPTER_SOURCES} + ${SIGNAL_SOURCE_ADAPTER_HEADERS} + ) +endif() target_include_directories(signal_source_adapters PUBLIC @@ -140,14 +149,11 @@ target_include_directories(signal_source_adapters target_link_libraries(signal_source_adapters PUBLIC Boost::headers - Gnuradio::runtime Gnuradio::blocks signal_source_gr_blocks - signal_source_libs PRIVATE gnss_sdr_flags core_system_parameters - Gflags::gflags Glog::glog Volk::volk ) diff --git a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt index 45ab8e9e3..d1bf439a5 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt @@ -43,18 +43,26 @@ set(SIGNAL_SOURCE_GR_BLOCKS_HEADERS list(SORT SIGNAL_SOURCE_GR_BLOCKS_HEADERS) list(SORT SIGNAL_SOURCE_GR_BLOCKS_SOURCES) -source_group(Headers FILES ${SIGNAL_SOURCE_GR_BLOCKS_HEADERS}) - -add_library(signal_source_gr_blocks - ${SIGNAL_SOURCE_GR_BLOCKS_SOURCES} - ${SIGNAL_SOURCE_GR_BLOCKS_HEADERS} -) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(signal_source_gr_blocks STATIC) + target_sources(signal_source_gr_blocks + PRIVATE + ${SIGNAL_SOURCE_GR_BLOCKS_SOURCES} + PUBLIC + ${SIGNAL_SOURCE_GR_BLOCKS_HEADERS} + ) +else() + source_group(Headers FILES ${SIGNAL_SOURCE_GR_BLOCKS_HEADERS}) + add_library(signal_source_gr_blocks + ${SIGNAL_SOURCE_GR_BLOCKS_SOURCES} + ${SIGNAL_SOURCE_GR_BLOCKS_HEADERS} + ) +endif() target_link_libraries(signal_source_gr_blocks PUBLIC signal_source_libs Boost::thread - Gnuradio::runtime PRIVATE core_libs Gflags::gflags @@ -110,7 +118,7 @@ if(Boost_VERSION_STRING VERSION_GREATER 1.72.99) ) endif() -if(CMAKE_VERSION VERSION_GREATER 3.1) +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(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/libs/CMakeLists.txt b/src/algorithms/signal_source/libs/CMakeLists.txt index 6f3a6858d..c9aa09e94 100644 --- a/src/algorithms/signal_source/libs/CMakeLists.txt +++ b/src/algorithms/signal_source/libs/CMakeLists.txt @@ -36,9 +36,21 @@ set(SIGNAL_SOURCE_LIB_HEADERS list(SORT SIGNAL_SOURCE_LIB_HEADERS) list(SORT SIGNAL_SOURCE_LIB_SOURCES) -source_group(Headers FILES ${SIGNAL_SOURCE_LIB_HEADERS}) - -add_library(signal_source_libs ${SIGNAL_SOURCE_LIB_SOURCES} ${SIGNAL_SOURCE_LIB_HEADERS}) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(signal_source_libs STATIC) + target_sources(signal_source_libs + PRIVATE + ${SIGNAL_SOURCE_LIB_SOURCES} + PUBLIC + ${SIGNAL_SOURCE_LIB_HEADERS} + ) +else() + source_group(Headers FILES ${SIGNAL_SOURCE_LIB_HEADERS}) + add_library(signal_source_libs + ${SIGNAL_SOURCE_LIB_SOURCES} + ${SIGNAL_SOURCE_LIB_HEADERS} + ) +endif() target_link_libraries(signal_source_libs PUBLIC diff --git a/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt b/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt index c228e09a2..ca74329ed 100644 --- a/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt +++ b/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt @@ -37,17 +37,25 @@ set(TELEMETRY_DECODER_ADAPTER_HEADERS list(SORT TELEMETRY_DECODER_ADAPTER_HEADERS) list(SORT TELEMETRY_DECODER_ADAPTER_SOURCES) -source_group(Headers FILES ${TELEMETRY_DECODER_ADAPTER_HEADERS}) - -add_library(telemetry_decoder_adapters - ${TELEMETRY_DECODER_ADAPTER_SOURCES} - ${TELEMETRY_DECODER_ADAPTER_HEADERS} -) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(telemetry_decoder_adapters STATIC) + target_sources(telemetry_decoder_adapters + PRIVATE + ${TELEMETRY_DECODER_ADAPTER_SOURCES} + PUBLIC + ${TELEMETRY_DECODER_ADAPTER_HEADERS} + ) +else() + source_group(Headers FILES ${TELEMETRY_DECODER_ADAPTER_HEADERS}) + add_library(telemetry_decoder_adapters + ${TELEMETRY_DECODER_ADAPTER_SOURCES} + ${TELEMETRY_DECODER_ADAPTER_HEADERS} + ) +endif() target_link_libraries(telemetry_decoder_adapters PUBLIC telemetry_decoder_gr_blocks - core_system_parameters PRIVATE Gflags::gflags Glog::glog diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt b/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt index 824b9ed36..7ffbfa98e 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt @@ -34,12 +34,21 @@ set(TELEMETRY_DECODER_GR_BLOCKS_HEADERS list(SORT TELEMETRY_DECODER_GR_BLOCKS_HEADERS) list(SORT TELEMETRY_DECODER_GR_BLOCKS_SOURCES) -source_group(Headers FILES ${TELEMETRY_DECODER_GR_BLOCKS_HEADERS}) - -add_library(telemetry_decoder_gr_blocks - ${TELEMETRY_DECODER_GR_BLOCKS_SOURCES} - ${TELEMETRY_DECODER_GR_BLOCKS_HEADERS} -) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(telemetry_decoder_gr_blocks STATIC) + target_sources(telemetry_decoder_gr_blocks + PRIVATE + ${TELEMETRY_DECODER_GR_BLOCKS_SOURCES} + PUBLIC + ${TELEMETRY_DECODER_GR_BLOCKS_HEADERS} + ) +else() + source_group(Headers FILES ${TELEMETRY_DECODER_GR_BLOCKS_HEADERS}) + add_library(telemetry_decoder_gr_blocks + ${TELEMETRY_DECODER_GR_BLOCKS_SOURCES} + ${TELEMETRY_DECODER_GR_BLOCKS_HEADERS} + ) +endif() target_link_libraries(telemetry_decoder_gr_blocks PUBLIC diff --git a/src/algorithms/telemetry_decoder/libs/CMakeLists.txt b/src/algorithms/telemetry_decoder/libs/CMakeLists.txt index 6b45c8761..5e5f3eb37 100644 --- a/src/algorithms/telemetry_decoder/libs/CMakeLists.txt +++ b/src/algorithms/telemetry_decoder/libs/CMakeLists.txt @@ -22,12 +22,21 @@ set(TELEMETRY_DECODER_LIB_HEADERS list(SORT TELEMETRY_DECODER_LIB_HEADERS) list(SORT TELEMETRY_DECODER_LIB_SOURCES) -source_group(Headers FILES ${TELEMETRY_DECODER_LIB_HEADERS}) - -add_library(telemetry_decoder_libs - ${TELEMETRY_DECODER_LIB_SOURCES} - ${TELEMETRY_DECODER_LIB_HEADERS} -) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(telemetry_decoder_libs STATIC) + target_sources(telemetry_decoder_libs + PRIVATE + ${TELEMETRY_DECODER_LIB_SOURCES} + PUBLIC + ${TELEMETRY_DECODER_LIB_HEADERS} + ) +else() + source_group(Headers FILES ${TELEMETRY_DECODER_LIB_HEADERS}) + add_library(telemetry_decoder_libs + ${TELEMETRY_DECODER_LIB_SOURCES} + ${TELEMETRY_DECODER_LIB_HEADERS} + ) +endif() target_link_libraries(telemetry_decoder_libs PUBLIC diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt b/src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt index ef75dea25..41456f235 100644 --- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt +++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt @@ -25,12 +25,21 @@ set(TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS list(SORT TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS) list(SORT TELEMETRY_DECODER_LIBSWIFTCNAV_SOURCES) -source_group(Headers FILES ${TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS}) - -add_library(telemetry_decoder_libswiftcnav STATIC - ${TELEMETRY_DECODER_LIBSWIFTCNAV_SOURCES} - ${TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS} -) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(telemetry_decoder_libswiftcnav STATIC) + target_sources(telemetry_decoder_libswiftcnav + PRIVATE + ${TELEMETRY_DECODER_LIBSWIFTCNAV_SOURCES} + PUBLIC + ${TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS} + ) +else() + source_group(Headers FILES ${TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS}) + add_library(telemetry_decoder_libswiftcnav STATIC + ${TELEMETRY_DECODER_LIBSWIFTCNAV_SOURCES} + ${TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS} + ) +endif() set_property(TARGET telemetry_decoder_libswiftcnav APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES diff --git a/src/algorithms/tracking/adapters/CMakeLists.txt b/src/algorithms/tracking/adapters/CMakeLists.txt index 098428e6a..e8c40d1b4 100644 --- a/src/algorithms/tracking/adapters/CMakeLists.txt +++ b/src/algorithms/tracking/adapters/CMakeLists.txt @@ -76,22 +76,28 @@ set(TRACKING_ADAPTER_HEADERS list(SORT TRACKING_ADAPTER_HEADERS) list(SORT TRACKING_ADAPTER_SOURCES) -source_group(Headers FILES ${TRACKING_ADAPTER_HEADERS}) - -add_library(tracking_adapters - ${TRACKING_ADAPTER_SOURCES} - ${TRACKING_ADAPTER_HEADERS} -) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(tracking_adapters STATIC) + target_sources(tracking_adapters + PRIVATE + ${TRACKING_ADAPTER_SOURCES} + PUBLIC + ${TRACKING_ADAPTER_HEADERS} + ) +else() + source_group(Headers FILES ${TRACKING_ADAPTER_HEADERS}) + add_library(tracking_adapters + ${TRACKING_ADAPTER_SOURCES} + ${TRACKING_ADAPTER_HEADERS} + ) +endif() target_link_libraries(tracking_adapters PUBLIC tracking_gr_blocks - algorithms_libs - Gnuradio::runtime PRIVATE gnss_sdr_flags Glog::glog - Volkgnsssdr::volkgnsssdr ) target_include_directories(tracking_adapters diff --git a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt index 4db2b3f6a..bf49f2841 100644 --- a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt @@ -61,12 +61,21 @@ set(TRACKING_GR_BLOCKS_HEADERS list(SORT TRACKING_GR_BLOCKS_HEADERS) list(SORT TRACKING_GR_BLOCKS_SOURCES) -source_group(Headers FILES ${TRACKING_GR_BLOCKS_HEADERS}) - -add_library(tracking_gr_blocks - ${TRACKING_GR_BLOCKS_SOURCES} - ${TRACKING_GR_BLOCKS_HEADERS} -) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(tracking_gr_blocks STATIC) + target_sources(tracking_gr_blocks + PRIVATE + ${TRACKING_GR_BLOCKS_SOURCES} + PUBLIC + ${TRACKING_GR_BLOCKS_HEADERS} + ) +else() + source_group(Headers FILES ${TRACKING_GR_BLOCKS_HEADERS}) + add_library(tracking_gr_blocks + ${TRACKING_GR_BLOCKS_SOURCES} + ${TRACKING_GR_BLOCKS_HEADERS} + ) +endif() if(${FILESYSTEM_FOUND}) target_compile_definitions(tracking_gr_blocks PRIVATE -DHAS_STD_FILESYSTEM=1) @@ -80,11 +89,7 @@ endif() target_link_libraries(tracking_gr_blocks PUBLIC - Boost::headers - Armadillo::armadillo Gnuradio::blocks - Volkgnsssdr::volkgnsssdr - algorithms_libs tracking_libs PRIVATE Matio::matio @@ -115,7 +120,7 @@ if(ENABLE_ARMA_NO_DEBUG) ) endif() -if(CMAKE_VERSION VERSION_GREATER 3.1) +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(has_generic_lambdas HAS_GENERIC_LAMBDA=1) set(no_has_generic_lambdas HAS_GENERIC_LAMBDA=0) target_compile_definitions(tracking_gr_blocks 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 ae2a07797..4e1a00b44 100644 --- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc +++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc @@ -99,7 +99,7 @@ dll_pll_veml_tracking::dll_pll_veml_tracking(const Dll_Pll_Conf &conf_) : gr::bl this->set_msg_handler( pmt::mp("telemetry_to_trk"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t &&PH1) { msg_handler_telemetry_to_trk(PH1); }); + [this](auto &&PH1) { msg_handler_telemetry_to_trk(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&dll_pll_veml_tracking::msg_handler_telemetry_to_trk, this, boost::placeholders::_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 226749708..bb594b604 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 @@ -89,7 +89,7 @@ dll_pll_veml_tracking_fpga::dll_pll_veml_tracking_fpga(const Dll_Pll_Conf_Fpga & this->message_port_register_in(pmt::mp("telemetry_to_trk")); this->set_msg_handler(pmt::mp("telemetry_to_trk"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t &&PH1) { msg_handler_telemetry_to_trk(PH1); }); + [this](auto &&PH1) { msg_handler_telemetry_to_trk(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&dll_pll_veml_tracking_fpga::msg_handler_telemetry_to_trk, this, boost::placeholders::_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 b523bef9f..e93b12164 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 @@ -113,7 +113,7 @@ glonass_l1_ca_dll_pll_c_aid_tracking_cc::glonass_l1_ca_dll_pll_c_aid_tracking_cc this->set_msg_handler(pmt::mp("preamble_timestamp_s"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t &&PH1) { msg_handler_preamble_index(PH1); }); + [this](auto &&PH1) { msg_handler_preamble_index(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&glonass_l1_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index, this, boost::placeholders::_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 b51644b77..0548192d5 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 @@ -110,7 +110,7 @@ glonass_l1_ca_dll_pll_c_aid_tracking_sc::glonass_l1_ca_dll_pll_c_aid_tracking_sc this->message_port_register_in(pmt::mp("preamble_timestamp_s")); this->set_msg_handler(pmt::mp("preamble_timestamp_s"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t &&PH1) { msg_handler_preamble_index(PH1); }); + [this](auto &&PH1) { msg_handler_preamble_index(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&glonass_l1_ca_dll_pll_c_aid_tracking_sc::msg_handler_preamble_index, this, boost::placeholders::_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 ada36aeac..8bf9acdb8 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 @@ -110,7 +110,7 @@ glonass_l2_ca_dll_pll_c_aid_tracking_cc::glonass_l2_ca_dll_pll_c_aid_tracking_cc this->set_msg_handler(pmt::mp("preamble_timestamp_s"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t &&PH1) { msg_handler_preamble_index(PH1); }); + [this](auto &&PH1) { msg_handler_preamble_index(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&glonass_l2_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index, this, boost::placeholders::_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 2457fc9d3..3bb646ce4 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 @@ -108,7 +108,7 @@ glonass_l2_ca_dll_pll_c_aid_tracking_sc::glonass_l2_ca_dll_pll_c_aid_tracking_sc this->message_port_register_in(pmt::mp("preamble_timestamp_s")); this->set_msg_handler(pmt::mp("preamble_timestamp_s"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t &&PH1) { msg_handler_preamble_index(PH1); }); + [this](auto &&PH1) { msg_handler_preamble_index(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&glonass_l2_ca_dll_pll_c_aid_tracking_sc::msg_handler_preamble_index, this, boost::placeholders::_1)); diff --git a/src/algorithms/tracking/libs/CMakeLists.txt b/src/algorithms/tracking/libs/CMakeLists.txt index 74f72273c..a92c0f714 100644 --- a/src/algorithms/tracking/libs/CMakeLists.txt +++ b/src/algorithms/tracking/libs/CMakeLists.txt @@ -73,9 +73,18 @@ endif() list(SORT TRACKING_LIB_HEADERS) list(SORT TRACKING_LIB_SOURCES) -source_group(Headers FILES ${TRACKING_LIB_HEADERS}) - -add_library(tracking_libs ${TRACKING_LIB_SOURCES} ${TRACKING_LIB_HEADERS}) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(tracking_libs STATIC) + target_sources(tracking_libs + PRIVATE + ${TRACKING_LIB_SOURCES} + PUBLIC + ${TRACKING_LIB_HEADERS} + ) +else() + source_group(Headers FILES ${TRACKING_LIB_HEADERS}) + add_library(tracking_libs ${TRACKING_LIB_SOURCES} ${TRACKING_LIB_HEADERS}) +endif() target_link_libraries(tracking_libs PUBLIC @@ -88,7 +97,6 @@ target_link_libraries(tracking_libs ${OPT_TRACKING_LIBRARIES} PRIVATE gnss_sdr_flags - Gflags::gflags Glog::glog ) diff --git a/src/core/libs/CMakeLists.txt b/src/core/libs/CMakeLists.txt index 3df13834a..dd80ee92c 100644 --- a/src/core/libs/CMakeLists.txt +++ b/src/core/libs/CMakeLists.txt @@ -47,9 +47,18 @@ endif() list(SORT CORE_LIBS_HEADERS) list(SORT CORE_LIBS_SOURCES) -source_group(Headers FILES ${CORE_LIBS_HEADERS}) - -add_library(core_libs ${CORE_LIBS_SOURCES} ${CORE_LIBS_HEADERS}) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(core_libs STATIC) + target_sources(core_libs + PRIVATE + ${CORE_LIBS_SOURCES} + PUBLIC + ${CORE_LIBS_HEADERS} + ) +else() + source_group(Headers FILES ${CORE_LIBS_HEADERS}) + add_library(core_libs ${CORE_LIBS_SOURCES} ${CORE_LIBS_HEADERS}) +endif() target_link_libraries(core_libs PUBLIC @@ -71,7 +80,7 @@ if(GNURADIO_USES_STD_POINTERS) ) endif() -if(CMAKE_VERSION VERSION_GREATER 3.1) +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(has_generic_lambdas HAS_GENERIC_LAMBDA=1) set(no_has_generic_lambdas HAS_GENERIC_LAMBDA=0) target_compile_definitions(core_libs diff --git a/src/core/libs/channel_status_msg_receiver.cc b/src/core/libs/channel_status_msg_receiver.cc index e584b4038..ba8e61ba0 100644 --- a/src/core/libs/channel_status_msg_receiver.cc +++ b/src/core/libs/channel_status_msg_receiver.cc @@ -43,7 +43,7 @@ channel_status_msg_receiver::channel_status_msg_receiver() : gr::block("channel_ this->message_port_register_in(pmt::mp("status")); this->set_msg_handler(pmt::mp("status"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&channel_status_msg_receiver::msg_handler_events, this, boost::placeholders::_1)); diff --git a/src/core/libs/supl/CMakeLists.txt b/src/core/libs/supl/CMakeLists.txt index 013416862..6c60a699f 100644 --- a/src/core/libs/supl/CMakeLists.txt +++ b/src/core/libs/supl/CMakeLists.txt @@ -9,12 +9,12 @@ file(GLOB ASN_RRLP_SOURCES "${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp/*.c") list(SORT ASN_RRLP_SOURCES) +file(GLOB ASN_RRLP_HEADERS "${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp/*.h") +list(SORT ASN_RRLP_HEADERS) file(GLOB ASN_SUPL_SOURCES "${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl/*.c") list(SORT ASN_SUPL_SOURCES) - -set(SUPL_SOURCES - supl.c -) +file(GLOB ASN_SUPL_HEADERS "${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl/*.h") +list(SORT ASN_SUPL_HEADERS) set(MY_C_FLAGS "") if(CMAKE_C_COMPILER_ID MATCHES "Clang") @@ -25,7 +25,26 @@ endif() set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_C_FLAGS}") -add_library(core_libs_supl STATIC ${ASN_RRLP_SOURCES} ${ASN_SUPL_SOURCES} ${SUPL_SOURCES}) +if(CMAKE_VERSION VERSION_GREATER 3.1) + add_library(core_libs_supl STATIC) + target_sources(core_libs_supl + PRIVATE + ${ASN_RRLP_SOURCES} + ${ASN_SUPL_SOURCES} + ${ASN_RRLP_HEADERS} + ${ASN_SUPL_HEADERS} + ${CMAKE_CURRENT_LIST_DIR}/supl.c + PUBLIC + ${CMAKE_CURRENT_LIST_DIR}/supl.h + ) +else() + add_library(core_libs_supl + STATIC + ${ASN_RRLP_SOURCES} + ${ASN_SUPL_SOURCES} + supl.c + ) +endif() if(OPENSSL_FOUND) target_compile_definitions(core_libs_supl PUBLIC -DUSE_OPENSSL_FALLBACK=1) diff --git a/src/core/monitor/CMakeLists.txt b/src/core/monitor/CMakeLists.txt index a711b53fc..991815cfe 100644 --- a/src/core/monitor/CMakeLists.txt +++ b/src/core/monitor/CMakeLists.txt @@ -12,25 +12,36 @@ protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS ${CMAKE_SOURCE_DIR}/docs/protobuf/gn set(CORE_MONITOR_LIBS_SOURCES gnss_synchro_monitor.cc gnss_synchro_udp_sink.cc - ${PROTO_SRCS} ) set(CORE_MONITOR_LIBS_HEADERS gnss_synchro_monitor.h gnss_synchro_udp_sink.h serdes_gnss_synchro.h - ${PROTO_HDRS} ) list(SORT CORE_MONITOR_LIBS_HEADERS) list(SORT CORE_MONITOR_LIBS_SOURCES) -source_group(Headers FILES ${CORE_MONITOR_LIBS_HEADERS}) - -add_library(core_monitor - ${CORE_MONITOR_LIBS_SOURCES} - ${CORE_MONITOR_LIBS_HEADERS} -) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(core_monitor STATIC) + target_sources(core_monitor + PRIVATE + ${PROTO_SRCS} + ${PROTO_HDRS} + ${CORE_MONITOR_LIBS_SOURCES} + PUBLIC + ${CORE_MONITOR_LIBS_HEADERS} + ) +else() + source_group(Headers FILES ${CORE_MONITOR_LIBS_HEADERS}) + add_library(core_monitor + ${CORE_MONITOR_LIBS_SOURCES} + ${PROTO_SRCS} + ${CORE_MONITOR_LIBS_HEADERS} + ${PROTO_HDRS} + ) +endif() target_link_libraries(core_monitor PUBLIC diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt index e9a72c180..108185ac1 100644 --- a/src/core/receiver/CMakeLists.txt +++ b/src/core/receiver/CMakeLists.txt @@ -44,15 +44,26 @@ set(GNSS_RECEIVER_INTERFACE_HEADERS list(SORT GNSS_RECEIVER_INTERFACE_HEADERS) -source_group(Headers FILES ${GNSS_RECEIVER_HEADERS} - ${GNSS_RECEIVER_INTERFACE_HEADERS} -) - -add_library(core_receiver - ${GNSS_RECEIVER_SOURCES} - ${GNSS_RECEIVER_HEADERS} - ${GNSS_RECEIVER_INTERFACE_HEADERS} -) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(core_receiver STATIC) + target_sources(core_receiver + PRIVATE + ${GNSS_RECEIVER_SOURCES} + PUBLIC + ${GNSS_RECEIVER_HEADERS} + INTERFACE + ${GNSS_RECEIVER_INTERFACE_HEADERS} + ) +else() + source_group(Headers FILES ${GNSS_RECEIVER_HEADERS} + ${GNSS_RECEIVER_INTERFACE_HEADERS} + ) + add_library(core_receiver + ${GNSS_RECEIVER_SOURCES} + ${GNSS_RECEIVER_HEADERS} + ${GNSS_RECEIVER_INTERFACE_HEADERS} + ) +endif() if(ENABLE_FPGA) target_compile_definitions(core_receiver PUBLIC -DENABLE_FPGA=1) diff --git a/src/core/system_parameters/CMakeLists.txt b/src/core/system_parameters/CMakeLists.txt index d82b9cbd3..5656a8f5e 100644 --- a/src/core/system_parameters/CMakeLists.txt +++ b/src/core/system_parameters/CMakeLists.txt @@ -95,12 +95,21 @@ set(SYSTEM_PARAMETERS_HEADERS list(SORT SYSTEM_PARAMETERS_HEADERS) list(SORT SYSTEM_PARAMETERS_SOURCES) -source_group(Headers FILES ${SYSTEM_PARAMETERS_HEADERS}) - -add_library(core_system_parameters - ${SYSTEM_PARAMETERS_SOURCES} - ${SYSTEM_PARAMETERS_HEADERS} -) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(core_system_parameters STATIC) + target_sources(core_system_parameters + PRIVATE + ${SYSTEM_PARAMETERS_SOURCES} + PUBLIC + ${SYSTEM_PARAMETERS_HEADERS} + ) +else() + source_group(Headers FILES ${SYSTEM_PARAMETERS_HEADERS}) + add_library(core_system_parameters + ${SYSTEM_PARAMETERS_SOURCES} + ${SYSTEM_PARAMETERS_HEADERS} + ) +endif() target_link_libraries(core_system_parameters PUBLIC diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt index aa90ca986..ffc653db1 100644 --- a/src/main/CMakeLists.txt +++ b/src/main/CMakeLists.txt @@ -7,8 +7,13 @@ # SPDX-License-Identifier: GPL-3.0-or-later # +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_executable(gnss-sdr) + target_sources(gnss-sdr PRIVATE main.cc) +else() + add_executable(gnss-sdr main.cc) +endif() -add_executable(gnss-sdr ${CMAKE_CURRENT_SOURCE_DIR}/main.cc) if(${FILESYSTEM_FOUND}) target_compile_definitions(gnss-sdr PRIVATE -DHAS_STD_FILESYSTEM=1) @@ -21,7 +26,7 @@ else() endif() target_link_libraries(gnss-sdr - PUBLIC + PRIVATE core_receiver Boost::headers Boost::thread @@ -34,17 +39,17 @@ target_compile_definitions(gnss-sdr PRIVATE -DGNSS_SDR_VERSION="${VERSION}") # Disable internal logging if(NOT ENABLE_LOG) - target_compile_definitions(gnss-sdr PUBLIC -DGOOGLE_STRIP_LOG=1) + target_compile_definitions(gnss-sdr PRIVATE -DGOOGLE_STRIP_LOG=1) endif() if(ENABLE_CUDA) if(NOT CMAKE_VERSION VERSION_GREATER 3.11) target_link_libraries(gnss-sdr - PUBLIC + PRIVATE ${CUDA_LIBRARIES} ) target_include_directories(gnss-sdr - PUBLIC + PRIVATE ${CUDA_INCLUDE_DIRS} ) endif() @@ -54,7 +59,7 @@ endif() if(ENABLE_GPERFTOOLS) if(GPERFTOOLS_FOUND) target_link_libraries(gnss-sdr - PUBLIC + PRIVATE Gperftools::profiler Gperftools::tcmalloc ) @@ -64,7 +69,7 @@ endif() if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") target_link_libraries(gnss-sdr - PUBLIC + PRIVATE "-lc++" ) endif() diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index ef197ed28..cd55b6b2f 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -449,7 +449,12 @@ include_directories(${LIST_INCLUDE_DIRS}) # Unit testing ################################################################################ if(ENABLE_UNIT_TESTING) - add_executable(run_tests ${CMAKE_CURRENT_SOURCE_DIR}/test_main.cc) + if(CMAKE_VERSION VERSION_GREATER 3.13) + add_executable(run_tests) + target_sources(run_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/test_main.cc) + else() + add_executable(run_tests ${CMAKE_CURRENT_SOURCE_DIR}/test_main.cc) + endif() if(${FILESYSTEM_FOUND}) target_compile_definitions(run_tests PRIVATE -DHAS_STD_FILESYSTEM=1) if(${find_experimental}) @@ -461,7 +466,7 @@ if(ENABLE_UNIT_TESTING) endif() target_link_libraries(run_tests - PUBLIC + PRIVATE Boost::thread Armadillo::armadillo Gflags::gflags @@ -476,8 +481,6 @@ if(ENABLE_UNIT_TESTING) Volk::volk Volkgnsssdr::volkgnsssdr signal_source_adapters - signal_source_gr_blocks - signal_source_libs data_type_adapters input_filter_adapters resampler_adapters @@ -495,15 +498,14 @@ if(ENABLE_UNIT_TESTING) signal_processing_testing_lib system_testing_lib core_receiver - core_system_parameters ) if(GNURADIO_USES_STD_POINTERS) target_compile_definitions(run_tests - PUBLIC -DGNURADIO_USES_STD_POINTERS=1 + PRIVATE -DGNURADIO_USES_STD_POINTERS=1 ) endif() if(ENABLE_UNIT_TESTING_EXTRA) - target_link_libraries(run_tests PUBLIC Gpstk::gpstk) + target_link_libraries(run_tests PRIVATE Gpstk::gpstk) endif() if(ENABLE_INSTALL_TESTS) if(EXISTS ${CMAKE_SOURCE_DIR}/install/run_tests) @@ -519,7 +521,7 @@ if(ENABLE_UNIT_TESTING) if(ENABLE_GPERFTOOLS) if(GPERFTOOLS_FOUND) target_link_libraries(run_tests - PUBLIC + PRIVATE Gperftools::gperftools ) endif() @@ -534,15 +536,15 @@ if(ENABLE_UNIT_TESTING) endif() if(ENABLE_CUDA AND NOT CMAKE_VERSION VERSION_GREATER 3.11) target_link_libraries(run_tests - PUBLIC + PRIVATE ${CUDA_LIBRARIES} ) target_include_directories(run_tests - PUBLIC + PRIVATE ${CUDA_INCLUDE_DIRS} ) endif() - if(CMAKE_VERSION VERSION_GREATER 3.1) + 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(has_generic_lambdas HAS_GENERIC_LAMBDA=1) set(no_has_generic_lambdas HAS_GENERIC_LAMBDA=0) target_compile_definitions(run_tests @@ -565,10 +567,16 @@ if(ENABLE_UNIT_TESTING) endif() if(ENABLE_FPGA) - add_executable(gps_l1_ca_dll_pll_tracking_test_fpga + add_executable(GPS_L1_CA_DLL_PLL_TRACKING_TEST_FPGA_SOURCES ${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) + 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() + add_executable(gps_l1_ca_dll_pll_tracking_test_fpga ${GPS_L1_CA_DLL_PLL_TRACKING_TEST_FPGA_SOURCES}) + endif() if(${FILESYSTEM_FOUND}) target_compile_definitions(gps_l1_ca_dll_pll_tracking_test_fpga PRIVATE -DHAS_STD_FILESYSTEM=1) if(${find_experimental}) @@ -579,7 +587,7 @@ if(ENABLE_FPGA) target_link_libraries(gps_l1_ca_dll_pll_tracking_test_fpga PRIVATE Boost::filesystem Boost::system) endif() target_link_libraries(gps_l1_ca_dll_pll_tracking_test_fpga - PUBLIC + PRIVATE Armadillo::armadillo Boost::thread Gflags::gflags @@ -596,7 +604,6 @@ if(ENABLE_FPGA) signal_processing_testing_lib algorithms_libs core_receiver - core_system_parameters ) install(TARGETS gps_l1_ca_dll_pll_tracking_test_fpga RUNTIME DESTINATION bin @@ -622,7 +629,12 @@ function(add_system_test executable) if(NOT EXISTS ${CMAKE_SOURCE_DIR}/install/${executable}) execute_process(COMMAND ${CMAKE_COMMAND} -E touch ${SYSTEM_TEST_SOURCES}) endif() - add_executable(${executable} ${SYSTEM_TEST_SOURCES}) + if(CMAKE_VERSION VERSION_GREATER 3.13) + add_executable(${executable}) + target_sources(${executable} PRIVATE ${SYSTEM_TEST_SOURCES}) + else() + add_executable(${executable} ${SYSTEM_TEST_SOURCES}) + endif() if(${FILESYSTEM_FOUND}) target_compile_definitions(${executable} PRIVATE -DHAS_STD_FILESYSTEM=1) if(${find_experimental}) @@ -633,11 +645,11 @@ function(add_system_test executable) target_link_libraries(${executable} PRIVATE Boost::filesystem Boost::system) endif() - target_include_directories(${executable} PUBLIC ${OPT_INCLUDES_} ${CMAKE_SOURCE_DIR}/src/algorithms/libs) - target_link_libraries(${executable} PUBLIC ${OPT_LIBS_} algorithms_libs) + target_include_directories(${executable} PRIVATE ${OPT_INCLUDES_} ${CMAKE_SOURCE_DIR}/src/algorithms/libs) + target_link_libraries(${executable} PRIVATE ${OPT_LIBS_} algorithms_libs) if(GNURADIO_USES_STD_POINTERS) target_compile_definitions(${executable} - PUBLIC -DGNURADIO_USES_STD_POINTERS=1 + PRIVATE -DGNURADIO_USES_STD_POINTERS=1 ) endif() @@ -681,7 +693,7 @@ if(ENABLE_SYSTEM_TESTING) Gnuradio::runtime GTest::GTest GTest::Main Gnuradio::blocks Gnuradio::filter Gnuradio::analog algorithms_libs - core_receiver core_system_parameters + core_receiver ) add_system_test(ttff) @@ -725,10 +737,16 @@ set(CMAKE_CTEST_COMMAND ctest -V) add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}) if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) - add_executable(flowgraph_test + set(FLOWGRAPH_TEST_SOURCES ${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) + add_executable(flowgraph_test) + target_sources(flowgraph_test PRIVATE ${FLOWGRAPH_TEST_SOURCES}) + else() + add_executable(flowgraph_test ${FLOWGRAPH_TEST_SOURCES}) + endif() if(${FILESYSTEM_FOUND}) target_compile_definitions(flowgraph_test PRIVATE -DHAS_STD_FILESYSTEM=1) if(${find_experimental}) @@ -739,7 +757,7 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) target_link_libraries(flowgraph_test PRIVATE Boost::filesystem Boost::system) endif() target_link_libraries(flowgraph_test - PUBLIC + PRIVATE Boost::thread Gflags::gflags Glog::glog @@ -748,17 +766,14 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) GTest::Main Volkgnsssdr::volkgnsssdr signal_source_adapters - signal_source_gr_blocks - signal_source_libs input_filter_adapters channel_adapters core_receiver algorithms_libs - core_system_parameters ) target_include_directories(flowgraph_test - PUBLIC + PRIVATE ${CMAKE_SOURCE_DIR}/src/algorithms/libs ) @@ -770,7 +785,7 @@ endif() ######################################################### if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) - add_executable(gnss_block_test + set(GNSS_BLOCK_TEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/sources/file_signal_source_test.cc ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc @@ -781,6 +796,12 @@ 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) + add_executable(gnss_block_test) + target_sources(gnss_block_test PRIVATE ${GNSS_BLOCK_TEST_SOURCES}) + else() + add_executable(gnss_block_test ${GNSS_BLOCK_TEST_SOURCES}) + endif() if(${FILESYSTEM_FOUND}) target_compile_definitions(gnss_block_test PRIVATE -DHAS_STD_FILESYSTEM=1) if(${find_experimental}) @@ -791,7 +812,7 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) target_link_libraries(gnss_block_test PRIVATE Boost::filesystem Boost::system) endif() target_link_libraries(gnss_block_test - PUBLIC + PRIVATE Boost::thread Gflags::gflags Glog::glog @@ -803,20 +824,17 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) GTest::Main Volkgnsssdr::volkgnsssdr signal_source_adapters - signal_source_gr_blocks - signal_source_libs data_type_adapters input_filter_adapters channel_adapters core_receiver algorithms_libs - core_system_parameters ) - target_include_directories(gnss_block_test PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs) + target_include_directories(gnss_block_test PRIVATE ${CMAKE_SOURCE_DIR}/src/algorithms/libs) if(ENABLE_FPGA) - target_compile_definitions(gnss_block_test PUBLIC -DENABLE_FPGA=1) + target_compile_definitions(gnss_block_test PRIVATE -DENABLE_FPGA=1) endif() add_test(gnss_block_test gnss_block_test) @@ -827,10 +845,16 @@ endif() ######################################################### if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) - add_executable(gnuradio_block_test + set(GNURADIO_BLOCK_TEST_SOURCES ${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) + add_executable(gnuradio_block_test) + target_sources(gnuradio_block_test PRIVATE ${GNURADIO_BLOCK_TEST_SOURCES}) + else() + add_executable(gnuradio_block_test ${GNURADIO_BLOCK_TEST_SOURCES}) + endif() if(${FILESYSTEM_FOUND}) target_compile_definitions(gnuradio_block_test PRIVATE -DHAS_STD_FILESYSTEM=1) if(${find_experimental}) @@ -841,7 +865,7 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) target_link_libraries(gnuradio_block_test PRIVATE Boost::filesystem Boost::system) endif() target_link_libraries(gnuradio_block_test - PUBLIC + PRIVATE Boost::thread Gflags::gflags Glog::glog @@ -856,7 +880,6 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) signal_source_libs core_receiver algorithms_libs - core_system_parameters ) add_test(gnuradio_block_test gnuradio_block_test) @@ -866,10 +889,16 @@ endif() ######################################################### -add_executable(matio_test +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) + add_executable(matio_test) + target_sources(matio_test PRIVATE ${MATIO_TEST_SOURCES}) +else() + add_executable(matio_test ${MATIO_TEST_SOURCES}) +endif() if(${FILESYSTEM_FOUND}) target_compile_definitions(matio_test PRIVATE -DHAS_STD_FILESYSTEM=1) @@ -882,14 +911,13 @@ else() endif() target_link_libraries(matio_test - PUBLIC + PRIVATE Gflags::gflags Glog::glog GTest::GTest GTest::Main Matio::matio core_receiver - core_system_parameters ) add_test(matio_test matio_test) @@ -899,10 +927,16 @@ set_property(TEST matio_test PROPERTY TIMEOUT 30) ######################################################### if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) - add_executable(acq_test + set(ACQ_TEST_SOURCES ${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) + add_executable(acq_test) + target_sources(acq_test PRIVATE ${ACQ_TEST_SOURCES}) + else() + add_executable(acq_test ${ACQ_TEST_SOURCES}) + endif() if(${FILESYSTEM_FOUND}) target_compile_definitions(acq_test PRIVATE -DHAS_STD_FILESYSTEM=1) target_link_libraries(acq_test PRIVATE std::filesystem) @@ -910,7 +944,7 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) target_link_libraries(acq_test PRIVATE Boost::filesystem Boost::system) endif() target_link_libraries(acq_test - PUBLIC + PRIVATE Boost::thread Gflags::gflags Glog::glog @@ -925,16 +959,14 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) signal_source_gr_blocks signal_source_libs acquisition_adapters - acquisition_gr_blocks algorithms_libs signal_processing_testing_lib core_receiver - core_system_parameters ) add_test(acq_test acq_test) - if(CMAKE_VERSION VERSION_GREATER 3.1) + 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(has_generic_lambdas HAS_GENERIC_LAMBDA=1) set(no_has_generic_lambdas HAS_GENERIC_LAMBDA=0) target_compile_definitions(acq_test @@ -967,7 +999,7 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) # ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/unscented_filter_test.cc ) endif() - add_executable(trk_test + set(TRKTEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/tracking_loop_filter_test.cc @@ -975,6 +1007,12 @@ 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) + add_executable(trk_test) + target_sources(trk_test PRIVATE ${TRKTEST_SOURCES}) + else() + add_executable(trk_test ${TRKTEST_SOURCES}) + endif() if(${FILESYSTEM_FOUND}) target_compile_definitions(trk_test PRIVATE -DHAS_STD_FILESYSTEM=1) if(${find_experimental}) @@ -986,7 +1024,7 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) endif() target_link_libraries(trk_test - PUBLIC + PRIVATE Boost::thread Gflags::gflags Glog::glog @@ -1003,9 +1041,8 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) tracking_adapters signal_generator_gr_blocks core_receiver - core_system_parameters ) - if(CMAKE_VERSION VERSION_GREATER 3.1) + 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(has_generic_lambdas HAS_GENERIC_LAMBDA=1) set(no_has_generic_lambdas HAS_GENERIC_LAMBDA=0) target_compile_definitions(trk_test @@ -1034,10 +1071,16 @@ endif() ######################################################### if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) - add_executable(control_thread_test + set(CONTROL_THREAD_TEST_SOURCES ${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) + add_executable(control_thread_test) + target_sources(control_thread_test PRIVATE ${CONTROL_THREAD_TEST_SOURCES}) + else() + add_executable(control_thread_test ${CONTROL_THREAD_TEST_SOURCES}) + endif() if(${FILESYSTEM_FOUND}) target_compile_definitions(control_thread_test PRIVATE -DHAS_STD_FILESYSTEM=1) if(${find_experimental}) @@ -1049,18 +1092,15 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA) endif() target_link_libraries(control_thread_test - PUBLIC + PRIVATE Boost::thread Gflags::gflags Glog::glog GTest::GTest GTest::Main signal_source_adapters - signal_source_gr_blocks - signal_source_libs algorithms_libs core_receiver - core_system_parameters ) add_test(control_thread_test control_thread_test) diff --git a/src/tests/system-tests/libs/CMakeLists.txt b/src/tests/system-tests/libs/CMakeLists.txt index c7720d4bf..3db9dca38 100644 --- a/src/tests/system-tests/libs/CMakeLists.txt +++ b/src/tests/system-tests/libs/CMakeLists.txt @@ -16,12 +16,21 @@ set(SYSTEM_TESTING_LIB_SOURCES file(GLOB SYSTEM_TESTING_LIB_HEADERS "*.h") list(SORT SYSTEM_TESTING_LIB_HEADERS) -add_library(system_testing_lib - ${SYSTEM_TESTING_LIB_SOURCES} - ${SYSTEM_TESTING_LIB_HEADERS} -) - -source_group(Headers FILES ${SYSTEM_TESTING_LIB_HEADERS}) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(system_testing_lib STATIC) + target_sources(system_testing_lib + PRIVATE + ${SYSTEM_TESTING_LIB_SOURCES} + PUBLIC + ${SYSTEM_TESTING_LIB_HEADERS} + ) +else() + source_group(Headers FILES ${SYSTEM_TESTING_LIB_HEADERS}) + add_library(system_testing_lib + ${SYSTEM_TESTING_LIB_SOURCES} + ${SYSTEM_TESTING_LIB_HEADERS} + ) +endif() target_link_libraries(system_testing_lib PUBLIC 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 df47db7d7..75c8760b9 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 @@ -159,7 +159,7 @@ AcqPerfTest_msg_rx::AcqPerfTest_msg_rx(Concurrent_Queue& queue) : gr::block this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&AcqPerfTest_msg_rx::msg_handler_events, this, boost::placeholders::_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 58bfb3bb9..fd20afc78 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 @@ -112,7 +112,7 @@ BeidouB1iPcpsAcquisitionTest_msg_rx::BeidouB1iPcpsAcquisitionTest_msg_rx() : gr: this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t &&PH1) { msg_handler_events(PH1); }); + [this](auto &&PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&BeidouB1iPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_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 3729a266f..f14dfdddd 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 @@ -112,7 +112,7 @@ BeidouB3iPcpsAcquisitionTest_msg_rx::BeidouB3iPcpsAcquisitionTest_msg_rx() : gr: this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t &&PH1) { msg_handler_events(PH1); }); + [this](auto &&PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&BeidouB3iPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_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 73c8ca05c..884509345 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 @@ -105,7 +105,7 @@ GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1Pcps8msAmbiguo this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, boost::placeholders::_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 a4b423367..d86af8e3c 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 @@ -103,7 +103,7 @@ GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1PcpsAmbiguousAcqu this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, boost::placeholders::_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 c0409da58..cefa11014 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 @@ -112,7 +112,7 @@ GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::GalileoE1PcpsAmbiguousAcquisit this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::msg_handler_events, this, boost::placeholders::_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 b60499982..50bc63946 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 @@ -124,7 +124,7 @@ GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::GalileoE1PcpsAmbiguousAcquisitionT this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_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 53f824283..8a39cfa36 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 @@ -106,7 +106,7 @@ GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::GalileoE1PcpsCccwsrAmbiguous this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_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 72f4ed117..06ae77566 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 @@ -108,7 +108,7 @@ GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::GalileoE1PcpsQuic this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::msg_handler_events, this, boost::placeholders::_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 2ebe7e26a..2601bb252 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 @@ -103,7 +103,7 @@ GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1PcpsTongAmbig this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, boost::placeholders::_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 6c46fe2cf..e1b742f36 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 @@ -99,7 +99,7 @@ GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::GalileoE5aPcpsAcquisition this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::msg_handler_events, this, boost::placeholders::_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 0219af232..5c9ef5251 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 @@ -105,7 +105,7 @@ GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::GlonassL1CaPcpsAcquisitionGSoC201 this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::msg_handler_events, this, boost::placeholders::_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 9ded82469..811faca5e 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 @@ -98,7 +98,7 @@ GlonassL1CaPcpsAcquisitionTest_msg_rx::GlonassL1CaPcpsAcquisitionTest_msg_rx() : this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&GlonassL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_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 26fac0879..e3a474876 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 @@ -103,7 +103,7 @@ GlonassL2CaPcpsAcquisitionTest_msg_rx::GlonassL2CaPcpsAcquisitionTest_msg_rx(con this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&GlonassL2CaPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_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 59920d0ce..9b52e0d5e 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 @@ -106,7 +106,7 @@ GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsAcquisitionGSoC2013Test_ms this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, boost::placeholders::_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 bc28603fd..59ea1fdbb 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 @@ -122,7 +122,7 @@ GpsL1CaPcpsAcquisitionTest_msg_rx::GpsL1CaPcpsAcquisitionTest_msg_rx() : gr::blo this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t &&PH1) { msg_handler_events(PH1); }); + [this](auto &&PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&GpsL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_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 84163dbfb..4cb39a048 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 @@ -101,7 +101,7 @@ GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsOpenClAcquisitionGSo this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, boost::placeholders::_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 d47208480..39db80cbe 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 @@ -106,7 +106,7 @@ GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::GpsL1CaPcpsQuickSyncAcquisit this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::msg_handler_events, this, boost::placeholders::_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 b1bf66d9f..73bec7a58 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 @@ -103,7 +103,7 @@ GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsTongAcquisitionGSoC201 this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, boost::placeholders::_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 e8c844f58..f3d4b6e8a 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 @@ -114,7 +114,7 @@ GpsL2MPcpsAcquisitionTest_msg_rx::GpsL2MPcpsAcquisitionTest_msg_rx() : gr::block this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t &&PH1) { msg_handler_events(PH1); }); + [this](auto &&PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&GpsL2MPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_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 ecac00f2b..1e11782be 100644 --- a/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt +++ b/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt @@ -21,12 +21,21 @@ set(SIGNAL_PROCESSING_TESTING_LIB_SOURCES file(GLOB SIGNAL_PROCESSING_TESTING_LIB_HEADERS "*.h") list(SORT SIGNAL_PROCESSING_TESTING_LIB_HEADERS) -add_library(signal_processing_testing_lib - ${SIGNAL_PROCESSING_TESTING_LIB_SOURCES} - ${SIGNAL_PROCESSING_TESTING_LIB_HEADERS} -) - -source_group(Headers FILES ${SIGNAL_PROCESSING_TESTING_LIB_HEADERS}) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(signal_processing_testing_lib STATIC) + target_sources(signal_processing_testing_lib + PRIVATE + ${SIGNAL_PROCESSING_TESTING_LIB_SOURCES} + PUBLIC + ${SIGNAL_PROCESSING_TESTING_LIB_HEADERS} + ) +else() + source_group(Headers FILES ${SIGNAL_PROCESSING_TESTING_LIB_HEADERS}) + add_library(signal_processing_testing_lib + ${SIGNAL_PROCESSING_TESTING_LIB_SOURCES} + ${SIGNAL_PROCESSING_TESTING_LIB_HEADERS} + ) +endif() target_link_libraries(signal_processing_testing_lib PUBLIC @@ -39,7 +48,7 @@ target_link_libraries(signal_processing_testing_lib Glog::glog ) -if(CMAKE_VERSION VERSION_GREATER 3.1) +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(has_generic_lambdas HAS_GENERIC_LAMBDA=1) set(no_has_generic_lambdas HAS_GENERIC_LAMBDA=0) target_compile_definitions(signal_processing_testing_lib 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 f527989d9..253441b1a 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 @@ -56,7 +56,7 @@ Acquisition_msg_rx::Acquisition_msg_rx() : gr::block("Acquisition_msg_rx", gr::i this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&Acquisition_msg_rx::msg_handler_events, this, boost::placeholders::_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 aa9b8db5f..8fa9bc5e6 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 @@ -140,7 +140,7 @@ HybridObservablesTest_msg_rx::HybridObservablesTest_msg_rx() : gr::block("Hybrid this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&HybridObservablesTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); @@ -206,7 +206,7 @@ HybridObservablesTest_tlm_msg_rx::HybridObservablesTest_tlm_msg_rx() : gr::block this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&HybridObservablesTest_tlm_msg_rx::msg_handler_events, this, boost::placeholders::_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 d2add5517..bef53b841 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 @@ -136,7 +136,7 @@ HybridObservablesTest_msg_rx_Fpga::HybridObservablesTest_msg_rx_Fpga() : gr::blo this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&HybridObservablesTest_msg_rx_Fpga::msg_handler_events, this, boost::placeholders::_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 ff7f88336..da25899f5 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 @@ -108,7 +108,7 @@ GpsL1CADllPllTelemetryDecoderTest_msg_rx::GpsL1CADllPllTelemetryDecoderTest_msg_ this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&GpsL1CADllPllTelemetryDecoderTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); @@ -168,7 +168,7 @@ GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx::GpsL1CADllPllTelemetryDecoderTest_ this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else boost::bind(&GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif 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 7f6050ef6..1d3eddfd2 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 @@ -87,7 +87,7 @@ GlonassL1CaDllPllCAidTrackingTest_msg_rx::GlonassL1CaDllPllCAidTrackingTest_msg_ this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&GlonassL1CaDllPllCAidTrackingTest_msg_rx::msg_handler_events, this, boost::placeholders::_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 c15b1e1ad..ed2b08811 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 @@ -94,7 +94,7 @@ GlonassL1CaDllPllTrackingTest_msg_rx::GlonassL1CaDllPllTrackingTest_msg_rx() : g this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&GlonassL1CaDllPllTrackingTest_msg_rx::msg_handler_events, this, boost::placeholders::_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 1d2041abc..fa957667a 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 @@ -124,7 +124,7 @@ GpsL1CADllPllTrackingTest_msg_rx::GpsL1CADllPllTrackingTest_msg_rx() : gr::block this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&GpsL1CADllPllTrackingTest_msg_rx::msg_handler_events, this, boost::placeholders::_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 88496a4f2..91a864112 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 @@ -211,7 +211,7 @@ GpsL1CADllPllTrackingTestFpga_msg_rx::GpsL1CADllPllTrackingTestFpga_msg_rx() : g this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t &&PH1) { msg_handler_events(PH1); }); + [this](auto &&PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&GpsL1CADllPllTrackingTestFpga_msg_rx::msg_handler_events, this, boost::placeholders::_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 5b66f09b5..0e255c2c0 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 @@ -125,7 +125,7 @@ GpsL1CAKfTrackingTest_msg_rx::GpsL1CAKfTrackingTest_msg_rx() : gr::block("GpsL1C this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&GpsL1CAKfTrackingTest_msg_rx::msg_handler_events, this, boost::placeholders::_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 6582b9f49..1d1607db2 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 @@ -101,7 +101,7 @@ GpsL2MDllPllTrackingTest_msg_rx::GpsL2MDllPllTrackingTest_msg_rx() : gr::block(" this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&GpsL2MDllPllTrackingTest_msg_rx::msg_handler_events, this, boost::placeholders::_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 a20a5f8b8..31d2c241e 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 @@ -140,7 +140,7 @@ TrackingPullInTest_msg_rx::TrackingPullInTest_msg_rx() : gr::block("TrackingPull this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&TrackingPullInTest_msg_rx::msg_handler_events, this, boost::placeholders::_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 6f5deee2d..ab55d8d37 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 @@ -138,7 +138,7 @@ TrackingPullInTest_msg_rx_Fpga::TrackingPullInTest_msg_rx_Fpga() : gr::block("Tr this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&TrackingPullInTest_msg_rx_Fpga::msg_handler_events, this, boost::placeholders::_1)); diff --git a/src/utils/front-end-cal/CMakeLists.txt b/src/utils/front-end-cal/CMakeLists.txt index 70c817959..b0a96147b 100644 --- a/src/utils/front-end-cal/CMakeLists.txt +++ b/src/utils/front-end-cal/CMakeLists.txt @@ -8,11 +8,18 @@ # -set(FRONT_END_CAL_SOURCES front_end_cal.cc) -set(FRONT_END_CAL_HEADERS front_end_cal.h) - -add_library(front_end_cal_lib ${FRONT_END_CAL_SOURCES} ${FRONT_END_CAL_HEADERS}) -source_group(Headers FILES ${FRONT_END_CAL_HEADERS}) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_library(front_end_cal_lib STATIC) + target_sources(front_end_cal_lib + PRIVATE + front_end_cal.cc + PUBLIC + front_end_cal.h + ) +else() + source_group(Headers FILES front_end_cal.h) + add_library(front_end_cal_lib front_end_cal.cc front_end_cal.h) +endif() target_link_libraries(front_end_cal_lib PUBLIC @@ -41,7 +48,12 @@ if(ENABLE_CLANG_TIDY) endif() endif() -add_executable(front-end-cal ${CMAKE_CURRENT_SOURCE_DIR}/main.cc) +if(CMAKE_VERSION VERSION_GREATER 3.13) + add_executable(front-end-cal) + target_sources(front-end-cal PRIVATE main.cc) +else() + add_executable(front-end-cal main.cc) +endif() if(${FILESYSTEM_FOUND}) target_compile_definitions(front-end-cal PRIVATE -DHAS_STD_FILESYSTEM=1) @@ -54,29 +66,26 @@ else() endif() target_link_libraries(front-end-cal - PUBLIC - core_libs + PRIVATE core_receiver front_end_cal_lib gnss_sdr_flags Boost::headers - PRIVATE - Gflags::gflags Glog::glog ) if(GNURADIO_USES_STD_POINTERS) target_compile_definitions(front-end-cal - PUBLIC -DGNURADIO_USES_STD_POINTERS=1 + PRIVATE -DGNURADIO_USES_STD_POINTERS=1 ) endif() target_compile_definitions(front-end-cal - PUBLIC -DGNSS_SDR_VERSION="${VERSION}" - PUBLIC -DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}" + PRIVATE -DGNSS_SDR_VERSION="${VERSION}" + PRIVATE -DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}" ) -if(CMAKE_VERSION VERSION_GREATER 3.1) +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(has_generic_lambdas HAS_GENERIC_LAMBDA=1) set(no_has_generic_lambdas HAS_GENERIC_LAMBDA=0) target_compile_definitions(front-end-cal diff --git a/src/utils/front-end-cal/main.cc b/src/utils/front-end-cal/main.cc index 6d7e2e667..736cb64d5 100644 --- a/src/utils/front-end-cal/main.cc +++ b/src/utils/front-end-cal/main.cc @@ -148,7 +148,7 @@ FrontEndCal_msg_rx::FrontEndCal_msg_rx() : gr::block("FrontEndCal_msg_rx", gr::i this->message_port_register_in(pmt::mp("events")); this->set_msg_handler(pmt::mp("events"), #if HAS_GENERIC_LAMBDA - [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); + [this](auto&& PH1) { msg_handler_events(PH1); }); #else #if BOOST_173_OR_GREATER boost::bind(&FrontEndCal_msg_rx::msg_handler_events, this, boost::placeholders::_1)); diff --git a/src/utils/rinex-tools/CMakeLists.txt b/src/utils/rinex-tools/CMakeLists.txt index 513323b08..a81bd945d 100644 --- a/src/utils/rinex-tools/CMakeLists.txt +++ b/src/utils/rinex-tools/CMakeLists.txt @@ -16,22 +16,30 @@ if("${ARMADILLO_VERSION_STRING}" VERSION_GREATER "9.800" OR (NOT ARMADILLO_FOUND set(GPSTK_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/include) endif() - set(obsdiff_HEADERS obsdiff_flags.h) - source_group(Headers FILES ${obsdiff_HEADERS}) + if(CMAKE_VERSION VERSION_GREATER 3.13) + add_executable(obsdiff) + target_sources(obsdiff + PRIVATE + obsdiff.cc + obsdiff_flags.h + ) + else() + source_group(Headers FILES obsdiff_flags.h) + add_executable(obsdiff ${CMAKE_CURRENT_SOURCE_DIR}/obsdiff.cc obsdiff_flags.h) + endif() - add_executable(obsdiff ${CMAKE_CURRENT_SOURCE_DIR}/obsdiff.cc ${obsdiff_HEADERS}) target_include_directories(obsdiff PUBLIC ${CMAKE_SOURCE_DIR}/src/tests/common-files) set_property(TARGET obsdiff PROPERTY CXX_STANDARD 14) # Required by GPSTk v3.0.0 # Do not show warnings raised by GPSTk v3.0.0 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") target_compile_options(obsdiff - PUBLIC + PRIVATE -Wno-deprecated -Wno-unused-parameter -Wno-sign-compare -Wno-reorder -Wno-deprecated-copy -Wno-extra -Wno-unused-but-set-variable -Wno-unknown-pragmas ) endif() if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") target_compile_options(obsdiff - PUBLIC + PRIVATE -Wno-deprecated -Wno-unused-parameter -Wno-sign-compare -Wno-reorder ) endif() @@ -50,7 +58,7 @@ if("${ARMADILLO_VERSION_STRING}" VERSION_GREATER "9.800" OR (NOT ARMADILLO_FOUND endif() target_link_libraries(obsdiff - PUBLIC + PRIVATE Armadillo::armadillo Threads::Threads Gflags::gflags @@ -59,7 +67,7 @@ if("${ARMADILLO_VERSION_STRING}" VERSION_GREATER "9.800" OR (NOT ARMADILLO_FOUND ) target_include_directories(obsdiff - PUBLIC + PRIVATE ${GPSTK_INCLUDE_DIR}/gpstk ${GPSTK_INCLUDE_DIR} ) diff --git a/src/utils/rinex2assist/CMakeLists.txt b/src/utils/rinex2assist/CMakeLists.txt index d6a9ca6f0..100308049 100644 --- a/src/utils/rinex2assist/CMakeLists.txt +++ b/src/utils/rinex2assist/CMakeLists.txt @@ -46,24 +46,33 @@ find_program(UNCOMPRESS_EXECUTABLE uncompress if(Boost_FOUND) message(STATUS "The rinex2assist utility tool will be built when doing '${CMAKE_MAKE_PROGRAM_PRETTY_NAME}'") - add_executable(rinex2assist ${CMAKE_CURRENT_SOURCE_DIR}/main.cc) + if(CMAKE_VERSION VERSION_GREATER 3.13) + add_executable(rinex2assist) + target_sources(rinex2assist + PRIVATE + main.cc + ) + else() + add_executable(rinex2assist ${CMAKE_CURRENT_SOURCE_DIR}/main.cc) + endif() + set_property(TARGET rinex2assist PROPERTY CXX_STANDARD 14) # Required by GPSTk # Do not show warnings raised by GPSTk v3.0.0 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") target_compile_options(rinex2assist - PUBLIC + PRIVATE -Wno-deprecated -Wno-unused-parameter -Wno-sign-compare -Wno-type-limits -Wno-unused-but-set-variable -Wno-deprecated-copy -Wno-extra ) endif() if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") target_compile_options(rinex2assist - PUBLIC + PRIVATE -Wno-deprecated -Wno-unused-parameter -Wno-sign-compare ) endif() target_link_libraries(rinex2assist - PUBLIC + PRIVATE Boost::iostreams Boost::serialization ${GPSTK_LIBRARY} @@ -73,15 +82,15 @@ if(Boost_FOUND) ) target_include_directories(rinex2assist - PUBLIC + PRIVATE ${GPSTK_INCLUDE_DIR}/gpstk ${GPSTK_INCLUDE_DIR} ) if(NOT UNCOMPRESS_EXECUTABLE-NOTFOUND) - target_compile_definitions(rinex2assist PUBLIC -DUNCOMPRESS_EXECUTABLE="${UNCOMPRESS_EXECUTABLE}") + target_compile_definitions(rinex2assist PRIVATE -DUNCOMPRESS_EXECUTABLE="${UNCOMPRESS_EXECUTABLE}") else() - target_compile_definitions(rinex2assist PUBLIC -DUNCOMPRESS_EXECUTABLE="") + target_compile_definitions(rinex2assist PRIVATE -DUNCOMPRESS_EXECUTABLE="") endif() if(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK)