Make use of the new Boost::headers target introduced in CMake 3.15

2019-09-07 12:36:19 +02:00 · 2019-09-07 12:36:19 +02:00 · 38a987607e
parent 6e44d77e3d
commit 38a987607e
17 changed files with 22 additions and 17 deletions
--- 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)
--- 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
--- 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
 )
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
 )

--- 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
 )
--- 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