Clean CMake scripts

CMakeLists.txt

@@ -1619,9 +1619,9 @@ endif()
 # Setup of optional drivers
 ################################################################################
 
-################################################################################
+########################################
 # USRP Hardware Driver (UHD) - OPTIONAL
-################################################################################
+########################################
 if(ENABLE_UHD)
     find_package(UHD)
     if(NOT UHD_FOUND)
@@ -1647,9 +1647,10 @@ if(ENABLE_UHD)
 endif()
 
 
-##############################################
+##########################################
 # gr-osmosdr - OPTIONAL
-##############################################
+# https://github.com/osmocom/gr-osmosdr
+##########################################
 if($ENV{RTLSDR_DRIVER})
     message(STATUS "RTLSDR_DRIVER environment variable found.")
     set(ENABLE_OSMOSDR ON)
@@ -1675,15 +1676,19 @@ endif()
 
 ##############################################
 # gr-iio - OPTIONAL
+# IIO blocks for GNU Radio
+# https://github.com/analogdevicesinc/gr-iio
 ##############################################
 if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2)
     find_package(GRIIO)
 endif()
 
 
-##############################################
+###################################################################################
 # libiio - OPTIONAL
-##############################################
+# A cross platform library for interfacing with local and remote Linux IIO devices
+# https://github.com/analogdevicesinc/libiio
+###################################################################################
 if(ENABLE_AD9361)
     find_package(LIBIIO)
 endif()
@@ -1736,9 +1741,9 @@ else()
 endif()
 
 
-##############################################
-# CTTC ARRAY - OPTIONAL
-##############################################
+#######################################################
+# CTTC's digital array beamformer prototype - OPTIONAL
+#######################################################
 if($ENV{RAW_ARRAY_DRIVER})
     message(STATUS "RAW_ARRAY_DRIVER environment variable found.")
     set(ENABLE_ARRAY ON)
@@ -1760,7 +1765,7 @@ endif()
 
 
 ################################################################################
-# GPerftools - https://github.com/gperftools/gperftools (OPTIONAL)
+# GPerftools - https://github.com/gperftools/gperftools - OPTIONAL)
 ################################################################################
 if(ENABLE_GPERFTOOLS)
     find_package(GPERFTOOLS)

src/algorithms/PVT/adapters/CMakeLists.txt

@@ -25,10 +25,10 @@ set(PVT_ADAPTER_HEADERS
     rtklib_pvt.h
 )
 
-add_library(pvt_adapters ${PVT_ADAPTER_SOURCES} ${PVT_ADAPTER_HEADERS})
-
 source_group(Headers FILES ${PVT_ADAPTER_HEADERS})
 
