From 38a987607e9e2016ba4d2e19fd627a83f30d58ff Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 7 Sep 2019 12:36:19 +0200 Subject: [PATCH] Make use of the new Boost::headers target introduced in CMake 3.15 --- CMakeLists.txt | 5 +++++ src/algorithms/acquisition/adapters/CMakeLists.txt | 2 +- src/algorithms/channel/libs/CMakeLists.txt | 2 +- .../data_type_adapter/gnuradio_blocks/CMakeLists.txt | 2 +- src/algorithms/libs/CMakeLists.txt | 2 +- src/algorithms/observables/gnuradio_blocks/CMakeLists.txt | 2 +- src/algorithms/signal_source/adapters/CMakeLists.txt | 2 +- src/algorithms/signal_source/libs/CMakeLists.txt | 2 +- .../telemetry_decoder/gnuradio_blocks/CMakeLists.txt | 2 +- src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt | 2 +- src/algorithms/tracking/libs/CMakeLists.txt | 2 +- src/core/libs/CMakeLists.txt | 2 +- src/core/receiver/CMakeLists.txt | 2 +- src/main/CMakeLists.txt | 2 +- src/tests/system-tests/libs/CMakeLists.txt | 2 +- .../unit-tests/signal-processing-blocks/libs/CMakeLists.txt | 2 +- src/utils/front-end-cal/CMakeLists.txt | 4 ++-- 17 files changed, 22 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index deb3a7ff9..20f6935ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -762,6 +762,11 @@ if(CMAKE_VERSION VERSION_LESS 3.5) endif() endif() endif() +if(CMAKE_VERSION VERSION_LESS 3.15) + if(NOT TARGET Boost::headers) + add_library(Boost::headers ALIAS Boost::boost) + endif() +endif() # Fix for Boost Asio < 1.70 when using Clang in macOS if(Boost_VERSION_STRING VERSION_LESS 1.70.0) diff --git a/src/algorithms/acquisition/adapters/CMakeLists.txt b/src/algorithms/acquisition/adapters/CMakeLists.txt index 745e134b4..303fc7f59 100644 --- a/src/algorithms/acquisition/adapters/CMakeLists.txt +++ b/src/algorithms/acquisition/adapters/CMakeLists.txt @@ -104,7 +104,7 @@ target_link_libraries(acquisition_adapters Gnuradio::blocks Volk::volk PRIVATE - Boost::boost + Boost::headers Gflags::gflags Glog::glog Gnuradio::fft diff --git a/src/algorithms/channel/libs/CMakeLists.txt b/src/algorithms/channel/libs/CMakeLists.txt index 1411013a9..2b8a2d53c 100644 --- a/src/algorithms/channel/libs/CMakeLists.txt +++ b/src/algorithms/channel/libs/CMakeLists.txt @@ -40,7 +40,7 @@ target_link_libraries(channel_libs Gnuradio::pmt PRIVATE core_libs - Boost::boost + Boost::headers Gflags::gflags Glog::glog ) diff --git a/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt b/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt index 9090d9c43..815f88e0d 100644 --- a/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt @@ -42,7 +42,7 @@ add_library(data_type_gr_blocks target_link_libraries(data_type_gr_blocks PUBLIC Gnuradio::runtime - Boost::boost + Boost::headers algorithms_libs PRIVATE Volk::volk diff --git a/src/algorithms/libs/CMakeLists.txt b/src/algorithms/libs/CMakeLists.txt index 7689c7ed0..88b3ddad7 100644 --- a/src/algorithms/libs/CMakeLists.txt +++ b/src/algorithms/libs/CMakeLists.txt @@ -100,7 +100,7 @@ target_include_directories(algorithms_libs target_link_libraries(algorithms_libs PUBLIC Armadillo::armadillo - Boost::boost + Boost::headers Gflags::gflags Gnuradio::runtime Gnuradio::blocks diff --git a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt index 85edd75a9..d9847d844 100644 --- a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt @@ -45,7 +45,7 @@ target_include_directories(obs_gr_blocks target_link_libraries(obs_gr_blocks PUBLIC - Boost::boost + Boost::headers Gnuradio::blocks PRIVATE algorithms_libs diff --git a/src/algorithms/signal_source/adapters/CMakeLists.txt b/src/algorithms/signal_source/adapters/CMakeLists.txt index 1cb23518b..50e794d72 100644 --- a/src/algorithms/signal_source/adapters/CMakeLists.txt +++ b/src/algorithms/signal_source/adapters/CMakeLists.txt @@ -170,7 +170,7 @@ target_include_directories(signal_source_adapters target_link_libraries(signal_source_adapters PUBLIC - Boost::boost + Boost::headers Gnuradio::runtime Gnuradio::blocks signal_source_gr_blocks diff --git a/src/algorithms/signal_source/libs/CMakeLists.txt b/src/algorithms/signal_source/libs/CMakeLists.txt index 7bcf53893..1f968cab6 100644 --- a/src/algorithms/signal_source/libs/CMakeLists.txt +++ b/src/algorithms/signal_source/libs/CMakeLists.txt @@ -69,7 +69,7 @@ add_library(signal_source_libs ${SIGNAL_SOURCE_LIB_SOURCES} ${SIGNAL_SOURCE_LIB_ target_link_libraries(signal_source_libs PUBLIC - Boost::boost + Boost::headers Gnuradio::runtime PRIVATE Gflags::gflags diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt b/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt index 1ad718a41..eb7ef306a 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt @@ -56,7 +56,7 @@ target_link_libraries(telemetry_decoder_gr_blocks telemetry_decoder_libs core_system_parameters Gnuradio::runtime - Boost::boost + Boost::headers PRIVATE Gflags::gflags Glog::glog diff --git a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt index fdba427c0..ec7118094 100644 --- a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt @@ -88,7 +88,7 @@ endif() target_link_libraries(tracking_gr_blocks PUBLIC - Boost::boost + Boost::headers Armadillo::armadillo Gnuradio::blocks Matio::matio diff --git a/src/algorithms/tracking/libs/CMakeLists.txt b/src/algorithms/tracking/libs/CMakeLists.txt index 1a5d30c1c..db940802a 100644 --- a/src/algorithms/tracking/libs/CMakeLists.txt +++ b/src/algorithms/tracking/libs/CMakeLists.txt @@ -88,7 +88,7 @@ add_library(tracking_libs ${TRACKING_LIB_SOURCES} ${TRACKING_LIB_HEADERS}) target_link_libraries(tracking_libs PUBLIC Armadillo::armadillo - Boost::boost + Boost::headers Gnuradio::runtime Volkgnsssdr::volkgnsssdr core_system_parameters diff --git a/src/core/libs/CMakeLists.txt b/src/core/libs/CMakeLists.txt index a108368ae..9b25e5fc7 100644 --- a/src/core/libs/CMakeLists.txt +++ b/src/core/libs/CMakeLists.txt @@ -62,7 +62,7 @@ add_library(core_libs ${CORE_LIBS_SOURCES} ${CORE_LIBS_HEADERS}) target_link_libraries(core_libs PUBLIC - Boost::boost + Boost::headers Gnuradio::runtime core_libs_supl core_system_parameters diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt index 9c2acfaaf..814afed30 100644 --- a/src/core/receiver/CMakeLists.txt +++ b/src/core/receiver/CMakeLists.txt @@ -148,7 +148,7 @@ target_link_libraries(core_receiver telemetry_decoder_adapters obs_adapters pvt_adapters - Boost::boost + Boost::headers Gflags::gflags Glog::glog Armadillo::armadillo diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt index ded24273d..d01fe9258 100644 --- a/src/main/CMakeLists.txt +++ b/src/main/CMakeLists.txt @@ -32,7 +32,7 @@ endif() target_link_libraries(gnss-sdr PUBLIC core_receiver - Boost::boost + Boost::headers Boost::thread Gflags::gflags Glog::glog diff --git a/src/tests/system-tests/libs/CMakeLists.txt b/src/tests/system-tests/libs/CMakeLists.txt index d29962cdf..6daf33514 100644 --- a/src/tests/system-tests/libs/CMakeLists.txt +++ b/src/tests/system-tests/libs/CMakeLists.txt @@ -37,7 +37,7 @@ target_link_libraries(system_testing_lib Armadillo::armadillo Gflags::gflags PRIVATE - Boost::boost + Boost::headers Matio::matio ) 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 4509e2ef2..8fa765095 100644 --- a/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt +++ b/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt @@ -43,7 +43,7 @@ target_link_libraries(signal_processing_testing_lib Gflags::gflags Gnuradio::runtime PRIVATE - Boost::boost + Boost::headers Matio::matio Glog::glog ) diff --git a/src/utils/front-end-cal/CMakeLists.txt b/src/utils/front-end-cal/CMakeLists.txt index 2a8df2820..c06626915 100644 --- a/src/utils/front-end-cal/CMakeLists.txt +++ b/src/utils/front-end-cal/CMakeLists.txt @@ -34,7 +34,7 @@ target_link_libraries(front_end_cal_lib core_receiver core_libs PRIVATE - Boost::boost + Boost::headers Gflags::gflags Glog::glog Gnuradio::blocks @@ -68,7 +68,7 @@ target_link_libraries(front-end-cal core_receiver front_end_cal_lib gnss_sdr_flags - Boost::boost + Boost::headers PRIVATE Gflags::gflags Glog::glog