Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into next

src/algorithms/PVT/adapters/CMakeLists.txt

@@ -46,5 +46,11 @@ include_directories(
 )
 
 add_library(pvt_adapters ${PVT_ADAPTER_SOURCES} ${PVT_ADAPTER_HEADERS})
+
 source_group(Headers FILES ${PVT_ADAPTER_HEADERS})
-target_link_libraries(pvt_adapters pvt_gr_blocks ${ARMADILLO_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES})
+
+target_link_libraries(pvt_adapters
+    pvt_gr_blocks
+    ${ARMADILLO_LIBRARIES}
+    ${GNURADIO_RUNTIME_LIBRARIES}
+)

src/algorithms/PVT/libs/CMakeLists.txt

@@ -46,7 +46,6 @@ set(PVT_LIB_HEADERS
     pvt_conf.h
 )
 
-
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_SOURCE_DIR}/src/core/system_parameters
@@ -69,9 +68,16 @@ add_library(pvt_lib ${PVT_LIB_SOURCES} ${PVT_LIB_HEADERS})
 source_group(Headers FILES ${PVT_LIB_HEADERS})
 
 if(MATIO_FOUND)
-    add_dependencies(pvt_lib glog-${glog_RELEASE} armadillo-${armadillo_RELEASE})
+    add_dependencies(pvt_lib
+        glog-${glog_RELEASE}
+        armadillo-${armadillo_RELEASE}
+    )
 else(MATIO_FOUND)
-    add_dependencies(pvt_lib glog-${glog_RELEASE} armadillo-${armadillo_RELEASE} matio-${GNSSSDR_MATIO_LOCAL_VERSION})
+    add_dependencies(pvt_lib
+        glog-${glog_RELEASE}
+        armadillo-${armadillo_RELEASE}
+        matio-${GNSSSDR_MATIO_LOCAL_VERSION}
+    )
 endif(MATIO_FOUND)
 
 target_link_libraries(

src/algorithms/acquisition/adapters/CMakeLists.txt

@@ -55,24 +55,31 @@ set(ACQ_ADAPTER_HEADERS
     glonass_l2_ca_pcps_acquisition.h
 )
 
-
 if(ENABLE_FPGA)
-    set(ACQ_ADAPTER_SOURCES ${ACQ_ADAPTER_SOURCES} gps_l1_ca_pcps_acquisition_fpga.cc
+    set(ACQ_ADAPTER_SOURCES ${ACQ_ADAPTER_SOURCES}
+        gps_l1_ca_pcps_acquisition_fpga.cc
         gps_l2_m_pcps_acquisition_fpga.cc
         galileo_e1_pcps_ambiguous_acquisition_fpga.cc
         galileo_e5a_pcps_acquisition_fpga.cc
-                                                   gps_l5i_pcps_acquisition_fpga.cc)
+        gps_l5i_pcps_acquisition_fpga.cc
-
+    )
-    set(ACQ_ADAPTER_HEADERS ${ACQ_ADAPTER_HEADERS} gps_l1_ca_pcps_acquisition_fpga.h
+    set(ACQ_ADAPTER_HEADERS ${ACQ_ADAPTER_HEADERS}
+        gps_l1_ca_pcps_acquisition_fpga.h
         gps_l2_m_pcps_acquisition_fpga.h
         galileo_e1_pcps_ambiguous_acquisition_fpga.h
         galileo_e5a_pcps_acquisition_fpga.h
-                                                   gps_l5i_pcps_acquisition_fpga.h)
+        gps_l5i_pcps_acquisition_fpga.h
+    )
 endif(ENABLE_FPGA)
 
 if(OPENCL_FOUND)
-    set(ACQ_ADAPTER_SOURCES ${ACQ_ADAPTER_SOURCES} gps_l1_ca_pcps_opencl_acquisition.cc)
+    set(ACQ_ADAPTER_SOURCES
-    set(ACQ_ADAPTER_HEADERS ${ACQ_ADAPTER_HEADERS} gps_l1_ca_pcps_opencl_acquisition.h)
+        ${ACQ_ADAPTER_SOURCES}
+        gps_l1_ca_pcps_opencl_acquisition.cc
+    )
+    set(ACQ_ADAPTER_HEADERS ${ACQ_ADAPTER_HEADERS}
+        gps_l1_ca_pcps_opencl_acquisition.h
+    )
 endif(OPENCL_FOUND)
 
 include_directories(
@@ -96,4 +103,12 @@ 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})
-target_link_libraries(acq_adapters acquisition_lib gnss_sp_libs gnss_sdr_flags acq_gr_blocks ${Boost_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES})
+target_link_libraries(acq_adapters
+    acquisition_lib
+    gnss_sp_libs
+    gnss_sdr_flags
+    acq_gr_blocks
+    ${Boost_LIBRARIES}
+    ${GNURADIO_RUNTIME_LIBRARIES}
+    ${GNURADIO_BLOCKS_LIBRARIES}
+)

src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt

@@ -65,9 +65,8 @@ include_directories(
     ${MATIO_INCLUDE_DIRS}
 )
 
-
 if(OPENCL_FOUND)
-    include_directories( ${OPENCL_INCLUDE_DIRS} )
+    include_directories(${OPENCL_INCLUDE_DIRS})
     if(OS_IS_MACOSX)
         set(OPT_LIBRARIES ${OPT_LIBRARIES} "-framework OpenCL")
     else(OS_IS_MACOSX)
@@ -81,9 +80,29 @@ add_library(acq_gr_blocks ${ACQ_GR_BLOCKS_SOURCES} ${ACQ_GR_BLOCKS_HEADERS})
 source_group(Headers FILES ${ACQ_GR_BLOCKS_HEADERS})
 
 if(ENABLE_FPGA)
-	target_link_libraries(acq_gr_blocks acquisition_lib gnss_sp_libs gnss_system_parameters ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_FFT_LIBRARIES} ${VOLK_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${OPT_LIBRARIES} ${OPT_ACQUISITION_LIBRARIES})
+    target_link_libraries(acq_gr_blocks
+        acquisition_lib
+        gnss_sp_libs
+        gnss_system_parameters
+        ${GNURADIO_RUNTIME_LIBRARIES}
+        ${GNURADIO_FFT_LIBRARIES}
+        ${VOLK_LIBRARIES}
+        ${VOLK_GNSSSDR_LIBRARIES}
+        ${OPT_LIBRARIES}
+        ${OPT_ACQUISITION_LIBRARIES}
+    )
 else(ENABLE_FPGA)
-	target_link_libraries(acq_gr_blocks gnss_sp_libs gnss_system_parameters ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_FFT_LIBRARIES} ${VOLK_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${OPT_LIBRARIES} ${OPT_ACQUISITION_LIBRARIES} ${MATIO_LIBRARIES})
+    target_link_libraries(acq_gr_blocks
+        gnss_sp_libs
+        gnss_system_parameters
+        ${GNURADIO_RUNTIME_LIBRARIES}
+        ${GNURADIO_FFT_LIBRARIES}
+        ${VOLK_LIBRARIES}
+        ${VOLK_GNSSSDR_LIBRARIES}
+        ${OPT_LIBRARIES}
+        ${MATIO_LIBRARIES}
+        ${OPT_ACQUISITION_LIBRARIES}
+    )
 endif(ENABLE_FPGA)
 
 if(NOT VOLK_GNSSSDR_FOUND)