+add_library(pvt_adapters ${PVT_ADAPTER_SOURCES} ${PVT_ADAPTER_HEADERS})
+
 target_link_libraries(pvt_adapters
     PUBLIC
         pvt_gr_blocks

src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt

@@ -24,10 +24,10 @@ set(PVT_GR_BLOCKS_HEADERS
     rtklib_pvt_cc.h
 )
 
-add_library(pvt_gr_blocks ${PVT_GR_BLOCKS_SOURCES} ${PVT_GR_BLOCKS_HEADERS})
-
 source_group(Headers FILES ${PVT_GR_BLOCKS_HEADERS})
 
+add_library(pvt_gr_blocks ${PVT_GR_BLOCKS_SOURCES} ${PVT_GR_BLOCKS_HEADERS})
+
 target_link_libraries(pvt_gr_blocks
     PUBLIC
         Boost::date_time
@@ -36,6 +36,7 @@ target_link_libraries(pvt_gr_blocks
         gnss_system_parameters
         gnss_rx
     PRIVATE
+        Gflags::gflags
         Glog::glog
         Boost::filesystem
         Boost::system

src/algorithms/PVT/libs/CMakeLists.txt

@@ -48,10 +48,10 @@ set(PVT_LIB_HEADERS
 list(SORT PVT_LIB_HEADERS)
 list(SORT PVT_LIB_SOURCES)
 
-add_library(pvt_lib ${PVT_LIB_SOURCES} ${PVT_LIB_HEADERS})
-
 source_group(Headers FILES ${PVT_LIB_HEADERS})
 
+add_library(pvt_lib ${PVT_LIB_SOURCES} ${PVT_LIB_HEADERS})
+
 target_link_libraries(pvt_lib
     PUBLIC
         Armadillo::armadillo
@@ -63,11 +63,16 @@ target_link_libraries(pvt_lib
     PRIVATE
         Boost::filesystem
         Boost::system
+        Gflags::gflags
         Glog::glog
         Matio::matio
 )
 
-target_include_directories(pvt_lib PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs ${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib)
+target_include_directories(pvt_lib
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/algorithms/libs
+        ${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib
+)
 
 target_compile_definitions(pvt_lib PUBLIC -DGNSS_SDR_VERSION="${VERSION}")
 

src/algorithms/acquisition/adapters/CMakeLists.txt

@@ -86,10 +86,10 @@ endif()
 list(SORT ACQ_ADAPTER_HEADERS)
 list(SORT ACQ_ADAPTER_SOURCES)
 
-add_library(acq_adapters ${ACQ_ADAPTER_SOURCES} ${ACQ_ADAPTER_HEADERS})
-
 source_group(Headers FILES ${ACQ_ADAPTER_HEADERS})
 
+add_library(acq_adapters ${ACQ_ADAPTER_SOURCES} ${ACQ_ADAPTER_HEADERS})
+
 target_link_libraries(acq_adapters
     PUBLIC
         gnss_sp_libs
@@ -100,6 +100,7 @@ target_link_libraries(acq_adapters
         gnss_system_parameters
     PRIVATE
         Boost::boost
+        Gflags::gflags
         Glog::glog
         Volkgnsssdr::volkgnsssdr
         acquisition_lib

src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt

@@ -61,9 +61,11 @@ endif()
 
 list(SORT ACQ_GR_BLOCKS_HEADERS)
 list(SORT ACQ_GR_BLOCKS_SOURCES)
-add_library(acq_gr_blocks ${ACQ_GR_BLOCKS_SOURCES} ${ACQ_GR_BLOCKS_HEADERS})
+
 source_group(Headers FILES ${ACQ_GR_BLOCKS_HEADERS})
 
+add_library(acq_gr_blocks ${ACQ_GR_BLOCKS_SOURCES} ${ACQ_GR_BLOCKS_HEADERS})
+
 target_link_libraries(acq_gr_blocks
     PUBLIC
         Gnuradio::runtime
@@ -73,11 +75,12 @@ target_link_libraries(acq_gr_blocks
         acquisition_lib
         ${OPT_LIBRARIES}
     PRIVATE
-        gnss_sp_libs
-        Glog::glog
         Boost::filesystem
+        Gflags::gflags
+        Glog::glog
         Matio::matio
         Volkgnsssdr::volkgnsssdr
+        gnss_sp_libs
         gnss_rx
 )
 

src/algorithms/acquisition/libs/CMakeLists.txt

@@ -27,18 +27,19 @@ set(ACQUISITION_LIB_SOURCES ${ACQUISITION_LIB_SOURCES} acq_conf.cc)
 list(SORT ACQUISITION_LIB_HEADERS)
 list(SORT ACQUISITION_LIB_SOURCES)
 
+source_group(Headers FILES ${ACQUISITION_LIB_HEADERS})
+
 add_library(acquisition_lib
     ${ACQUISITION_LIB_SOURCES}
     ${ACQUISITION_LIB_HEADERS}
 )
 
-source_group(Headers FILES ${ACQUISITION_LIB_HEADERS})
-
 target_link_libraries(acquisition_lib
     PUBLIC
         Volk::volk
         Gnuradio::fft
     PRIVATE
+        Gflags::gflags
         Glog::glog
         gnss_system_parameters
         gnss_rx

src/algorithms/channel/adapters/CMakeLists.txt

@@ -32,8 +32,9 @@ target_link_libraries(channel_adapters
         channel_fsm
         gnss_rx
     PRIVATE
-        gnss_sdr_flags
+        Gflags::gflags
         Glog::glog
+        gnss_sdr_flags
 )
 
 set_property(TARGET channel_adapters

src/algorithms/channel/libs/CMakeLists.txt

@@ -29,14 +29,16 @@ set(CHANNEL_FSM_HEADERS
 list(SORT CHANNEL_FSM_HEADERS)
 list(SORT CHANNEL_FSM_SOURCES)
 
-add_library(channel_fsm ${CHANNEL_FSM_SOURCES} ${CHANNEL_FSM_HEADERS})
 source_group(Headers FILES ${CHANNEL_FSM_HEADERS})
 
+add_library(channel_fsm ${CHANNEL_FSM_SOURCES} ${CHANNEL_FSM_HEADERS})
+
 target_link_libraries(channel_fsm
     PUBLIC
         gnss_rx
         Gnuradio::runtime
     PRIVATE
+        Gflags::gflags
         Glog::glog
 )
 

src/algorithms/conditioner/adapters/CMakeLists.txt

@@ -30,14 +30,16 @@ set(COND_ADAPTER_HEADERS
 list(SORT COND_ADAPTER_HEADERS)
 list(SORT COND_ADAPTER_SOURCES)
 
-add_library(conditioner_adapters ${COND_ADAPTER_SOURCES} ${COND_ADAPTER_HEADERS})
 source_group(Headers FILES ${COND_ADAPTER_HEADERS})
 
+add_library(conditioner_adapters ${COND_ADAPTER_SOURCES} ${COND_ADAPTER_HEADERS})
+
 target_link_libraries(conditioner_adapters
     PUBLIC
         gnss_rx
         Gnuradio::runtime
     PRIVATE
+        Gflags::gflags
         Glog::glog
 )
 

src/algorithms/data_type_adapter/adapters/CMakeLists.txt

@@ -38,21 +38,22 @@ set(DATATYPE_ADAPTER_HEADERS
 list(SORT DATATYPE_ADAPTER_HEADERS)
 list(SORT DATATYPE_ADAPTER_SOURCES)
 
+source_group(Headers FILES ${DATATYPE_ADAPTER_HEADERS})
+
 add_library(datatype_adapters
     ${DATATYPE_ADAPTER_SOURCES}
     ${DATATYPE_ADAPTER_HEADERS}
 )
 
-source_group(Headers FILES ${DATATYPE_ADAPTER_HEADERS})
-
 target_link_libraries(datatype_adapters
     PUBLIC
+        Gnuradio::blocks
         gnss_system_parameters
         gnss_rx
         data_type_gr_blocks
         gnss_sp_libs
-        Gnuradio::blocks
     PRIVATE
+        Gflags::gflags
         Glog::glog
         Volk::volk
 )

src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt

@@ -32,13 +32,13 @@ 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}
 )
 
-source_group(Headers FILES ${DATA_TYPE_GR_BLOCKS_HEADERS})
-
 target_link_libraries(data_type_gr_blocks
     PUBLIC
         Gnuradio::runtime

src/algorithms/input_filter/adapters/CMakeLists.txt

@@ -37,26 +37,27 @@ 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}
 )
 
-source_group(Headers FILES ${INPUT_FILTER_ADAPTER_HEADERS})
-
 target_link_libraries(input_filter_adapters
     PUBLIC
-        input_filter_gr_blocks
-        Gnuradio::filter
         Gnuradio::blocks
+        Gnuradio::filter
+        input_filter_gr_blocks
         gnss_sp_libs
         gnss_rx
     PRIVATE
         Volk::volk
 )
 
-target_include_directories(input_filter_adapters PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
-
+target_include_directories(input_filter_adapters
+    PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs
+)
 
 if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
     target_compile_definitions(input_filter_adapters PUBLIC -DGR_GREATER_38=1)

src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt

@@ -34,16 +34,16 @@ 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})
 
-source_group(Headers FILES ${INPUT_FILTER_GR_BLOCKS_HEADERS})
-
 target_link_libraries(input_filter_gr_blocks
     PUBLIC
-        Gnuradio::filter
         Gnuradio::blocks
+        Gnuradio::filter
         Volkgnsssdr::volkgnsssdr
     PRIVATE
         Gflags::gflags

src/algorithms/libs/CMakeLists.txt

@@ -103,9 +103,10 @@ endif()
 list(SORT GNSS_SPLIBS_HEADERS)
 list(SORT GNSS_SPLIBS_SOURCES)
 
-add_library(gnss_sp_libs ${GNSS_SPLIBS_SOURCES} ${GNSS_SPLIBS_HEADERS})
 source_group(Headers FILES ${GNSS_SPLIBS_HEADERS})
 
+add_library(gnss_sp_libs ${GNSS_SPLIBS_SOURCES} ${GNSS_SPLIBS_HEADERS})
+
 target_link_libraries(gnss_sp_libs
     PUBLIC
         Boost::boost
@@ -119,11 +120,14 @@ target_link_libraries(gnss_sp_libs
         ${OPT_LIBRARIES}
     PRIVATE
         Boost::filesystem
+        Gflags::gflags
         Glog::glog
         gnss_rx
 )
 
-target_compile_definitions(gnss_sp_libs PUBLIC -DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}")
+target_compile_definitions(gnss_sp_libs
+    PUBLIC -DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}"
+)
 
 if(${GFLAGS_GREATER_20})
     target_compile_definitions(gnss_sp_libs PUBLIC -DGFLAGS_GREATER_2_0=1)
@@ -134,9 +138,13 @@ set_property(TARGET gnss_sp_libs
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
 
-add_library(gnss_sdr_flags gnss_sdr_flags.cc gnss_sdr_flags.h)
+
+###############################################################################
+
 source_group(Headers FILES gnss_sdr_flags.h)
 
+add_library(gnss_sdr_flags gnss_sdr_flags.cc gnss_sdr_flags.h)
+
 target_link_libraries(gnss_sdr_flags
     PUBLIC
         Gflags::gflags
@@ -148,7 +156,9 @@ if(${GFLAGS_GREATER_20})
     target_compile_definitions(gnss_sdr_flags PUBLIC -DGFLAGS_GREATER_2_0=1)
 endif()
 
-target_compile_definitions(gnss_sdr_flags PUBLIC -DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}")
+target_compile_definitions(gnss_sdr_flags
+    PUBLIC -DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}"
+)
 
 set_property(TARGET gnss_sdr_flags
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES

src/algorithms/libs/rtklib/CMakeLists.txt

@@ -61,9 +61,10 @@ set(RTKLIB_LIB_HEADERS
 list(SORT RTKLIB_LIB_HEADERS)
 list(SORT RTKLIB_LIB_SOURCES)
 
-add_library(rtklib_lib ${RTKLIB_LIB_SOURCES} ${RTKLIB_LIB_HEADERS})
 source_group(Headers FILES ${RTKLIB_LIB_HEADERS})
 
+add_library(rtklib_lib ${RTKLIB_LIB_SOURCES} ${RTKLIB_LIB_HEADERS})
+
 if(OS_IS_MACOSX)
     set(MAC_LIBRARIES "-framework Accelerate")
 endif()

src/algorithms/observables/adapters/CMakeLists.txt

@@ -24,11 +24,14 @@ set(OBS_ADAPTER_HEADERS
     hybrid_observables.h
 )
 
-add_library(obs_adapters ${OBS_ADAPTER_SOURCES} ${OBS_ADAPTER_HEADERS})
-
 source_group(Headers FILES ${OBS_ADAPTER_HEADERS})
 
-target_include_directories(obs_adapters PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
+add_library(obs_adapters ${OBS_ADAPTER_SOURCES} ${OBS_ADAPTER_HEADERS})
+
+target_include_directories(obs_adapters
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/algorithms/libs
+)
 
 target_link_libraries(obs_adapters
     PUBLIC
@@ -36,6 +39,7 @@ target_link_libraries(obs_adapters
         gnss_rx
         gnss_sp_libs
     PRIVATE
+        Gflags::gflags
         Glog::glog
 )
 

src/algorithms/observables/gnuradio_blocks/CMakeLists.txt

@@ -24,22 +24,26 @@ set(OBS_GR_BLOCKS_HEADERS
     hybrid_observables_cc.h
 )
 
+source_group(Headers FILES ${OBS_GR_BLOCKS_HEADERS})
+
 add_library(obs_gr_blocks ${OBS_GR_BLOCKS_SOURCES} ${OBS_GR_BLOCKS_HEADERS})
 
-target_include_directories(obs_gr_blocks PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
-
-source_group(Headers FILES ${OBS_GR_BLOCKS_HEADERS})
+target_include_directories(obs_gr_blocks
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/algorithms/libs
+)
 
 target_link_libraries(obs_gr_blocks
     PUBLIC
-        Gnuradio::blocks
         Boost::boost
+        Gnuradio::blocks
         gnss_system_parameters
     PRIVATE
-        gnss_sp_libs
+        Gflags::gflags
         Glog::glog
         Boost::filesystem
         Matio::matio
+        gnss_sp_libs
 )
 
 set_property(TARGET obs_gr_blocks

src/algorithms/resampler/adapters/CMakeLists.txt

@@ -30,19 +30,20 @@ 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}
 )
 
-source_group(Headers FILES ${RESAMPLER_ADAPTER_HEADERS})
-
 target_link_libraries(resampler_adapters
     PUBLIC
         Gnuradio::runtime
         resampler_gr_blocks
         gnss_rx
     PRIVATE
+        Gflags::gflags
         Glog::glog
         Volk::volk
 )

src/algorithms/signal_generator/adapters/CMakeLists.txt

@@ -19,13 +19,13 @@
 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}
 )
 
-source_group(Headers FILES ${SIGNAL_GENERATOR_ADAPTER_HEADERS})
-
 target_link_libraries(signal_generator_adapters
     PUBLIC
         signal_generator_blocks
@@ -33,6 +33,7 @@ target_link_libraries(signal_generator_adapters
         Gnuradio::blocks
         gnss_rx
     PRIVATE
+        Gflags::gflags
         Glog::glog
         gnss_sp_libs
 )

src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt

@@ -19,13 +19,13 @@
 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_blocks
     ${SIGNAL_GENERATOR_BLOCK_SOURCES}
     ${SIGNAL_GENERATOR_BLOCK_HEADERS}
 )
 
-source_group(Headers FILES ${SIGNAL_GENERATOR_BLOCK_HEADERS})
-
 target_link_libraries(signal_generator_blocks
     PUBLIC
         Boost::boost

src/algorithms/signal_source/adapters/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  (see AUTHORS file for a list of contributors)
+# Copyright (C) 2012-2019  (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -173,9 +173,14 @@ 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})
+add_library(signal_source_adapters
+    ${SIGNAL_SOURCE_ADAPTER_SOURCES}
+    ${SIGNAL_SOURCE_ADAPTER_HEADERS}
+)
 
-target_include_directories(signal_source_adapters PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
+target_include_directories(signal_source_adapters
+    PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs
+)
 
 target_link_libraries(signal_source_adapters
     PUBLIC
@@ -243,7 +248,9 @@ if(ENABLE_ARRAY AND GRDBFCTTC_FOUND)
     )
 endif()
 
-target_compile_definitions(signal_source_adapters PRIVATE -DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}")
+target_compile_definitions(signal_source_adapters
+    PRIVATE -DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}"
+)
 
 set_property(TARGET signal_source_adapters APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>

src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt

@@ -51,13 +51,13 @@ 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}
 )
 
-source_group(Headers FILES ${SIGNAL_SOURCE_GR_BLOCKS_HEADERS})
-
 target_link_libraries(signal_source_gr_blocks
     PUBLIC
         signal_source_lib

src/algorithms/signal_source/libs/CMakeLists.txt

@@ -61,14 +61,15 @@ set(SIGNAL_SOURCE_LIB_HEADERS
 list(SORT SIGNAL_SOURCE_LIB_HEADERS)
 list(SORT SIGNAL_SOURCE_LIB_SOURCES)
 
-add_library(signal_source_lib ${SIGNAL_SOURCE_LIB_SOURCES} ${SIGNAL_SOURCE_LIB_HEADERS})
-
 source_group(Headers FILES ${SIGNAL_SOURCE_LIB_HEADERS})
 
+add_library(signal_source_lib ${SIGNAL_SOURCE_LIB_SOURCES} ${SIGNAL_SOURCE_LIB_HEADERS})
+
 target_link_libraries(signal_source_lib
     PUBLIC
         Boost::boost
     PRIVATE
+        Gflags::gflags
         Glog::glog
 )
 

src/algorithms/telemetry_decoder/adapters/CMakeLists.txt

@@ -44,19 +44,21 @@ 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}
 )
 
-source_group(Headers FILES ${TELEMETRY_DECODER_ADAPTER_HEADERS})
-
 target_link_libraries(telemetry_decoder_adapters
     PUBLIC
         telemetry_decoder_gr_blocks
         gnss_system_parameters
         gnss_rx
     PRIVATE
+        Gflags::gflags
+        Glog::glog
         Gnuradio::runtime
         telemetry_decoder_lib
 )

src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt

@@ -41,13 +41,13 @@ 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}
 )
 
-source_group(Headers FILES ${TELEMETRY_DECODER_GR_BLOCKS_HEADERS})
-
 target_link_libraries(telemetry_decoder_gr_blocks
     PUBLIC
         telemetry_decoder_libswiftcnav
@@ -58,6 +58,7 @@ target_link_libraries(telemetry_decoder_gr_blocks
         Volkgnsssdr::volkgnsssdr
     PRIVATE
         Boost::boost
+        Gflags::gflags
         Glog::glog
 )
 

src/algorithms/telemetry_decoder/libs/CMakeLists.txt

@@ -31,17 +31,20 @@ 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_lib
     ${TELEMETRY_DECODER_LIB_SOURCES}
     ${TELEMETRY_DECODER_LIB_HEADERS}
 )
 
-source_group(Headers FILES ${TELEMETRY_DECODER_LIB_HEADERS})
-
 target_link_libraries(telemetry_decoder_lib
     PUBLIC
         gnss_system_parameters
         gnss_rx
+    PRIVATE
+        Gflags::gflags
+        Glog::glog
 )
 
 set_property(TARGET telemetry_decoder_lib

src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt

@@ -34,6 +34,8 @@ 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}
@@ -44,8 +46,6 @@ set_property(TARGET telemetry_decoder_libswiftcnav
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
 
-source_group(Headers FILES ${TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS})
-
 set_target_properties(telemetry_decoder_libswiftcnav
     PROPERTIES LINKER_LANGUAGE C
 )

src/algorithms/tracking/adapters/CMakeLists.txt

@@ -90,13 +90,13 @@ 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}
 )
 
-source_group(Headers FILES ${TRACKING_ADAPTER_HEADERS})
-
 target_link_libraries(tracking_adapters
     PUBLIC
         tracking_gr_blocks

src/algorithms/tracking/libs/CMakeLists.txt

@@ -69,10 +69,10 @@ endif()
 list(SORT TRACKING_LIB_HEADERS)
 list(SORT TRACKING_LIB_SOURCES)
 
-add_library(tracking_lib ${TRACKING_LIB_SOURCES} ${TRACKING_LIB_HEADERS})
-
 source_group(Headers FILES ${TRACKING_LIB_HEADERS})
 
+add_library(tracking_lib ${TRACKING_LIB_SOURCES} ${TRACKING_LIB_HEADERS})
+
 target_link_libraries(tracking_lib
     PUBLIC
         Armadillo::armadillo

src/core/libs/CMakeLists.txt

@@ -35,10 +35,10 @@ set(CORE_LIBS_HEADERS
 list(SORT CORE_LIBS_HEADERS)
 list(SORT CORE_LIBS_SOURCES)
 
-add_library(rx_core_lib ${CORE_LIBS_SOURCES} ${CORE_LIBS_HEADERS})
-
 source_group(Headers FILES ${CORE_LIBS_HEADERS})
 
+add_library(rx_core_lib ${CORE_LIBS_SOURCES} ${CORE_LIBS_HEADERS})
+
 target_link_libraries(rx_core_lib
     PUBLIC
         Boost::boost

src/core/monitor/CMakeLists.txt

@@ -30,23 +30,23 @@ set(CORE_MONITOR_LIBS_HEADERS
 list(SORT CORE_MONITOR_LIBS_HEADERS)
 list(SORT CORE_MONITOR_LIBS_SOURCES)
 
+source_group(Headers FILES ${CORE_MONITOR_LIBS_HEADERS})
+
 add_library(core_monitor_lib
     ${CORE_MONITOR_LIBS_SOURCES}
     ${CORE_MONITOR_LIBS_HEADERS}
 )
 
-source_group(Headers FILES ${CORE_MONITOR_LIBS_HEADERS})
-
 target_link_libraries(core_monitor_lib
     PUBLIC
         Boost::serialization
         Boost::system
-        gnss_system_parameters
         Gnuradio::runtime
+        gnss_system_parameters
     PRIVATE
-        Gnuradio::pmt
         Gflags::gflags
         Glog::glog
+        Gnuradio::pmt
 )
 
 set_property(TARGET core_monitor_lib

src/core/receiver/CMakeLists.txt

@@ -62,15 +62,16 @@ set(GNSS_RECEIVER_INTERFACE_HEADERS
 
 list(SORT GNSS_RECEIVER_INTERFACE_HEADERS)
 
+source_group(Headers FILES ${GNSS_RECEIVER_HEADERS}
+    ${GNSS_RECEIVER_INTERFACE_HEADERS}
+)
+
 add_library(gnss_rx
     ${GNSS_RECEIVER_SOURCES}
     ${GNSS_RECEIVER_HEADERS}
     ${GNSS_RECEIVER_INTERFACE_HEADERS}
 )
 
-source_group(Headers FILES ${GNSS_RECEIVER_HEADERS}
-    ${GNSS_RECEIVER_INTERFACE_HEADERS})
-
 if(ENABLE_FPGA)
     target_compile_definitions(gnss_rx PUBLIC -DENABLE_FPGA=1)
 endif()
@@ -139,12 +140,14 @@ endif()
 
 target_link_libraries(gnss_rx
     PUBLIC
+        Armadillo::armadillo
         Boost::boost
         Boost::thread
         Gnuradio::runtime
         rx_core_lib
         core_monitor_lib
     PRIVATE
+        Gflags::gflags
         Glog::glog
         signal_source_adapters
         datatype_adapters

src/core/system_parameters/CMakeLists.txt

@@ -103,19 +103,19 @@ set(SYSTEM_PARAMETERS_HEADERS
 list(SORT SYSTEM_PARAMETERS_HEADERS)
 list(SORT SYSTEM_PARAMETERS_SOURCES)
 
+source_group(Headers FILES ${SYSTEM_PARAMETERS_HEADERS})
+
 add_library(gnss_system_parameters
     ${SYSTEM_PARAMETERS_SOURCES}
     ${SYSTEM_PARAMETERS_HEADERS}
 )
 
-source_group(Headers FILES ${SYSTEM_PARAMETERS_HEADERS})
-
 target_link_libraries(gnss_system_parameters
     PUBLIC
         Boost::date_time
         Boost::serialization
-        gnss_rx
         Glog::glog
+        gnss_rx
     PRIVATE
         Gflags::gflags
 )

src/main/CMakeLists.txt

@@ -16,76 +16,59 @@
 # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
 #
 
-set(GNSS_SDR_OPTIONAL_LIBS "")
-set(GNSS_SDR_OPTIONAL_HEADERS "")
-
-if(ENABLE_GPERFTOOLS)
-    if(GPERFTOOLS_FOUND)
-        set(GNSS_SDR_OPTIONAL_LIBS "${GNSS_SDR_OPTIONAL_LIBS};${GPERFTOOLS_PROFILER};${GPERFTOOLS_TCMALLOC}")
-        set(GNSS_SDR_OPTIONAL_HEADERS "${GNSS_SDR_OPTIONAL_HEADERS};${GPERFTOOLS_INCLUDE_DIR}")
-    endif()
-endif()
-
-if(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd)
-    set(GNSS_SDR_OPTIONAL_LIBS ${GNSS_SDR_OPTIONAL_LIBS} ${UHD_LIBRARIES} ${GNURADIO_UHD_LIBRARIES})
-    set(GNSS_SDR_OPTIONAL_HEADERS ${GNSS_SDR_OPTIONAL_HEADERS} ${UHD_INCLUDE_DIRS})
-endif()
-
-if(OPENSSL_FOUND)
-    add_definitions(-DUSE_OPENSSL_FALLBACK=1)
-endif()
-
-if(ENABLE_CUDA)
-    add_definitions(-DCUDA_GPU_ACCEL=1)
-    set(GNSS_SDR_OPTIONAL_LIBS ${GNSS_SDR_OPTIONAL_LIBS} ${CUDA_LIBRARIES})
-    set(GNSS_SDR_OPTIONAL_HEADERS ${GNSS_SDR_OPTIONAL_HEADERS} ${CUDA_INCLUDE_DIRS})
-endif()
-
-if(ORC_FOUND)
-    set(GNSS_SDR_OPTIONAL_LIBS ${GNSS_SDR_OPTIONAL_LIBS} ${ORC_LIBRARIES})
-    set(GNSS_SDR_OPTIONAL_HEADERS ${GNSS_SDR_OPTIONAL_HEADERS} ${ORC_INCLUDE_DIRS})
-endif()
 
 if(OS_IS_MACOSX)
     if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-        set(MAC_LIBRARIES "-framework Accelerate -lc++")
+        set(MAC_LIBRARIES "-lc++")
     endif()
 endif()
 
 add_executable(gnss-sdr ${CMAKE_CURRENT_SOURCE_DIR}/main.cc)
 
-target_include_directories(gnss-sdr PRIVATE
-    ${GNSS_SDR_OPTIONAL_HEADERS}
-    ${OPT_GNSSSDR_INCLUDE_DIRS}
+target_link_libraries(gnss-sdr
+    PUBLIC
+        Boost::filesystem
+        Boost::system
+        Gflags::gflags
+        Glog::glog
+        gnss_rx
+        gnss_sdr_flags
+        ${MAC_LIBRARIES}
 )
 
 target_compile_definitions(gnss-sdr PUBLIC -DGNSS_SDR_VERSION="${VERSION}")
 
+if(ENABLE_CUDA)
+    target_link_libraries(gnss-sdr
+        PUBLIC
+            ${CUDA_LIBRARIES}
+    )
+    target_include_directories(gnss-sdr
+        PUBLIC
+            ${CUDA_INCLUDE_DIRS}
+    )
+    target_compile_definitions(gnss-sdr PRIVATE -DCUDA_GPU_ACCEL=1)
+endif()
+
+if(ENABLE_GPERFTOOLS)
+    if(GPERFTOOLS_FOUND)
+        target_link_libraries(gnss-sdr
+            PUBLIC
+                ${GPERFTOOLS_PROFILER}
+                ${GPERFTOOLS_TCMALLOC}
+        )
+        target_include_directories(gnss-sdr
+            PRIVATE
+                ${GPERFTOOLS_INCLUDE_DIR}
+        )
+    endif()
+endif()
+
 add_custom_command(TARGET gnss-sdr
     POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:gnss-sdr>
         ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:gnss-sdr>
 )
 
-target_link_libraries(gnss-sdr
-    PUBLIC
-        Boost::filesystem
-        Boost::system
-        gnss_sdr_flags
-        gnss_system_parameters
-        gnss_sp_libs
-        gnss_rx
-        ${MAC_LIBRARIES}
-        ${THREAD_LIBRARIES}
-        ${GNSS_SDR_OPTIONAL_LIBS}
-    PRIVATE
-        rtklib_lib
-        Gflags::gflags
-        Glog::glog
-        Armadillo::armadillo
-        Volkgnsssdr::volkgnsssdr
-)
-
-
 install(TARGETS gnss-sdr
     RUNTIME DESTINATION bin
     COMPONENT "gnss-sdr")