src/algorithms/acquisition/libs/CMakeLists.txt

@@ -17,8 +17,8 @@
 #
 
 if(ENABLE_FPGA)
-   set(ACQUISITION_LIB_SOURCES fpga_acquisition.cc )
+    set(ACQUISITION_LIB_SOURCES fpga_acquisition.cc)
-   set(ACQUISITION_LIB_HEADERS fpga_acquisition.h )
+    set(ACQUISITION_LIB_HEADERS fpga_acquisition.h)
     include_directories(
         ${CMAKE_CURRENT_SOURCE_DIR}
         ${CMAKE_SOURCE_DIR}/src/core/system_parameters
@@ -38,9 +38,19 @@ set(ACQUISITION_LIB_SOURCES ${ACQUISITION_LIB_SOURCES} acq_conf.cc)
 list(SORT ACQUISITION_LIB_HEADERS)
 list(SORT ACQUISITION_LIB_SOURCES)
 
-add_library(acquisition_lib ${ACQUISITION_LIB_SOURCES} ${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 ${VOLK_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES})
+
+target_link_libraries(acquisition_lib
+    ${VOLK_LIBRARIES}
+    ${VOLK_GNSSSDR_LIBRARIES}
+    ${GNURADIO_RUNTIME_LIBRARIES}
+)
+
 if(VOLK_GNSSSDR_FOUND)
     add_dependencies(acquisition_lib glog-${glog_RELEASE})
 else(VOLK_GNSSSDR_FOUND)

src/algorithms/channel/adapters/CMakeLists.txt

@@ -32,6 +32,16 @@ include_directories(
     ${GNURADIO_RUNTIME_INCLUDE_DIRS}
 )
 
-add_library(channel_adapters ${CHANNEL_ADAPTER_SOURCES} ${CHANNEL_ADAPTER_HEADERS})
+add_library(channel_adapters
+    ${CHANNEL_ADAPTER_SOURCES}
+    ${CHANNEL_ADAPTER_HEADERS}
+)
+
 source_group(Headers FILES ${CHANNEL_ADAPTER_HEADERS})
-target_link_libraries(channel_adapters channel_fsm ${GNURADIO_RUNTIME_LIBRARIES} ${Boost_LIBRARIES} gnss_sdr_flags)
+
+target_link_libraries(channel_adapters
+    channel_fsm
+    ${GNURADIO_RUNTIME_LIBRARIES}
+    ${Boost_LIBRARIES}
+    gnss_sdr_flags
+)

src/algorithms/channel/libs/CMakeLists.txt

@@ -19,12 +19,12 @@
 set(CHANNEL_FSM_SOURCES
     channel_fsm.cc
     channel_msg_receiver_cc.cc
-    )
+)
 
 set(CHANNEL_FSM_HEADERS
     channel_fsm.h
     channel_msg_receiver_cc.h
-    )
+)
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}

src/algorithms/data_type_adapter/adapters/CMakeLists.txt

@@ -50,7 +50,15 @@ include_directories(
 list(SORT DATATYPE_ADAPTER_HEADERS)
 list(SORT DATATYPE_ADAPTER_SOURCES)
 
-add_library(datatype_adapters ${DATATYPE_ADAPTER_SOURCES} ${DATATYPE_ADAPTER_HEADERS})
+add_library(datatype_adapters
+    ${DATATYPE_ADAPTER_SOURCES}
+    ${DATATYPE_ADAPTER_HEADERS}
+)
+
 source_group(Headers FILES ${DATATYPE_ADAPTER_HEADERS})
 add_dependencies(datatype_adapters glog-${glog_RELEASE})
-target_link_libraries(datatype_adapters data_type_gr_blocks ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES})
+target_link_libraries(datatype_adapters
+    data_type_gr_blocks
+    ${GNURADIO_RUNTIME_LIBRARIES}
+    ${GNURADIO_BLOCKS_LIBRARIES}
+)

src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt

@@ -38,6 +38,14 @@ include_directories(
 list(SORT DATA_TYPE_GR_BLOCKS_HEADERS)
 list(SORT DATA_TYPE_GR_BLOCKS_SOURCES)
 
-add_library(data_type_gr_blocks ${DATA_TYPE_GR_BLOCKS_SOURCES} ${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 ${GNURADIO_RUNTIME_LIBRARIES} ${VOLK_LIBRARIES})
+
+target_link_libraries(data_type_gr_blocks
+    ${GNURADIO_RUNTIME_LIBRARIES}
+    ${VOLK_LIBRARIES}
+)

src/algorithms/input_filter/adapters/CMakeLists.txt

@@ -46,14 +46,24 @@ include_directories(
     ${VOLK_INCLUDE_DIRS}
 )
 
-if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4" )
+if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
-     add_definitions( -DGR_GREATER_38=1 )
+    add_definitions(-DGR_GREATER_38=1)
-endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4" )
+endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
 
 list(SORT INPUT_FILTER_ADAPTER_HEADERS)
 list(SORT INPUT_FILTER_ADAPTER_SOURCES)
 
-add_library(input_filter_adapters ${INPUT_FILTER_ADAPTER_SOURCES} ${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})
 add_dependencies(input_filter_adapters glog-${glog_RELEASE} gnss_sp_libs)
-target_link_libraries(input_filter_adapters input_filter_gr_blocks ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES} ${GNURADIO_FILTER_LIBRARIES} gnss_sp_libs)
+target_link_libraries(input_filter_adapters
+    input_filter_gr_blocks
+    ${GNURADIO_RUNTIME_LIBRARIES}
+    ${GNURADIO_BLOCKS_LIBRARIES}
+    ${GNURADIO_FILTER_LIBRARIES}
+    gnss_sp_libs
+)

src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt

@@ -43,10 +43,16 @@ include_directories(
 list(SORT INPUT_FILTER_GR_BLOCKS_HEADERS)
 list(SORT INPUT_FILTER_GR_BLOCKS_SOURCES)
 
-add_library(input_filter_gr_blocks ${INPUT_FILTER_GR_BLOCKS_SOURCES} ${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 ${GNURADIO_FILTER_LIBRARIES}  ${VOLK_GNSSSDR_LIBRARIES} ${LOG4CPP_LIBRARIES})
+target_link_libraries(input_filter_gr_blocks
+    ${GNURADIO_FILTER_LIBRARIES}
+    ${VOLK_GNSSSDR_LIBRARIES}
+    ${LOG4CPP_LIBRARIES})
 
 if(NOT VOLK_GNSSSDR_FOUND)
     add_dependencies(input_filter_gr_blocks volk_gnsssdr_module glog-${glog_RELEASE})

src/algorithms/libs/CMakeLists.txt

@@ -67,18 +67,17 @@ set(GNSS_SPLIBS_HEADERS
     geofunctions.h
 )
 
-
 if(ENABLE_FPGA)
-    set(GNSS_SPLIBS_SOURCES ${GNSS_SPLIBS_SOURCES}
+    set(GNSS_SPLIBS_SOURCES
+        ${GNSS_SPLIBS_SOURCES}
         gnss_sdr_time_counter.cc
         gnss_sdr_fpga_sample_counter.cc
     )
-
+    set(GNSS_SPLIBS_HEADERS
-    set(GNSS_SPLIBS_HEADERS ${GNSS_SPLIBS_HEADERS}
+        ${GNSS_SPLIBS_HEADERS}
         gnss_sdr_time_counter.h
         gnss_sdr_fpga_sample_counter.h
     )
-
 endif(ENABLE_FPGA)
 
 if(OPENCL_FOUND)
@@ -87,7 +86,6 @@ if(OPENCL_FOUND)
         opencl/fft_setup.cc # Needs OpenCL
         opencl/fft_kernelstring.cc # Needs OpenCL
     )
-
     set(GNSS_SPLIBS_HEADERS ${GNSS_SPLIBS_HEADERS}
         opencl/fft_execute.h # Needs OpenCL
         opencl/fft_setup.h # Needs OpenCL
@@ -111,7 +109,7 @@ include_directories(
 )
 
 if(OPENCL_FOUND)
-    include_directories( ${OPENCL_INCLUDE_DIRS} )
+    include_directories(${OPENCL_INCLUDE_DIRS})
     if(OS_IS_MACOSX)
         set(OPT_LIBRARIES ${OPT_LIBRARIES} "-framework OpenCL")
     else(OS_IS_MACOSX)
@@ -127,7 +125,8 @@ list(SORT GNSS_SPLIBS_SOURCES)
 add_library(gnss_sp_libs ${GNSS_SPLIBS_SOURCES} ${GNSS_SPLIBS_HEADERS})
 source_group(Headers FILES ${GNSS_SPLIBS_HEADERS})
 
-target_link_libraries(gnss_sp_libs ${GNURADIO_RUNTIME_LIBRARIES}
+target_link_libraries(gnss_sp_libs
+    ${GNURADIO_RUNTIME_LIBRARIES}
     ${VOLK_LIBRARIES} ${ORC_LIBRARIES}
     ${VOLK_GNSSSDR_LIBRARIES}  ${ORC_LIBRARIES}
     ${GFlags_LIBS}
@@ -140,7 +139,8 @@ target_link_libraries(gnss_sp_libs ${GNURADIO_RUNTIME_LIBRARIES}
 )
 
 if(NOT VOLK_GNSSSDR_FOUND)
-    add_dependencies(gnss_sp_libs volk_gnsssdr_module armadillo-${armadillo_RELEASE})
+    add_dependencies(gnss_sp_libs volk_gnsssdr_module
+        armadillo-${armadillo_RELEASE})
 else(NOT VOLK_GNSSSDR_FOUND)
     add_dependencies(gnss_sp_libs armadillo-${armadillo_RELEASE})
 endif(NOT VOLK_GNSSSDR_FOUND)

src/algorithms/libs/rtklib/CMakeLists.txt

@@ -16,7 +16,7 @@
 # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
 #
 
-add_definitions( -DGNSS_SDR_VERSION="${VERSION}" )
+add_definitions(-DGNSS_SDR_VERSION="${VERSION}")
 
 set(RTKLIB_LIB_SOURCES
     rtklib_rtkcmn.cc
@@ -69,7 +69,6 @@ include_directories(
     ${GLOG_INCLUDE_DIRS}
 )
 
-
 list(SORT RTKLIB_LIB_HEADERS)
 list(SORT RTKLIB_LIB_SOURCES)
 

src/algorithms/observables/gnuradio_blocks/CMakeLists.txt

@@ -39,10 +39,27 @@ include_directories(
 )
 
 add_library(obs_gr_blocks ${OBS_GR_BLOCKS_SOURCES} ${OBS_GR_BLOCKS_HEADERS})
+
 source_group(Headers FILES ${OBS_GR_BLOCKS_HEADERS})
+
 if(MATIO_FOUND)
-    add_dependencies(obs_gr_blocks gnss_sp_libs glog-${glog_RELEASE} armadillo-${armadillo_RELEASE})
+    add_dependencies(obs_gr_blocks
+        gnss_sp_libs
+        glog-${glog_RELEASE}
+        armadillo-${armadillo_RELEASE}
+    )
 else(MATIO_FOUND)
-    add_dependencies(obs_gr_blocks gnss_sp_libs glog-${glog_RELEASE} armadillo-${armadillo_RELEASE} matio-${GNSSSDR_MATIO_LOCAL_VERSION})
+    add_dependencies(obs_gr_blocks
+        gnss_sp_libs
+        glog-${glog_RELEASE}
+        armadillo-${armadillo_RELEASE}
+        matio-${GNSSSDR_MATIO_LOCAL_VERSION}
+    )
 endif(MATIO_FOUND)
-target_link_libraries(obs_gr_blocks gnss_sp_libs ${GNURADIO_RUNTIME_LIBRARIES} ${ARMADILLO_LIBRARIES} ${MATIO_LIBRARIES})
+
+target_link_libraries(obs_gr_blocks
+    gnss_sp_libs
+    ${GNURADIO_RUNTIME_LIBRARIES}
+    ${ARMADILLO_LIBRARIES}
+    ${MATIO_LIBRARIES}
+)

src/algorithms/resampler/adapters/CMakeLists.txt

@@ -16,12 +16,12 @@
 # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
 #
 
+
 set(RESAMPLER_ADAPTER_SOURCES
     direct_resampler_conditioner.cc
     mmse_resampler_conditioner.cc
 )
 
-
 set(RESAMPLER_ADAPTER_HEADERS
     direct_resampler_conditioner.h
     mmse_resampler_conditioner.h
@@ -37,14 +37,18 @@ include_directories(
     ${VOLK_INCLUDE_DIRS}
 )
 
-
+if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
-if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4" )
+    add_definitions(-DGR_GREATER_38=1)
-     add_definitions( -DGR_GREATER_38=1 )
+endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
-endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4" )
 
 list(SORT RESAMPLER_ADAPTER_HEADERS)
 list(SORT RESAMPLER_ADAPTER_SOURCES)
 
-add_library(resampler_adapters ${RESAMPLER_ADAPTER_SOURCES} ${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 resampler_gr_blocks)

src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt

@@ -40,6 +40,11 @@ include_directories(
 list(SORT RESAMPLER_GR_BLOCKS_HEADERS)
 list(SORT RESAMPLER_GR_BLOCKS_SOURCES)
 
-add_library(resampler_gr_blocks ${RESAMPLER_GR_BLOCKS_SOURCES} ${RESAMPLER_GR_BLOCKS_HEADERS})
+add_library(resampler_gr_blocks
+    ${RESAMPLER_GR_BLOCKS_SOURCES}
+    ${RESAMPLER_GR_BLOCKS_HEADERS}
+)
+
 source_group(Headers FILES ${RESAMPLER_GR_BLOCKS_HEADERS})
+
 add_dependencies(resampler_gr_blocks glog-${glog_RELEASE})

src/algorithms/signal_generator/adapters/CMakeLists.txt

@@ -31,9 +31,15 @@ include_directories(
     ${GNURADIO_RUNTIME_INCLUDE_DIRS}
 )
 
-add_library(signal_generator_adapters ${SIGNAL_GENERATOR_ADAPTER_SOURCES} ${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 gnss_sp_libs
+
+target_link_libraries(signal_generator_adapters
+    gnss_sp_libs
     signal_generator_blocks
     ${GNURADIO_RUNTIME_LIBRARIES}
     ${GNURADIO_BLOCKS_LIBRARIES}

src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt

@@ -31,12 +31,20 @@ include_directories(
     ${VOLK_GNSSSDR_INCLUDE_DIRS}
 )
 
-add_library(signal_generator_blocks ${SIGNAL_GENERATOR_BLOCK_SOURCES} ${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 gnss_system_parameters gnss_sp_libs
+
+target_link_libraries(signal_generator_blocks
+    gnss_system_parameters
+    gnss_sp_libs
     ${GNURADIO_RUNTIME_LIBRARIES}
     ${GNURADIO_FFT_LIBRARIES}
-                                              ${VOLK_GNSSSDR_LIBRARIES} ${ORC_LIBRARIES}
+    ${VOLK_GNSSSDR_LIBRARIES}
+    ${ORC_LIBRARIES}
 )
 
 if(VOLK_GNSSSDR_FOUND)

src/algorithms/signal_source/adapters/CMakeLists.txt

@@ -81,6 +81,7 @@ if(ENABLE_FMCOMMS2)
     endif(GRIIO_FOUND)
 endif(ENABLE_FMCOMMS2)
 
+
 if(ENABLE_AD9361)
     ###############################################
     # AD9361 DIRECT TO FPGA Hardware
@@ -92,7 +93,6 @@ if(ENABLE_AD9361)
 endif(ENABLE_AD9361)
 
 
-
 if(ENABLE_GN3S)
     ##############################################
     # GN3S (USB dongle)
@@ -117,7 +117,6 @@ if(ENABLE_FLEXIBAND)
     if(NOT TELEORBIT_FOUND)
         message(FATAL_ERROR "Teleorbit Flexiband GNU Radio driver required to build gnss-sdr with the optional FLEXIBAND adapter")
     endif(NOT TELEORBIT_FOUND)
-
     # Set up variables
     set(FLEXIBAND_DRIVER_INCLUDE_DIRS
         ${OPT_DRIVER_INCLUDE_DIRS}
@@ -167,6 +166,7 @@ if(ENABLE_OSMOSDR)
     endif(NOT GROSMOSDR_FOUND)
 endif(ENABLE_OSMOSDR)
 
+
 if(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd)
     set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} uhd_signal_source.cc)
     set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} uhd_signal_source.h)
@@ -199,10 +199,10 @@ set(SIGNAL_SOURCE_ADAPTER_HEADERS file_signal_source.h
 if(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.3)
     set(SIGNAL_SOURCE_ADAPTER_SOURCES ${SIGNAL_SOURCE_ADAPTER_SOURCES}
         two_bit_cpx_file_signal_source.cc
-         two_bit_packed_file_signal_source.cc )
+        two_bit_packed_file_signal_source.cc)
     set(SIGNAL_SOURCE_ADAPTER_HEADERS ${SIGNAL_SOURCE_ADAPTER_HEADERS}
         two_bit_cpx_file_signal_source.h
-         two_bit_packed_file_signal_source.h )
+        two_bit_packed_file_signal_source.h)
 endif(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.3)
 
 include_directories(

src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt

@@ -42,6 +42,7 @@ set(SIGNAL_SOURCE_GR_BLOCKS_SOURCES
     ${OPT_DRIVER_SOURCES}
 )
 
+
 set(SIGNAL_SOURCE_GR_BLOCKS_HEADERS
     unpack_byte_2bit_samples.h
     unpack_byte_2bit_cpx_samples.h

src/algorithms/telemetry_decoder/adapters/CMakeLists.txt

@@ -56,6 +56,15 @@ include_directories(
 list(SORT TELEMETRY_DECODER_ADAPTER_HEADERS)
 list(SORT TELEMETRY_DECODER_ADAPTER_SOURCES)
 
-add_library(telemetry_decoder_adapters ${TELEMETRY_DECODER_ADAPTER_SOURCES} ${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 telemetry_decoder_gr_blocks gnss_system_parameters ${GNURADIO_RUNTIME_LIBRARIES})
+
+target_link_libraries(telemetry_decoder_adapters
+    telemetry_decoder_gr_blocks
+    gnss_system_parameters
+    ${GNURADIO_RUNTIME_LIBRARIES}
+)

src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt

@@ -52,9 +52,20 @@ include_directories(
 list(SORT TELEMETRY_DECODER_GR_BLOCKS_HEADERS)
 list(SORT TELEMETRY_DECODER_GR_BLOCKS_SOURCES)
 
-add_library(telemetry_decoder_gr_blocks ${TELEMETRY_DECODER_GR_BLOCKS_SOURCES} ${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 telemetry_decoder_libswiftcnav telemetry_decoder_lib gnss_system_parameters ${GNURADIO_RUNTIME_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES})
+
+target_link_libraries(telemetry_decoder_gr_blocks
+    telemetry_decoder_libswiftcnav
+    telemetry_decoder_lib
+    gnss_system_parameters
+    ${GNURADIO_RUNTIME_LIBRARIES}
+    ${VOLK_GNSSSDR_LIBRARIES}
+)
 
 if(NOT VOLK_GNSSSDR_FOUND)
     add_dependencies(telemetry_decoder_gr_blocks volk_gnsssdr_module)

src/algorithms/telemetry_decoder/libs/CMakeLists.txt

@@ -16,6 +16,7 @@
 # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
 #
 
+
 add_subdirectory(libswiftcnav)
 
 set(TELEMETRY_DECODER_LIB_SOURCES
@@ -41,6 +42,10 @@ include_directories(
 list(SORT TELEMETRY_DECODER_LIB_HEADERS)
 list(SORT TELEMETRY_DECODER_LIB_SOURCES)
 
-add_library(telemetry_decoder_lib ${TELEMETRY_DECODER_LIB_SOURCES} ${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 gnss_system_parameters)

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

@@ -38,6 +38,12 @@ include_directories(
 list(SORT TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS)
 list(SORT TELEMETRY_DECODER_LIBSWIFTCNAV_SOURCES)
 
-add_library(telemetry_decoder_libswiftcnav STATIC ${TELEMETRY_DECODER_LIBSWIFTCNAV_SOURCES} ${TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS})
+add_library(telemetry_decoder_libswiftcnav STATIC
+    ${TELEMETRY_DECODER_LIBSWIFTCNAV_SOURCES}
+    ${TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS}
+)
+
 source_group(Headers FILES ${TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS})
-set_target_properties(telemetry_decoder_libswiftcnav PROPERTIES LINKER_LANGUAGE C)
+
+set_target_properties(telemetry_decoder_libswiftcnav
+    PROPERTIES LINKER_LANGUAGE C)

src/algorithms/tracking/adapters/CMakeLists.txt

@@ -16,26 +16,40 @@
 # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
 #
 
+
 if(ENABLE_CUDA)
-     set(OPT_TRACKING_ADAPTERS_SOURCES ${OPT_TRACKING_ADAPTERS_SOURCES} gps_l1_ca_dll_pll_tracking_gpu.cc)
+    set(OPT_TRACKING_ADAPTERS_SOURCES
-     set(OPT_TRACKING_ADAPTERS_HEADERS ${OPT_TRACKING_ADAPTERS_HEADERS} gps_l1_ca_dll_pll_tracking_gpu.h)
+        ${OPT_TRACKING_ADAPTERS_SOURCES}
-     set(OPT_TRACKING_INCLUDE_DIRS ${OPT_TRACKING_INCLUDE_DIRS} ${CUDA_INCLUDE_DIRS})
+        gps_l1_ca_dll_pll_tracking_gpu.cc
+    )
+    set(OPT_TRACKING_ADAPTERS_HEADERS
+        ${OPT_TRACKING_ADAPTERS_HEADERS}
+        gps_l1_ca_dll_pll_tracking_gpu.h
+    )
+    set(OPT_TRACKING_INCLUDE_DIRS
+        ${OPT_TRACKING_INCLUDE_DIRS}
+        ${CUDA_INCLUDE_DIRS}
+    )
 endif(ENABLE_CUDA)
 
 if(ENABLE_FPGA)
-     set(OPT_TRACKING_ADAPTERS_SOURCES ${OPT_TRACKING_ADAPTERS_SOURCES}
+    set(OPT_TRACKING_ADAPTERS_SOURCES
+        ${OPT_TRACKING_ADAPTERS_SOURCES}
         gps_l1_ca_dll_pll_tracking_fpga.cc
         gps_l2_m_dll_pll_tracking_fpga.cc
         galileo_e1_dll_pll_veml_tracking_fpga.cc
         galileo_e5a_dll_pll_tracking_fpga.cc
-                                       gps_l5_dll_pll_tracking_fpga.cc)
+        gps_l5_dll_pll_tracking_fpga.cc
+    )
 
-     set(OPT_TRACKING_ADAPTERS_HEADERS ${OPT_TRACKING_ADAPTERS_HEADERS}
+    set(OPT_TRACKING_ADAPTERS_HEADERS
+        ${OPT_TRACKING_ADAPTERS_HEADERS}
         gps_l1_ca_dll_pll_tracking_fpga.h
         gps_l2_m_dll_pll_tracking_fpga.h
         galileo_e1_dll_pll_veml_tracking_fpga.h
         galileo_e5a_dll_pll_tracking_fpga.h
-                                       gps_l5_dll_pll_tracking_fpga.h)
+        gps_l5_dll_pll_tracking_fpga.h
+    )
 endif(ENABLE_FPGA)
 
 set(TRACKING_ADAPTER_SOURCES
@@ -91,6 +105,15 @@ include_directories(
 list(SORT TRACKING_ADAPTER_HEADERS)
 list(SORT TRACKING_ADAPTER_SOURCES)
 
-add_library(tracking_adapters ${TRACKING_ADAPTER_SOURCES} ${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 tracking_gr_blocks gnss_sp_libs gnss_sdr_flags)
+
+target_link_libraries(tracking_adapters
+    tracking_gr_blocks
+    gnss_sp_libs
+    gnss_sdr_flags
+)

src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt

@@ -17,15 +17,33 @@
 #
 
 if(ENABLE_CUDA)
-     set(OPT_TRACKING_BLOCKS_SOURCES ${OPT_TRACKING_BLOCKS_SOURCES} gps_l1_ca_dll_pll_tracking_gpu_cc.cc)
+    set(OPT_TRACKING_BLOCKS_SOURCES
-     set(OPT_TRACKING_BLOCKS_HEADERS ${OPT_TRACKING_BLOCKS_HEADERS} gps_l1_ca_dll_pll_tracking_gpu_cc.h)
+        ${OPT_TRACKING_BLOCKS_SOURCES}
-     set(OPT_TRACKING_INCLUDES ${OPT_TRACKING_INCLUDES} ${CUDA_INCLUDE_DIRS})
+        gps_l1_ca_dll_pll_tracking_gpu_cc.cc
-     set(OPT_TRACKING_LIBRARIES ${OPT_TRACKING_LIBRARIES} ${CUDA_LIBRARIES})
+    )
+    set(OPT_TRACKING_BLOCKS_HEADERS
+        ${OPT_TRACKING_BLOCKS_HEADERS}
+        gps_l1_ca_dll_pll_tracking_gpu_cc.h
+    )
+    set(OPT_TRACKING_INCLUDES
+        ${OPT_TRACKING_INCLUDES}
+        ${CUDA_INCLUDE_DIRS}
+    )
+    set(OPT_TRACKING_LIBRARIES
+        ${OPT_TRACKING_LIBRARIES}
+        ${CUDA_LIBRARIES}
+    )
 endif(ENABLE_CUDA)
 
 if(ENABLE_FPGA)
-     set(OPT_TRACKING_BLOCKS_SOURCES ${OPT_TRACKING_BLOCKS_SOURCES} dll_pll_veml_tracking_fpga.cc)
+    set(OPT_TRACKING_BLOCKS_SOURCES
-     set(OPT_TRACKING_BLOCKS_HEADERS ${OPT_TRACKING_BLOCKS_HEADERS} dll_pll_veml_tracking_fpga.h)
+        ${OPT_TRACKING_BLOCKS_SOURCES}
+        dll_pll_veml_tracking_fpga.cc
+    )
+    set(OPT_TRACKING_BLOCKS_HEADERS
+        ${OPT_TRACKING_BLOCKS_HEADERS}
+        dll_pll_veml_tracking_fpga.h
+    )
 endif(ENABLE_FPGA)
 
 set(TRACKING_GR_BLOCKS_SOURCES
@@ -78,16 +96,25 @@ include_directories(
 )
 
 if(ENABLE_GENERIC_ARCH)
-    add_definitions( -DGENERIC_ARCH=1 )
+    add_definitions(-DGENERIC_ARCH=1)
 endif(ENABLE_GENERIC_ARCH)
 
 list(SORT TRACKING_GR_BLOCKS_HEADERS)
 list(SORT TRACKING_GR_BLOCKS_SOURCES)
 
 add_library(tracking_gr_blocks ${TRACKING_GR_BLOCKS_SOURCES} ${TRACKING_GR_BLOCKS_HEADERS})
+
 source_group(Headers FILES ${TRACKING_GR_BLOCKS_HEADERS})
 
-target_link_libraries(tracking_gr_blocks tracking_lib ${GNURADIO_RUNTIME_LIBRARIES} gnss_sdr_flags gnss_sp_libs ${Boost_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${MATIO_LIBRARIES} ${OPT_TRACKING_LIBRARIES})
+target_link_libraries(tracking_gr_blocks
+    tracking_lib
+    ${GNURADIO_RUNTIME_LIBRARIES}
+    gnss_sdr_flags gnss_sp_libs
+    ${Boost_LIBRARIES}
+    ${VOLK_GNSSSDR_LIBRARIES}
+    ${MATIO_LIBRARIES}
+    ${OPT_TRACKING_LIBRARIES}
+)
 
 if(NOT VOLK_GNSSSDR_FOUND)
     if(MATIO_FOUND)

src/algorithms/tracking/libs/CMakeLists.txt

@@ -22,14 +22,13 @@ if(ENABLE_CUDA)
     # set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} --gpu-architecture sm_30)
     list(APPEND CUDA_NVCC_FLAGS "-gencode arch=compute_30,code=sm_30; -std=c++11;-O3; -use_fast_math -default-stream per-thread")
     set(CUDA_PROPAGATE_HOST_FLAGS OFF)
-    CUDA_INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR})
+    cuda_include_directories(${CMAKE_CURRENT_SOURCE_DIR})
     set(LIB_TYPE STATIC) #set the lib type
-    CUDA_ADD_LIBRARY(CUDA_CORRELATOR_LIB ${LIB_TYPE} cuda_multicorrelator.h cuda_multicorrelator.cu)
+    cuda_add_library(CUDA_CORRELATOR_LIB ${LIB_TYPE} cuda_multicorrelator.h cuda_multicorrelator.cu)
     set(OPT_TRACKING_LIBRARIES ${OPT_TRACKING_LIBRARIES} CUDA_CORRELATOR_LIB)
-    set(OPT_TRACKING_INCLUDES ${OPT_TRACKING_INCLUDES} ${CUDA_INCLUDE_DIRS} )
+    set(OPT_TRACKING_INCLUDES ${OPT_TRACKING_INCLUDES} ${CUDA_INCLUDE_DIRS})
 endif(ENABLE_CUDA)
 
-
 set(TRACKING_LIB_SOURCES
     cpu_multicorrelator.cc
     cpu_multicorrelator_real_codes.cc
@@ -82,20 +81,27 @@ include_directories(
 )
 
 if(ENABLE_GENERIC_ARCH)
-    add_definitions( -DGENERIC_ARCH=1 )
+    add_definitions(-DGENERIC_ARCH=1)
 endif(ENABLE_GENERIC_ARCH)
 
-if (SSE3_AVAILABLE)
+if(SSE3_AVAILABLE)
-    add_definitions( -DHAVE_SSE3=1 )
+    add_definitions(-DHAVE_SSE3=1)
 endif(SSE3_AVAILABLE)
 
-
 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})
-target_link_libraries(tracking_lib ${OPT_TRACKING_LIBRARIES} ${VOLK_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${Boost_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES})
+
+target_link_libraries(tracking_lib
+    ${OPT_TRACKING_LIBRARIES}
+    ${VOLK_LIBRARIES}
+    ${VOLK_GNSSSDR_LIBRARIES}
+    ${Boost_LIBRARIES}
+    ${GNURADIO_RUNTIME_LIBRARIES}
+)
 
 if(VOLK_GNSSSDR_FOUND)
     add_dependencies(tracking_lib glog-${glog_RELEASE})

src/core/libs/CMakeLists.txt

@@ -19,7 +19,7 @@
 add_subdirectory(supl)
 
 if(OPENSSL_FOUND)
-    add_definitions( -DUSE_OPENSSL_FALLBACK=1 )
+    add_definitions(-DUSE_OPENSSL_FALLBACK=1)
 endif(OPENSSL_FOUND)
 
 set(CORE_LIBS_SOURCES

src/core/libs/supl/CMakeLists.txt

@@ -21,12 +21,12 @@ list(SORT ASN_RRLP_SOURCES)
 file(GLOB ASN_SUPL_SOURCES "${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl/*.c")
 list(SORT ASN_SUPL_SOURCES)
 
-set (SUPL_SOURCES
+set(SUPL_SOURCES
     supl.c
-	)
+)
 
 if(OPENSSL_FOUND)
-    add_definitions( -DUSE_OPENSSL_FALLBACK=1 )
+    add_definitions(-DUSE_OPENSSL_FALLBACK=1)
 endif(OPENSSL_FOUND)
 
 include_directories(
@@ -35,7 +35,7 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp
     ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl
     ${GNUTLS_INCLUDE_DIR}
-	)
+)
 
 if(CMAKE_C_COMPILER_ID MATCHES "Clang")
     if(CMAKE_BUILD_TYPE MATCHES "Release")
@@ -44,6 +44,6 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang")
 endif(CMAKE_C_COMPILER_ID MATCHES "Clang")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_C_FLAGS}")
 
-add_library (supl_library STATIC ${ASN_RRLP_SOURCES} ${ASN_SUPL_SOURCES} ${SUPL_SOURCES})
+add_library(supl_library STATIC ${ASN_RRLP_SOURCES} ${ASN_SUPL_SOURCES} ${SUPL_SOURCES})
-target_link_libraries (supl_library ${GNUTLS_LIBRARIES} ${GNUTLS_OPENSSL_LIBRARY} gnss_system_parameters)
+target_link_libraries(supl_library ${GNUTLS_LIBRARIES} ${GNUTLS_OPENSSL_LIBRARY} gnss_system_parameters)
 set_target_properties(supl_library PROPERTIES LINKER_LANGUAGE C)

src/core/monitor/CMakeLists.txt

@@ -27,7 +27,6 @@ set(CORE_MONITOR_LIBS_HEADERS
     gnss_synchro_udp_sink.h
 )
 
-
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_SOURCE_DIR}/src/core/system_parameters
@@ -40,7 +39,13 @@ include_directories(
 list(SORT CORE_MONITOR_LIBS_HEADERS)
 list(SORT CORE_MONITOR_LIBS_SOURCES)
 
-add_library(core_monitor_lib ${CORE_MONITOR_LIBS_SOURCES} ${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 ${Boost_LIBRARIES})
+
 add_dependencies(core_monitor_lib glog-${glog_RELEASE})

src/core/receiver/CMakeLists.txt

@@ -88,7 +88,7 @@ endif(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd)
 
 #Enable OpenCL if found in the system
 if(OPENCL_FOUND)
-    message(STATUS "Adding processing blocks implemented using OpenCL" )
+    message(STATUS "Adding processing blocks implemented using OpenCL")
     add_definitions(-DOPENCL_BLOCKS=1)
 else(OPENCL_FOUND)
     add_definitions(-DOPENCL_BLOCKS=0)
@@ -110,9 +110,9 @@ if(ENABLE_AD9361)
     set(OPT_RECEIVER_INCLUDE_DIRS ${OPT_RECEIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS})
 endif(ENABLE_AD9361)
 
-if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4" )
+if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
     add_definitions( -DGR_GREATER_38=1 )
-endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4" )
+endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
 
 
 include_directories(
@@ -165,22 +165,29 @@ include_directories(
 list(SORT GNSS_RECEIVER_HEADERS)
 list(SORT GNSS_RECEIVER_SOURCES)
 
-set(GNSS_RECEIVER_INTERFACE_HEADERS ../interfaces/acquisition_interface.h
+set(GNSS_RECEIVER_INTERFACE_HEADERS
-                                    ../interfaces/channel_interface.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/acquisition_interface.h
-                                    ../interfaces/configuration_interface.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/channel_interface.h
-                                    ../interfaces/gnss_block_interface.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/configuration_interface.h
-                                    ../interfaces/observables_interface.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/gnss_block_interface.h
-                                    ../interfaces/pvt_interface.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/observables_interface.h
-                                    ../interfaces/telemetry_decoder_interface.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/pvt_interface.h
-                                    ../interfaces/tracking_interface.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/telemetry_decoder_interface.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/tracking_interface.h
 )
 
 list(SORT GNSS_RECEIVER_INTERFACE_HEADERS)
 
-add_library(gnss_rx ${GNSS_RECEIVER_SOURCES} ${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})
 
-target_link_libraries(gnss_rx ${Boost_LIBRARIES}
+target_link_libraries(gnss_rx
+    ${Boost_LIBRARIES}
     ${ARMADILLO_LIBRARIES}
     ${GNURADIO_RUNTIME_LIBRARIES}
     ${GNURADIO_BLOCKS_LIBRARIES}

src/core/receiver/control_thread.cc

@@ -911,7 +911,6 @@ std::vector<std::pair<int, Gnss_Satellite>> ControlThread::get_visible_sats(time
             alm_t rtklib_alm = alm_to_rtklib(it->second);
             double r_sat[3];
             double clock_bias_s;
-            double sat_pos_variance_m2;
             alm2pos(gps_gtime, &rtklib_alm, &r_sat[0], &clock_bias_s);
             double Az, El, dist_m;
             arma::vec r_sat_eb_e = arma::vec{r_sat[0], r_sat[1], r_sat[2]};
@@ -932,7 +931,6 @@ std::vector<std::pair<int, Gnss_Satellite>> ControlThread::get_visible_sats(time
             alm_t rtklib_alm = alm_to_rtklib(it->second);
             double r_sat[3];
             double clock_bias_s;
-            double sat_pos_variance_m2;
             alm2pos(gps_gtime, &rtklib_alm, &r_sat[0], &clock_bias_s);
             double Az, El, dist_m;
             arma::vec r_sat_eb_e = arma::vec{r_sat[0], r_sat[1], r_sat[2]};

src/core/system_parameters/CMakeLists.txt

@@ -16,6 +16,7 @@
 # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
 #
 
+
 set(SYSTEM_PARAMETERS_SOURCES
     gnss_satellite.cc
     gnss_signal.cc
@@ -88,7 +89,6 @@ set(SYSTEM_PARAMETERS_HEADERS
     MATH_CONSTANTS.h
 )
 
-
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_SOURCE_DIR}/src/core/receiver
@@ -104,7 +104,13 @@ link_directories(${Boost_LIBRARY_DIR})
 list(SORT SYSTEM_PARAMETERS_HEADERS)
 list(SORT SYSTEM_PARAMETERS_SOURCES)
 
-add_library(gnss_system_parameters ${SYSTEM_PARAMETERS_SOURCES} ${SYSTEM_PARAMETERS_HEADERS})
+add_library(gnss_system_parameters
+    ${SYSTEM_PARAMETERS_SOURCES}
+    ${SYSTEM_PARAMETERS_HEADERS}
+)
+
 source_group(Headers FILES ${SYSTEM_PARAMETERS_HEADERS})
+
 add_dependencies(gnss_system_parameters rtklib_lib glog-${glog_RELEASE})
+
 target_link_libraries(gnss_system_parameters rtklib_lib ${Boost_LIBRARIES})

src/main/CMakeLists.txt

@@ -32,7 +32,7 @@ if(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd)
 endif(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd)
 
 if(OPENSSL_FOUND)
-    add_definitions( -DUSE_OPENSSL_FALLBACK=1 )
+    add_definitions(-DUSE_OPENSSL_FALLBACK=1)
 endif(OPENSSL_FOUND)
 
 if(ENABLE_CUDA)
@@ -67,7 +67,7 @@ include_directories(
     ${OPT_GNSSSDR_INCLUDE_DIRS}
 )
 
-add_definitions( -DGNSS_SDR_VERSION="${VERSION}" )
+add_definitions(-DGNSS_SDR_VERSION="${VERSION}")
 
 if(OS_IS_MACOSX)
     if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -77,11 +77,13 @@ endif(OS_IS_MACOSX)
 
 add_executable(gnss-sdr ${CMAKE_CURRENT_SOURCE_DIR}/main.cc)
 
-add_custom_command(TARGET gnss-sdr POST_BUILD
+add_custom_command(TARGET gnss-sdr
-                   COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:gnss-sdr>
+    POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:gnss-sdr>
-                           ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:gnss-sdr> )
+        ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:gnss-sdr>
+)
 
-target_link_libraries(gnss-sdr ${MAC_LIBRARIES}
+target_link_libraries(gnss-sdr
+    ${MAC_LIBRARIES}
     ${THREAD_LIBRARIES}
     ${Boost_LIBRARIES}
     ${GNURADIO_RUNTIME_LIBRARIES}
@@ -95,14 +97,15 @@ target_link_libraries(gnss-sdr ${MAC_LIBRARIES}
     ${GNSS_SDR_OPTIONAL_LIBS}
     gnss_sp_libs
     gnss_sdr_flags
-                               gnss_rx )
+    gnss_rx
+)
 
 install(TARGETS gnss-sdr
     RUNTIME DESTINATION bin
-        COMPONENT "gnss-sdr" )
+    COMPONENT "gnss-sdr")
 
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/conf DESTINATION share/gnss-sdr
-        FILES_MATCHING PATTERN "*.conf" )
+    FILES_MATCHING PATTERN "*.conf")
 
 install(FILES ${CMAKE_SOURCE_DIR}/conf/gnss-sdr.conf DESTINATION share/gnss-sdr/conf
     RENAME default.conf)
@@ -137,7 +140,6 @@ if(NOT GZIP_NOTFOUND)
             WORKING_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_FILE "${CMAKE_BINARY_DIR}/volk_gnsssdr_profile.1.gz")
         execute_process(COMMAND gzip -9 -c ${CMAKE_SOURCE_DIR}/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Packaging/volk_gnsssdr-config-info-manpage
             WORKING_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_FILE "${CMAKE_BINARY_DIR}/volk_gnsssdr-config-info.1.gz")
-
         install(FILES ${CMAKE_BINARY_DIR}/volk_gnsssdr_profile.1.gz DESTINATION share/man/man1)
         install(FILES ${CMAKE_BINARY_DIR}/volk_gnsssdr-config-info.1.gz DESTINATION share/man/man1)
     endif(NOT VOLK_GNSSSDR_FOUND)

src/tests/CMakeLists.txt

@@ -234,6 +234,7 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA)
           set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated")
       endif("${TOOLCHAIN_ARG}" STREQUAL "")
       include(GNUInstallDirs)
+      string(REGEX REPLACE /[^/]*$ "" LIBDIR ${CMAKE_INSTALL_LIBDIR})
       if(CMAKE_VERSION VERSION_LESS 3.2)
           ExternalProject_Add(
             gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}
@@ -253,13 +254,13 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA)
             SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}
             BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}
             CMAKE_ARGS ${GTEST_COMPILER} ${TOOLCHAIN_ARG} -DCMAKE_INSTALL_PREFIX=${CMAKE_SOURCE_DIR}/thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install -DBUILD_EXT=OFF -DBUILD_PYTHON=OFF
-            BUILD_BYPRODUCTS ${CMAKE_SOURCE_DIR}/thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}gpstk${CMAKE_SHARED_LIBRARY_SUFFIX}
+            BUILD_BYPRODUCTS ${CMAKE_SOURCE_DIR}/thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/${LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}gpstk${CMAKE_SHARED_LIBRARY_SUFFIX}
             UPDATE_COMMAND ""
             PATCH_COMMAND ""
           )
       endif(CMAKE_VERSION VERSION_LESS 3.2)
       set(GPSTK_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/include CACHE PATH "Local GPSTK headers")
-      set(GPSTK_LIBRARY ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}gpstk${CMAKE_SHARED_LIBRARY_SUFFIX})
+      set(GPSTK_LIBRARY ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/${LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}gpstk${CMAKE_SHARED_LIBRARY_SUFFIX})
       set(GPSTK_BINDIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/bin/)
       add_definitions(-DGPSTK_BINDIR="${GPSTK_BINDIR}")
       set(OWN_GPSTK True)

src/utils/front-end-cal/CMakeLists.txt

@@ -18,13 +18,12 @@
 
 
 if(OPENSSL_FOUND)
-    add_definitions( -DUSE_OPENSSL_FALLBACK=1 )
+    add_definitions(-DUSE_OPENSSL_FALLBACK=1)
 endif(OPENSSL_FOUND)
 
 set(FRONT_END_CAL_SOURCES front_end_cal.cc)
 set(FRONT_END_CAL_HEADERS front_end_cal.h)
 
-
 include_directories(
     ${CMAKE_SOURCE_DIR}/src/core/system_parameters
     ${CMAKE_SOURCE_DIR}/src/core/interfaces
@@ -50,7 +49,8 @@ include_directories(
 add_library(front_end_cal_lib ${FRONT_END_CAL_SOURCES} ${FRONT_END_CAL_HEADERS})
 source_group(Headers FILES ${FRONT_END_CAL_HEADERS})
 
-target_link_libraries(front_end_cal_lib ${MAC_LIBRARIES}
+target_link_libraries(front_end_cal_lib
+    ${MAC_LIBRARIES}
     ${THREAD_LIBRARIES}
     ${Boost_LIBRARIES}
     ${GNURADIO_RUNTIME_LIBRARIES}
@@ -70,8 +70,8 @@ target_link_libraries(front_end_cal_lib ${MAC_LIBRARIES}
 
 add_dependencies(front_end_cal_lib glog-${glog_RELEASE} armadillo-${armadillo_RELEASE})
 
-add_definitions( -DGNSS_SDR_VERSION="${VERSION}" )
+add_definitions(-DGNSS_SDR_VERSION="${VERSION}")
-add_definitions( -DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}" )
+add_definitions(-DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}")
 
 add_executable(front-end-cal ${CMAKE_CURRENT_SOURCE_DIR}/main.cc)
 
@@ -79,8 +79,8 @@ add_custom_command(TARGET front-end-cal POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:front-end-cal>
         ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:front-end-cal>)
 
-
+target_link_libraries(front-end-cal
-target_link_libraries(front-end-cal    ${MAC_LIBRARIES}
+    ${MAC_LIBRARIES}
     ${Boost_LIBRARIES}
     ${GNURADIO_RUNTIME_LIBRARIES}
     ${GNURADIO_BLOCKS_LIBRARIES}
@@ -96,7 +96,6 @@ target_link_libraries(front-end-cal    ${MAC_LIBRARIES}
     front_end_cal_lib
 )
 
-
 install(TARGETS front-end-cal
     RUNTIME DESTINATION bin
     COMPONENT "front-end-cal"
@@ -108,7 +107,7 @@ find_program(GZIP gzip
     /usr/local/bin
     /opt/local/bin
     /sbin
-                 )
+)
 
 if(NOT GZIP_NOTFOUND)
     execute_process(COMMAND gzip -9 -c ${CMAKE_SOURCE_DIR}/docs/manpage/front-end-cal-manpage

src/utils/rinex2assist/CMakeLists.txt

@@ -19,8 +19,9 @@
 find_package(GPSTK QUIET)
 if(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK)
     include(GNUInstallDirs)
-    set(GPSTK_LIBRARY ${CMAKE_CURRENT_SOURCE_DIR}/../../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}gpstk${CMAKE_SHARED_LIBRARY_SUFFIX} )
+    string(REGEX REPLACE /[^/]*$ "" LIBDIR ${CMAKE_INSTALL_LIBDIR})
-    set(GPSTK_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/include )
+    set(GPSTK_LIBRARY ${CMAKE_CURRENT_SOURCE_DIR}/../../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/${LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}gpstk${CMAKE_SHARED_LIBRARY_SUFFIX})
+    set(GPSTK_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/include)
 endif(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK)
 
 set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} ${GPSTK_INCLUDE_DIR}/gpstk)
@@ -42,7 +43,8 @@ target_link_libraries(rinex2assist
     ${GPSTK_LIBRARY}
     ${GFlags_LIBS}
     gnss_sp_libs
-    gnss_rx)
+    gnss_rx
+)
 
 if(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK)
     add_dependencies(rinex2assist gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION})
@@ -50,7 +52,8 @@ endif(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK)
 
 add_custom_command(TARGET rinex2assist POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:rinex2assist>
-                   ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:rinex2assist>)
+    ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:rinex2assist>
+)
 
 install(TARGETS rinex2assist
     RUNTIME DESTINATION bin