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

CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2018 (see AUTHORS file for a list of contributors)
+# Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -23,7 +23,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
     message(WARNING "In-tree build is bad practice. Try 'cd build && cmake ../' ")
 endif()
 
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.12)
 project(gnss-sdr CXX C)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
 file(RELATIVE_PATH RELATIVE_CMAKE_CALL ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
@@ -324,12 +324,12 @@ endif()
 ################################################################################
 # Minimum required versions
 ################################################################################
-set(GNSSSDR_CMAKE_MIN_VERSION "2.8.8")
+set(GNSSSDR_CMAKE_MIN_VERSION "2.8.12")
 set(GNSSSDR_GCC_MIN_VERSION "4.7.2")
 set(GNSSSDR_CLANG_MIN_VERSION "3.4.0")
 set(GNSSSDR_APPLECLANG_MIN_VERSION "500")
 set(GNSSSDR_GNURADIO_MIN_VERSION "3.7.3")
-set(GNSSSDR_BOOST_MIN_VERSION "1.45")
+set(GNSSSDR_BOOST_MIN_VERSION "1.54")
 set(GNSSSDR_PYTHON_MIN_VERSION "2.7")
 set(GNSSSDR_PYTHON3_MIN_VERSION "3.4")
 set(GNSSSDR_MAKO_MIN_VERSION "0.4.2")
@@ -413,6 +413,9 @@ endif()
 if(NOT OS_IS_MACOSX)
     if(CMAKE_CROSSCOMPILING)
         set(IS_ARM TRUE)
+        if(NOT CMAKE_NO_SYSTEM_FROM_IMPORTED)
+            set(CMAKE_NO_SYSTEM_FROM_IMPORTED TRUE)
+        endif()
     else()
         include(TestForARM)
     endif()
@@ -487,8 +490,7 @@ if(UNIX AND EXISTS "/usr/lib64")
     list(APPEND BOOST_LIBRARYDIR "/usr/lib64") # Fedora 64-bit fix
 endif()
 set(Boost_ADDITIONAL_VERSIONS
-    "1.45.0" "1.45" "1.46.0" "1.46"                 "1.48.0" "1.48" "1.49.0" "1.49"
-    "1.50.0" "1.50" "1.51.0" "1.51"                 "1.53.0" "1.53" "1.54.0" "1.54"
+    "1.54.0" "1.54"
     "1.55.0" "1.55" "1.56.0" "1.56" "1.57.0" "1.57" "1.58.0" "1.58" "1.59.0" "1.59"
     "1.60.0" "1.60" "1.61.0" "1.61" "1.62.0" "1.62" "1.63.0" "1.63" "1.64.0" "1.64"
     "1.65.0" "1.65" "1.66.0" "1.66" "1.67.0" "1.67" "1.68.0" "1.68" "1.69.0" "1.69"
@@ -498,11 +500,84 @@ set(Boost_ADDITIONAL_VERSIONS
 )
 set(Boost_USE_MULTITHREAD ON)
 set(Boost_USE_STATIC_LIBS OFF)
-find_package(Boost COMPONENTS date_time system filesystem thread serialization chrono REQUIRED)
+find_package(Boost COMPONENTS atomic chrono date_time filesystem serialization system thread REQUIRED)
 if(NOT Boost_FOUND)
     message(FATAL_ERROR "Fatal error: Boost (version >=${GNSSSDR_BOOST_MIN_VERSION}) required.")
 endif()
 
+if(CMAKE_VERSION VERSION_LESS 3.5)
+    if(NOT TARGET Boost::boost)
+        add_library(Boost::boost SHARED IMPORTED) # Trick for CMake 2.8.12
+        set_property(TARGET Boost::boost PROPERTY
+            INTERFACE_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR})
+        set_property(TARGET Boost::boost PROPERTY
+            IMPORTED_LOCATION ${Boost_DATE_TIME_LIBRARIES})
+    endif()
+    if(NOT TARGET Boost::date_time)
+        add_library(Boost::date_time SHARED IMPORTED)
+        set_property(TARGET Boost::date_time PROPERTY
+            INTERFACE_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR})
+        set_property(TARGET Boost::date_time PROPERTY
+            INTERFACE_LINK_LIBRARIES ${Boost_DATE_TIME_LIBRARIES})
+        set_property(TARGET Boost::date_time PROPERTY
+            IMPORTED_LOCATION ${Boost_DATE_TIME_LIBRARIES})
+    endif()
+    if(NOT TARGET Boost::system)
+        add_library(Boost::system SHARED IMPORTED)
+        set_property(TARGET Boost::system PROPERTY
+            INTERFACE_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR})
+        set_property(TARGET Boost::system PROPERTY
+            INTERFACE_LINK_LIBRARIES ${Boost_SYSTEM_LIBRARIES})
+        set_property(TARGET Boost::system PROPERTY
+            IMPORTED_LOCATION ${Boost_SYSTEM_LIBRARIES})
+    endif()
+    if(NOT TARGET Boost::filesystem)
+        add_library(Boost::filesystem SHARED IMPORTED)
+        set_property(TARGET Boost::filesystem PROPERTY
+            INTERFACE_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR})
+        set_property(TARGET Boost::filesystem PROPERTY
+            INTERFACE_LINK_LIBRARIES ${Boost_FILESYSTEM_LIBRARIES})
+        set_property(TARGET Boost::filesystem PROPERTY
+            IMPORTED_LOCATION ${Boost_FILESYSTEM_LIBRARIES})
+    endif()
+    if(NOT TARGET Boost::thread)
+        add_library(Boost::thread SHARED IMPORTED)
+        set_property(TARGET Boost::thread PROPERTY
+            INTERFACE_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR})
+        set_property(TARGET Boost::thread PROPERTY
+            INTERFACE_LINK_LIBRARIES ${Boost_THREAD_LIBRARIES})
+        set_property(TARGET Boost::thread PROPERTY
+            IMPORTED_LOCATION ${Boost_THREAD_LIBRARIES})
+    endif()
+    if(NOT TARGET Boost::serialization)
+        add_library(Boost::serialization SHARED IMPORTED)
+        set_property(TARGET Boost::serialization PROPERTY
+            INTERFACE_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR})
+        set_property(TARGET Boost::serialization PROPERTY
+            INTERFACE_LINK_LIBRARIES ${Boost_SERIALIZATION_LIBRARIES})
+        set_property(TARGET Boost::serialization PROPERTY
+            IMPORTED_LOCATION ${Boost_SERIALIZATION_LIBRARIES})
+    endif()
+    if(NOT TARGET Boost::chrono)
+        add_library(Boost::chrono SHARED IMPORTED)
+        set_property(TARGET Boost::chrono PROPERTY
+            INTERFACE_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR})
+        set_property(TARGET Boost::chrono PROPERTY
+            INTERFACE_LINK_LIBRARIES ${Boost_CHRONO_LIBRARIES})
+        set_property(TARGET Boost::chrono PROPERTY
+            IMPORTED_LOCATION ${Boost_CHRONO_LIBRARIES})
+    endif()
+    if(NOT TARGET Boost::atomic)
+        add_library(Boost::atomic SHARED IMPORTED)
+        set_property(TARGET Boost::atomic PROPERTY
+            INTERFACE_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR})
+        set_property(TARGET Boost::atomic PROPERTY
+        INTERFACE_LINK_LIBRARIES ${Boost_ATOMIC_LIBRARIES})
+        set_property(TARGET Boost::atomic PROPERTY
+            IMPORTED_LOCATION ${Boost_ATOMIC_LIBRARIES})
+    endif()
+endif()
+
 
 
 ################################################################################
@@ -530,22 +605,98 @@ if(NOT GNURADIO_RUNTIME_FOUND)
         message("  brew install gnuradio")
         message(FATAL_ERROR "GNU Radio ${GNSSSDR_GNURADIO_MIN_VERSION} or later is required to build gnss-sdr")
     endif()
+else()
+    if(NOT TARGET Gnuradio::runtime)
+        add_library(Gnuradio::runtime SHARED IMPORTED)
+        list(GET GNURADIO_RUNTIME_LIBRARIES 0 FIRST_DIR)
+        get_filename_component(GNURADIO_RUNTIME_DIR ${FIRST_DIR} ABSOLUTE)
+        set_target_properties(Gnuradio::runtime PROPERTIES
+          IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+          IMPORTED_LOCATION "${GNURADIO_RUNTIME_DIR}"
+          INTERFACE_INCLUDE_DIRECTORIES "${GNURADIO_RUNTIME_INCLUDE_DIRS}"
+          INTERFACE_LINK_LIBRARIES "${GNURADIO_RUNTIME_LIBRARIES}"
+        )
+    endif()
 endif()
 
 if(NOT GNURADIO_ANALOG_FOUND)
     message(FATAL_ERROR "*** The gnuradio-analog library v${GNSSSDR_GNURADIO_MIN_VERSION} or later is required to build gnss-sdr")
+else()
+    if(NOT TARGET Gnuradio::analog)
+        add_library(Gnuradio::analog SHARED IMPORTED)
+        list(GET GNURADIO_ANALOG_LIBRARIES 0 FIRST_DIR)
+        get_filename_component(GNURADIO_ANALOG_DIR ${FIRST_DIR} ABSOLUTE)
+        set_target_properties(Gnuradio::analog PROPERTIES
+          IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+          IMPORTED_LOCATION "${GNURADIO_ANALOG_DIR}"
+          INTERFACE_INCLUDE_DIRECTORIES "${GNURADIO_ANALOG_INCLUDE_DIRS}"
+          INTERFACE_LINK_LIBRARIES "${GNURADIO_ANALOG_LIBRARIES}"
+        )
+    endif()
 endif()
+
 if(NOT GNURADIO_BLOCKS_FOUND)
     message(FATAL_ERROR "*** The gnuradio-blocks library v${GNSSSDR_GNURADIO_MIN_VERSION} or later is required to build gnss-sdr")
+else()
+    if(NOT TARGET Gnuradio::blocks)
+        add_library(Gnuradio::blocks SHARED IMPORTED)
+        list(GET GNURADIO_BLOCKS_LIBRARIES 0 FIRST_DIR)
+        get_filename_component(GNURADIO_BLOCKS_DIR ${FIRST_DIR} ABSOLUTE)
+        set_target_properties(Gnuradio::blocks PROPERTIES
+          IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+          IMPORTED_LOCATION "${GNURADIO_BLOCKS_DIR}"
+          INTERFACE_INCLUDE_DIRECTORIES "${GNURADIO_BLOCKS_INCLUDE_DIRS}"
+          INTERFACE_LINK_LIBRARIES "${GNURADIO_BLOCKS_LIBRARIES}"
+        )
+    endif()
 endif()
+
 if(NOT GNURADIO_FILTER_FOUND)
     message(FATAL_ERROR "*** The gnuradio-filter library v${GNSSSDR_GNURADIO_MIN_VERSION} or later is required to build gnss-sdr")
+else()
+    if(NOT TARGET Gnuradio::filter)
+        add_library(Gnuradio::filter SHARED IMPORTED)
+        list(GET GNURADIO_FILTER_LIBRARIES 0 FIRST_DIR)
+        get_filename_component(GNURADIO_FILTER_DIR ${FIRST_DIR} ABSOLUTE)
+        set_target_properties(Gnuradio::filter PROPERTIES
+          IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+          IMPORTED_LOCATION "${GNURADIO_FILTER_DIR}"
+          INTERFACE_INCLUDE_DIRECTORIES "${GNURADIO_FILTER_INCLUDE_DIRS}"
+          INTERFACE_LINK_LIBRARIES "${GNURADIO_FILTER_LIBRARIES}"
+        )
+    endif()
 endif()
+
 if(NOT GNURADIO_FFT_FOUND)
     message(FATAL_ERROR "*** The gnuradio-fft library v${GNSSSDR_GNURADIO_MIN_VERSION} or later is required to build gnss-sdr")
+else()
+    if(NOT TARGET Gnuradio::fft)
+        add_library(Gnuradio::fft SHARED IMPORTED)
+        list(GET GNURADIO_FFT_LIBRARIES 0 FIRST_DIR)
+        get_filename_component(GNURADIO_FFT_DIR ${FIRST_DIR} ABSOLUTE)
+        set_target_properties(Gnuradio::fft PROPERTIES
+          IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+          IMPORTED_LOCATION "${GNURADIO_FFT_DIR}"
+          INTERFACE_INCLUDE_DIRECTORIES "${GNURADIO_FFT_INCLUDE_DIRS}"
+          INTERFACE_LINK_LIBRARIES "${GNURADIO_FFT_LIBRARIES}"
+        )
+    endif()
 endif()
+
 if(NOT GNURADIO_PMT_FOUND)
     message(FATAL_ERROR "*** The gnuradio-pmt library v${GNSSSDR_GNURADIO_MIN_VERSION} or later is required to build gnss-sdr")
+else()
+    if(NOT TARGET Gnuradio::pmt)
+        add_library(Gnuradio::pmt SHARED IMPORTED)
+        list(GET GNURADIO_PMT_LIBRARIES 0 FIRST_DIR)
+        get_filename_component(GNURADIO_PMT_DIR ${FIRST_DIR} ABSOLUTE)
+        set_target_properties(Gnuradio::pmt PROPERTIES
+          IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+          IMPORTED_LOCATION "${GNURADIO_PMT_DIR}"
+          INTERFACE_INCLUDE_DIRECTORIES "${GNURADIO_PMT_INCLUDE_DIRS}"
+          INTERFACE_LINK_LIBRARIES "${GNURADIO_PMT_LIBRARIES}"
+        )
+    endif()
 endif()
 
 
@@ -695,6 +846,19 @@ if(NOT VOLKGNSSSDR_FOUND)
     set(VOLK_GNSSSDR_INCLUDE_DIRS "${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/build/include/;${CMAKE_CURRENT_SOURCE_DIR}/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include;${ORC_INCLUDE_DIRS}")
     set(VOLK_GNSSSDR_LIBRARIES volk_gnsssdr ${ORC_LIBRARIES})
 
+    if(NOT TARGET Volkgnsssdr::volkgnsssdr)
+        file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/build/include)
+        add_library(Volkgnsssdr::volkgnsssdr STATIC IMPORTED)
+        add_dependencies(Volkgnsssdr::volkgnsssdr volk_gnsssdr_module)
+        set_target_properties(Volkgnsssdr::volkgnsssdr PROPERTIES
+            IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+            IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install/lib/libvolk_gnsssdr${CMAKE_STATIC_LIBRARY_SUFFIX}"
+            INCLUDE_DIRECTORIES "${VOLK_GNSSSDR_INCLUDE_DIRS}"
+            INTERFACE_INCLUDE_DIRECTORIES "${VOLK_GNSSSDR_INCLUDE_DIRS}"
+            INTERFACE_LINK_LIBRARIES "${VOLK_GNSSSDR_LIBRARIES}"
+        )
+    endif()
+
     if(CMAKE_VERSION VERSION_LESS 3.2)
         add_custom_command(TARGET volk_gnsssdr_module POST_BUILD
             COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install/bin/volk_gnsssdr_profile
@@ -756,16 +920,23 @@ if(NOT GFLAGS_FOUND)
         ${CMAKE_CURRENT_BINARY_DIR}/gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}/include CACHE PATH "Local Gflags headers"
     )
 
-    add_library(gflags UNKNOWN IMPORTED)
-    set_property(TARGET gflags PROPERTY IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gflags${CMAKE_STATIC_LIBRARY_SUFFIX})
-    add_dependencies(gflags gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION})
-    set(GFlags_LIBS gflags)
-    file(GLOB GFlags_SHARED_LIBS "${CMAKE_CURRENT_BINARY_DIR}/gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gflags${CMAKE_SHARED_LIBRARY_SUFFIX}*")
-    set(GFlags_LIBRARY gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION})
-    set(GFlags_LIBRARY_PATH ${CMAKE_CURRENT_BINARY_DIR}/gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}/lib)
-    link_directories(${GFlags_LIBRARY_PATH})
-    set(GFlags_lib ${GFlags_LIBS} CACHE FILEPATH "Local Gflags library")
-    set(GFlags_LIBRARY_PATH ${GFlags_LIBS})
+    file(GLOB GFlags_SHARED_LIBS
+        "${CMAKE_CURRENT_BINARY_DIR}/gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gflags${CMAKE_SHARED_LIBRARY_SUFFIX}*"
+    )
+
+    if(NOT TARGET Gflags::gflags)
+        file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}/include)
+        add_library(Gflags::gflags STATIC IMPORTED)
+        add_dependencies(Gflags::gflags gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION})
+        set_target_properties(Gflags::gflags PROPERTIES
+            IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+            IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gflags${CMAKE_STATIC_LIBRARY_SUFFIX}"
+            INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}/include"
+            INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}/include"
+            INTERFACE_LINK_LIBRARIES "${CMAKE_CURRENT_BINARY_DIR}/gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gflags${CMAKE_STATIC_LIBRARY_SUFFIX}"
+        )
+    endif()
+
     set(LOCAL_GFLAGS true CACHE STRING "GFlags downloaded and built automatically" FORCE)
 endif()
 
@@ -899,6 +1070,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/c
             INSTALL_COMMAND ""
         )
     endif()
+    add_dependencies(glog-${GNSSSDR_GLOG_LOCAL_VERSION} Gflags::gflags)
 
     # Set up variables
     set(GLOG_INCLUDE_DIRS
@@ -908,15 +1080,28 @@ ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/c
     set(GLOG_LIBRARIES
         ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/.libs/${CMAKE_FIND_LIBRARY_PREFIXES}glog${CMAKE_STATIC_LIBRARY_SUFFIX}
     )
+
+    # Create Glog::glog target
+    if(NOT TARGET Glog::glog)
+        file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/src)
+        file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/src)
+        add_library(Glog::glog STATIC IMPORTED)
+        add_dependencies(Glog::glog glog-${GNSSSDR_GLOG_LOCAL_VERSION})
+        set_target_properties(Glog::glog PROPERTIES
+            IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+            IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/.libs/${CMAKE_FIND_LIBRARY_PREFIXES}glog${CMAKE_STATIC_LIBRARY_SUFFIX}"
+            INCLUDE_DIRECTORIES "${GLOG_INCLUDE_DIRS}"
+            INTERFACE_INCLUDE_DIRECTORIES "${GLOG_INCLUDE_DIRS}"
+            INTERFACE_LINK_LIBRARIES "${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/.libs/${CMAKE_FIND_LIBRARY_PREFIXES}glog${CMAKE_STATIC_LIBRARY_SUFFIX}"
+        )
+    endif()
+
     set(LOCAL_GLOG true CACHE STRING "Glog downloaded and built automatically" FORCE)
-else()
-    add_library(glog-${GNSSSDR_GLOG_LOCAL_VERSION} UNKNOWN IMPORTED)
-    set_property(TARGET glog-${GNSSSDR_GLOG_LOCAL_VERSION} PROPERTY IMPORTED_LOCATION "${GLOG_LIBRARIES}")
 endif()
 
 if(NOT ENABLE_LOG)
     message(STATUS "Logging is not enabled")
-    add_definitions(-DGOOGLE_STRIP_LOG=1)
+    target_compile_definitions(Glog::glog PUBLIC -DGOOGLE_STRIP_LOG=1)
 endif()
 
 
@@ -967,6 +1152,14 @@ if(ARMADILLO_FOUND)
     if(${ARMADILLO_VERSION_STRING} VERSION_LESS ${GNSSSDR_ARMADILLO_MIN_VERSION})
         set(ARMADILLO_FOUND false)
         set(ENABLE_OWN_ARMADILLO true)
+    else()
+        add_library(Armadillo::armadillo SHARED IMPORTED)
+        set_target_properties(Armadillo::armadillo PROPERTIES
+          IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+          IMPORTED_LOCATION "${ARMADILLO_LIBRARIES}"
+          INTERFACE_INCLUDE_DIRECTORIES "${ARMADILLO_INCLUDE_DIRS}"
+          INTERFACE_LINK_LIBRARIES "${ARMADILLO_LIBRARIES}"
+        )
     endif()
 endif()
 
@@ -1028,17 +1221,22 @@ if(NOT ARMADILLO_FOUND OR ENABLE_OWN_ARMADILLO)
 
     # Set up variables
     ExternalProject_Get_Property(armadillo-${armadillo_RELEASE} binary_dir)
-    set(ARMADILLO_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/armadillo/armadillo-${armadillo_RELEASE}/include)
+    #set(ARMADILLO_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/armadillo/armadillo-${armadillo_RELEASE}/include)
     if(NOT GFORTRAN)
         set(GFORTRAN "")
     endif()
     set(ARMADILLO_LIBRARIES ${BLAS} ${LAPACK} ${GFORTRAN} ${binary_dir}/${CMAKE_FIND_LIBRARY_PREFIXES}armadillo${CMAKE_STATIC_LIBRARY_SUFFIX})
     set(LOCAL_ARMADILLO true CACHE STRING "Armadillo downloaded and built automatically" FORCE)
     set(ARMADILLO_VERSION_STRING ${armadillo_RELEASE})
-else()
-    set(armadillo_RELEASE ${ARMADILLO_VERSION_STRING})
-    add_library(armadillo-${armadillo_RELEASE} UNKNOWN IMPORTED)
-    set_property(TARGET armadillo-${armadillo_RELEASE} PROPERTY IMPORTED_LOCATION "${ARMADILLO_LIBRARIES}")
+    file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/armadillo/armadillo-${armadillo_RELEASE}/include)
+    add_library(Armadillo::armadillo STATIC IMPORTED)
+    add_dependencies(Armadillo::armadillo armadillo-${armadillo_RELEASE})
+    set_target_properties(Armadillo::armadillo PROPERTIES
+      IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+      IMPORTED_LOCATION "${binary_dir}/${CMAKE_FIND_LIBRARY_PREFIXES}armadillo${CMAKE_STATIC_LIBRARY_SUFFIX}"
+      INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/armadillo/armadillo-${armadillo_RELEASE}/include"
+      INTERFACE_LINK_LIBRARIES "${binary_dir}/${CMAKE_FIND_LIBRARY_PREFIXES}armadillo${CMAKE_STATIC_LIBRARY_SUFFIX}"
+    )
 endif()
 
 
@@ -1165,6 +1363,7 @@ if(NOT MATIO_FOUND OR MATIO_VERSION_STRING VERSION_LESS ${GNSSSDR_MATIO_MIN_VERS
                     set(HDF5_BASE_DIR /usr/local)
                 endif()
             endif()
+
             if(CMAKE_VERSION VERSION_LESS 3.2)
                 ExternalProject_Add(matio-${GNSSSDR_MATIO_LOCAL_VERSION}
                     PREFIX ${CMAKE_CURRENT_BINARY_DIR}/matio
@@ -1173,7 +1372,7 @@ if(NOT MATIO_FOUND OR MATIO_VERSION_STRING VERSION_LESS ${GNSSSDR_MATIO_MIN_VERS
                     SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/matio/matio-${GNSSSDR_MATIO_LOCAL_VERSION}
                     UPDATE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/matio/matio-${GNSSSDR_MATIO_LOCAL_VERSION}/autogen.sh
                     CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/matio/matio-${GNSSSDR_MATIO_LOCAL_VERSION}/configure --with-hdf5=${HDF5_BASE_DIR} --with-zlib=${ZLIB_BASE_DIR} --with-default-file-ver=7.3 --enable-mat73=yes --prefix=<INSTALL_DIR>
-                    BUILD_COMMAND make
+                    BUILD_COMMAND $(MAKE)
                 )
             else()
                 ExternalProject_Add(matio-${GNSSSDR_MATIO_LOCAL_VERSION}
@@ -1183,13 +1382,23 @@ if(NOT MATIO_FOUND OR MATIO_VERSION_STRING VERSION_LESS ${GNSSSDR_MATIO_MIN_VERS
                     SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/matio/matio-${GNSSSDR_MATIO_LOCAL_VERSION}
                     UPDATE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/matio/matio-${GNSSSDR_MATIO_LOCAL_VERSION}/autogen.sh
                     CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/matio/matio-${GNSSSDR_MATIO_LOCAL_VERSION}/configure --with-hdf5=${HDF5_BASE_DIR} --with-zlib=${ZLIB_BASE_DIR} --with-default-file-ver=7.3 --enable-mat73=yes --prefix=<INSTALL_DIR>
-                    BUILD_COMMAND make
+                    BUILD_COMMAND $(MAKE)
                     BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/matio/lib/${CMAKE_FIND_LIBRARY_PREFIXES}matio${CMAKE_STATIC_LIBRARY_SUFFIX}
                 )
             endif()
-            set(MATIO_LIBRARIES ${CMAKE_CURRENT_BINARY_DIR}/matio/lib/${CMAKE_FIND_LIBRARY_PREFIXES}matio${CMAKE_STATIC_LIBRARY_SUFFIX} ${HDF5_LIBRARIES} ${ZLIB_LIBRARIES})
-            set(MATIO_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/matio/include)
             set(MATIO_LOCAL true)
+            if(NOT TARGET Matio::matio)
+                file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/matio/include)
+                file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/matio/lib)
+                add_library(Matio::matio SHARED IMPORTED)
+                add_dependencies(Matio::matio matio-${GNSSSDR_MATIO_LOCAL_VERSION})
+                set_target_properties(Matio::matio PROPERTIES
+                  IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+                  IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/matio/lib/${CMAKE_FIND_LIBRARY_PREFIXES}matio${CMAKE_SHARED_LIBRARY_SUFFIX}"
+                  INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/matio/include"
+                  INTERFACE_LINK_LIBRARIES "${CMAKE_CURRENT_BINARY_DIR}/matio/lib/${CMAKE_FIND_LIBRARY_PREFIXES}matio${CMAKE_SHARED_LIBRARY_SUFFIX}"
+                )
+            endif()
         else()
             message(STATUS " The hdf5 library has not been found in your system.")
             message(STATUS " Please try to install it by doing:")
@@ -1250,29 +1459,22 @@ else()
             INSTALL_COMMAND ""
         )
     endif()
-    set(PUGIXML_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION}/${CMAKE_FIND_LIBRARY_PREFIXES}pugixml${CMAKE_STATIC_LIBRARY_SUFFIX})
-    set(PUGIXML_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/pugixml/pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION}/src)
-    set(PUGIXML_LOCAL true)
-endif()
 
-
-################################################################################
-# USRP Hardware Driver (UHD) - OPTIONAL
-################################################################################
-if(ENABLE_UHD)
-    find_package(UHD)
-    if(NOT UHD_FOUND)
-        set(ENABLE_UHD OFF)
-        message(STATUS " The USRP Hardware Driver (UHD) signal source will not be built,")
-        message(STATUS " so all USRP-based front-ends will not be usable.")
-        message(STATUS " Please check https://files.ettus.com/manual/")
-    else()
-        set(GR_REQUIRED_COMPONENTS UHD)
-        find_package(Gnuradio)
+    if(NOT TARGET Pugixml::pugixml)
+        file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/pugixml/pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION}/src)
+        add_library(Pugixml::pugixml STATIC IMPORTED)
+        add_dependencies(Pugixml::pugixml pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION})
+        set_target_properties(Pugixml::pugixml PROPERTIES
+            IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+            IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION}/${CMAKE_FIND_LIBRARY_PREFIXES}pugixml${CMAKE_STATIC_LIBRARY_SUFFIX}"
+            INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/pugixml/pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION}/src"
+            INTERFACE_LINK_LIBRARIES "${CMAKE_CURRENT_BINARY_DIR}/pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION}/${CMAKE_FIND_LIBRARY_PREFIXES}pugixml${CMAKE_STATIC_LIBRARY_SUFFIX}"
+        )
     endif()
 endif()
 
 
+
 ################################################################################
 # Doxygen - http://www.stack.nl/~dimitri/doxygen/index.html (OPTIONAL, used if found)
 ################################################################################
@@ -1389,14 +1591,16 @@ endif()
 # CUSTOM UDP PACKET SOURCE (OPTIONAL)
 ###############################################################################
 if(ENABLE_RAW_UDP)
-    message(STATUS "High-optimized custom UDP ip packet source will be enabled.")
-    message(STATUS "You can disable it with 'cmake -DENABLE_RAW_UDP=OFF ../'")
-else()
-    message(STATUS "High-optimized custom UDP ip packet source will be enabled.")
+    message(STATUS "High-optimized custom UDP IP packet source is enabled.")
     message(STATUS "You can disable it with 'cmake -DENABLE_RAW_UDP=OFF ../'")
+    find_package(PCAP)
+    if(NOT PCAP_FOUND)
+        message(FATAL_ERROR "PCAP required to compile custom UDP packet sample source (with ENABLE_RAW_UDP=ON)")
+    endif()
 endif()
 
 
+
 ###############################################################################
 # FPGA (OPTIONAL)
 ###############################################################################
@@ -1413,40 +1617,39 @@ endif()
 ################################################################################
 # Setup of optional drivers
 ################################################################################
-if($ENV{GN3S_DRIVER})
-    message(STATUS "GN3S_DRIVER environment variable found.")
-    set(ENABLE_GN3S ON)
-endif()
-if(GN3S_DRIVER)
-    set(ENABLE_GN3S ON)
-endif()
-if(ENABLE_GN3S)
-    message(STATUS "The GN3S driver will be compiled.")
-    message(STATUS "You can disable it with 'cmake -DENABLE_GN3S=OFF ../'")
-else()
-    message(STATUS "The (optional and experimental) GN3S driver is not enabled.")
-    message(STATUS "Enable it with 'cmake -DENABLE_GN3S=ON ../' to add support for the GN3S dongle.")
+
+########################################
+# USRP Hardware Driver (UHD) - OPTIONAL
+########################################
+if(ENABLE_UHD)
+    find_package(UHD)
+    if(NOT UHD_FOUND)
+        set(ENABLE_UHD OFF)
+        message(STATUS " The USRP Hardware Driver (UHD) signal source will not be built,")
+        message(STATUS " so all USRP-based front-ends will not be usable.")
+        message(STATUS " Please check https://files.ettus.com/manual/")
+    else()
+        set(GR_REQUIRED_COMPONENTS UHD)
+        find_package(Gnuradio)
+        if(NOT TARGET Gnuradio::uhd)
+            add_library(Gnuradio::uhd SHARED IMPORTED)
+            list(GET GNURADIO_UHD_LIBRARIES 0 FIRST_DIR)
+            get_filename_component(GNURADIO_UHD_DIR ${FIRST_DIR} ABSOLUTE)
+            set_target_properties(Gnuradio::uhd PROPERTIES
+              IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+              IMPORTED_LOCATION "${GNURADIO_UHD_DIR}"
+              INTERFACE_INCLUDE_DIRECTORIES "${GNURADIO_UHD_INCLUDE_DIRS}"
+              INTERFACE_LINK_LIBRARIES "${GNURADIO_UHD_LIBRARIES}"
+            )
+        endif()
+    endif()
 endif()
 
-if($ENV{RAW_ARRAY_DRIVER})
-    message(STATUS "RAW_ARRAY_DRIVER environment variable found.")
-    set(ENABLE_ARRAY ON)
-endif()
-
-if(RAW_ARRAY_DRIVER)
-    set(ENABLE_ARRAY ON)
-endif()
-
-if(ENABLE_ARRAY)
-    message(STATUS "CTTC's Antenna Array front-end driver will be compiled.")
-    message(STATUS "You can disable it with 'cmake -DENABLE_ARRAY=OFF ../'")
-    # copy firmware to install folder
-    # Build project gr-dbfcttc
-else()
-    message(STATUS "The (optional) CTTC's Antenna Array front-end driver is not enabled.")
-    message(STATUS "Enable it with 'cmake -DENABLE_ARRAY=ON ../' to add support for the CTTC experimental array front-end.")
-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)
@@ -1469,6 +1672,30 @@ else()
     message(STATUS "Enable it with 'cmake -DENABLE_OSMOSDR=ON ../' to add support for OsmoSDR and other front-ends (HackRF, bladeRF, Realtek's RTL2832U-based USB dongles, etc.)")
 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()
+
+
+##############################################
+# TELEORBIT FLEXIBAND FRONTEND - OPTIONAL
+##############################################
 if($ENV{FLEXIBAND_DRIVER})
     message(STATUS "FLEXIBAND_DRIVER environment variable found.")
     set(ENABLE_FLEXIBAND ON)
@@ -1485,11 +1712,59 @@ else()
     message(STATUS "The (optional) Teleorbit Flexiband front-end driver adapter is not enabled.")
     message(STATUS "Enable it with 'cmake -DENABLE_FLEXIBAND=ON ../' to add support for the Teleorbit Flexiband front-end.")
 endif()
+if(ENABLE_FLEXIBAND)
+    find_package(TELEORBIT)
+    if(NOT TELEORBIT_FOUND)
+        message(FATAL_ERROR "Teleorbit Flexiband GNU Radio driver required to build gnss-sdr with the optional FLEXIBAND adapter")
+    endif()
+endif()
+
+
+##############################################
+# GN3S - OPTIONAL
+##############################################
+if($ENV{GN3S_DRIVER})
+    message(STATUS "GN3S_DRIVER environment variable found.")
+    set(ENABLE_GN3S ON)
+endif()
+if(GN3S_DRIVER)
+    set(ENABLE_GN3S ON)
+endif()
+if(ENABLE_GN3S)
+    message(STATUS "The GN3S driver will be compiled.")
+    message(STATUS "You can disable it with 'cmake -DENABLE_GN3S=OFF ../'")
+    find_package(GRGN3S QUIET)
+else()
+    message(STATUS "The (optional and experimental) GN3S driver is not enabled.")
+    message(STATUS "Enable it with 'cmake -DENABLE_GN3S=ON ../' to add support for the GN3S dongle.")
+endif()
+
+
+#######################################################
+# CTTC's digital array beamformer prototype - OPTIONAL
+#######################################################
+if($ENV{RAW_ARRAY_DRIVER})
+    message(STATUS "RAW_ARRAY_DRIVER environment variable found.")
+    set(ENABLE_ARRAY ON)
+endif()
+
+if(RAW_ARRAY_DRIVER)
+    set(ENABLE_ARRAY ON)
+endif()
+
+if(ENABLE_ARRAY)
+    message(STATUS "CTTC's Antenna Array front-end driver will be compiled.")
+    message(STATUS "You can disable it with 'cmake -DENABLE_ARRAY=OFF ../'")
+    find_package(GRDBFCTTC QUIET)
+else()
+    message(STATUS "The (optional) CTTC's Antenna Array front-end driver is not enabled.")
+    message(STATUS "Enable it with 'cmake -DENABLE_ARRAY=ON ../' to add support for the CTTC experimental array front-end.")
+endif()
 
 
 
 ################################################################################
-# GPerftools - https://github.com/gperftools/gperftools (OPTIONAL)
+# GPerftools - https://github.com/gperftools/gperftools - OPTIONAL)
 ################################################################################
 if(ENABLE_GPERFTOOLS)
     find_package(GPERFTOOLS)
@@ -1581,7 +1856,7 @@ endif()
 if(NOT ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT (CMAKE_CXX_COMPILER_ID MATCHES "Clang")) AND NOT WIN32)
     if(NOT (CMAKE_VERSION VERSION_LESS "3.1"))
         set(CMAKE_C_STANDARD 11)
-        set(CMAKE_CXX_STANDARD 14)
+        set(CMAKE_CXX_STANDARD 11)
     endif()
 endif()
 

README.md

@@ -11,11 +11,11 @@ In the L1 band:
  - 🛰 BeiDou B1I (centered at 1561.098 MHz) :white_check_mark:
  - 🛰 GPS L1 C/A  (centered at 1575.42 MHz) :white_check_mark:
  - 🛰 Galileo E1b/c  (centered at 1575.42 MHz) :white_check_mark:
- - 🛰 GLONASS L1 C/A (centered at 1601.72 MHz) :white_check_mark:
+ - 🛰 GLONASS L1 C/A (centered at 1602.00 MHz) :white_check_mark:
 
 In the L2 band:
  - 🛰 GPS L2C (centered at 1227.60 MHz) :white_check_mark:
- - 🛰 GLONASS L2 C/A (centered at 1246 MHz) :white_check_mark:
+ - 🛰 GLONASS L2 C/A (centered at 1246.00 MHz) :white_check_mark:
 
 In the L5 band:
  - 🛰 GPS L5 (centered at 1176.45 MHz) :white_check_mark:
@@ -189,9 +189,9 @@ $ sudo apt-get install libblas-dev liblapack-dev       # For Debian/Ubuntu/Linux
 $ sudo yum install lapack-devel blas-devel             # For Fedora/CentOS/RHEL
 $ sudo zypper install lapack-devel blas-devel          # For OpenSUSE
 $ sudo pacman -S blas lapack                           # For Arch Linux
-$ wget https://sourceforge.net/projects/arma/files/armadillo-9.100.5.tar.xz
-$ tar xvfz armadillo-9.100.5.tar.xz
-$ cd armadillo-9.100.5
+$ wget https://sourceforge.net/projects/arma/files/armadillo-9.200.7.tar.xz
+$ tar xvfz armadillo-9.200.7.tar.xz
+$ cd armadillo-9.200.7
 $ cmake .
 $ make
 $ sudo make install
@@ -1118,6 +1118,7 @@ Each channel must be assigned to a GNSS signal, according to the following ident
 | GPS L1 C/A        |      1C         |
 | Galileo E1b/c     |      1B         |
 | Glonass L1 C/A    |      1G         |
+| Beidou B1I        |      B1         |
 | GPS L2 L2C(M)     |      2S         |
 | Glonass L2 C/A    |      2G         |
 | GPS L5            |      L5         |

cmake/Modules/FindGFLAGS.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors)
+# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -26,6 +26,10 @@
 # GFlags_INCLUDE_DIRS
 # GFlags_LIBS
 # GFlags_LIBRARY_DIRS
+#
+# Provides the following imported target:
+# Gflags::gflags
+#
 
 if(APPLE)
     find_path(GFlags_ROOT_DIR
@@ -95,9 +99,6 @@ if(GFlags_ROOT_DIR)
     else()
       set(GFLAGS_GREATER_20 FALSE)
     endif()
-    # set up include and link directory
-    include_directories(${GFlags_INCLUDE_DIRS})
-    link_directories(${GFlags_LIBRARY_DIRS})
     message(STATUS "gflags library found at ${GFlags_lib}")
     set(GFlags_LIBS ${GFlags_lib})
     set(GFlags_FOUND true)
@@ -109,3 +110,13 @@ endif()
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(GFLAGS DEFAULT_MSG GFlags_LIBS GFlags_INCLUDE_DIRS)
+
+if(GFLAGS_FOUND AND NOT TARGET Gflags::gflags)
+    add_library(Gflags::gflags SHARED IMPORTED)
+    set_target_properties(Gflags::gflags PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+        IMPORTED_LOCATION "${GFlags_LIBS}"
+        INTERFACE_INCLUDE_DIRECTORIES "${GFlags_INCLUDE_DIRS}"
+        INTERFACE_LINK_LIBRARIES "${GFlags_LIBS}"
+    )
+endif()

cmake/Modules/FindGLOG.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors)
+# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -27,6 +27,9 @@
 #
 # GLOG_ROOT - Can be set to Glog install path or Windows build path
 #
+# Provides the following imported target:
+# Glog::glog
+#
 
 if(NOT DEFINED GLOG_ROOT)
     set(GLOG_ROOT /usr /usr/local)
@@ -135,6 +138,12 @@ else()
     string(REGEX REPLACE "/libglog.so" "" GLOG_LIBRARIES_DIR ${GLOG_LIBRARIES})
 endif()
 
-if(GLOG_FOUND)
-    # _GLOG_APPEND_LIBRARIES(GLOG GLOG_LIBRARIES)
+if(GLOG_FOUND AND NOT TARGET Glog::glog)
+    add_library(Glog::glog SHARED IMPORTED)
+    set_target_properties(Glog::glog PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+        IMPORTED_LOCATION "${GLOG_LIBRARIES}"
+        INTERFACE_INCLUDE_DIRECTORIES "${GLOG_INCLUDE_DIRS}"
+        INTERFACE_LINK_LIBRARIES "${GLOG_LIBRARIES}"
+    )
 endif()

cmake/Modules/FindGPSTK.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors)
+# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -32,18 +32,30 @@ find_path(GPSTK_INCLUDE_DIR gpstk/Rinex3ObsBase.hpp
 
 set(GPSTK_NAMES ${GPSTK_NAMES} gpstk libgpstk)
 
+include(GNUInstallDirs)
+
 find_library(GPSTK_LIBRARY NAMES ${GPSTK_NAMES}
     HINTS /usr/lib
           /usr/local/lib
+          /usr/${CMAKE_INSTALL_LIBDIR}
+          /usr/local/${CMAKE_INSTALL_LIBDIR}
           /opt/local/lib
-          ${GPSTK_ROOT}/lib
-          $ENV{GPSTK_ROOT}/lib
-          ${GPSTK_ROOT}/lib64
-          $ENV{GPSTK_ROOT}/lib64
+          ${GPSTK_ROOT}/${CMAKE_INSTALL_LIBDIR}
+          $ENV{GPSTK_ROOT}/${CMAKE_INSTALL_LIBDIR}
 )
 
 # handle the QUIETLY and REQUIRED arguments and set GPSTK_FOUND to TRUE if
 # all listed variables are TRUE
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(GPSTK DEFAULT_MSG GPSTK_LIBRARY GPSTK_INCLUDE_DIR)
-mark_as_advanced(GPSTK_INCLUDE_DIR GPSTK_LIBRARY GPSTK_INCLUDE_DIR)
+mark_as_advanced(GPSTK_LIBRARY GPSTK_INCLUDE_DIR)
+
+if(GPSTK_FOUND AND NOT TARGET Gpstk::gpstk)
+    add_library(Gpstk::gpstk SHARED IMPORTED)
+    set_target_properties(Gpstk::gpstk PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+        IMPORTED_LOCATION "${GPSTK_LIBRARY}"
+        INTERFACE_INCLUDE_DIRECTORIES "${GPSTK_INCLUDE_DIR};${GPSTK_INCLUDE_DIR}/gpstk"
+        INTERFACE_LINK_LIBRARIES "${GPSTK_LIBRARY}"
+    )
+endif()

cmake/Modules/FindGRDBFCTTC.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors)
+# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -53,4 +53,15 @@ find_library(
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(GRDBFCTTC DEFAULT_MSG GR_DBFCTTC_LIBRARIES GR_DBFCTTC_INCLUDE_DIRS)
+
+if(GRDBFCTTC_FOUND AND NOT TARGET Gnuradio::dbfcttc)
+    add_library(Gnuradio::dbfcttc SHARED IMPORTED)
+    set_target_properties(Gnuradio::dbfcttc PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+        IMPORTED_LOCATION "${GR_DBFCTTC_LIBRARIES}"
+        INTERFACE_INCLUDE_DIRECTORIES "${GR_DBFCTTC_INCLUDE_DIRS}"
+        INTERFACE_LINK_LIBRARIES "${GR_DBFCTTC_LIBRARIES}"
+    )
+endif()
+
 mark_as_advanced(GR_DBFCTTC_LIBRARIES GR_DBFCTTC_INCLUDE_DIRS)

cmake/Modules/FindGRGN3S.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors)
+# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -53,4 +53,15 @@ find_library(
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(GRGN3S DEFAULT_MSG GR_GN3S_LIBRARIES GR_GN3S_INCLUDE_DIRS)
+
+if(GRGN3S_FOUND AND NOT TARGET Gnuradio::gn3s)
+    add_library(Gnuradio::gn3s SHARED IMPORTED)
+    set_target_properties(Gnuradio::gn3s PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+        IMPORTED_LOCATION "${GR_GN3S_LIBRARIES}"
+        INTERFACE_INCLUDE_DIRECTORIES "${GR_GN3S_INCLUDE_DIRS}"
+        INTERFACE_LINK_LIBRARIES "${GR_GN3S_LIBRARIES}"
+    )
+endif()
+
 mark_as_advanced(GR_GN3S_LIBRARIES GR_GN3S_INCLUDE_DIRS)

cmake/Modules/FindGRIIO.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors)
+# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -15,6 +15,12 @@
 # You should have received a copy of the GNU General Public License
 # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
 
+#
+# Provides the following imported target:
+# Gnuradio::iio
+#
+
+
 include(FindPkgConfig)
 pkg_check_modules(PC_IIO gnuradio-iio)
 
@@ -69,4 +75,15 @@ find_library(IIO_LIBRARIES
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(GRIIO DEFAULT_MSG IIO_LIBRARIES IIO_INCLUDE_DIRS)
+
+if(GRIIO_FOUND AND NOT TARGET Gnuradio::iio)
+    add_library(Gnuradio::iio SHARED IMPORTED)
+    set_target_properties(Gnuradio::iio PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+        IMPORTED_LOCATION "${IIO_LIBRARIES}"
+        INTERFACE_INCLUDE_DIRECTORIES "${IIO_INCLUDE_DIRS}"
+        INTERFACE_LINK_LIBRARIES "${IIO_LIBRARIES}"
+    )
+endif()
+
 mark_as_advanced(IIO_LIBRARIES IIO_INCLUDE_DIRS)

cmake/Modules/FindGROSMOSDR.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors)
+# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -33,6 +33,11 @@
 # GROSMOSDR_FOUND System has gr-osmosdr libs/headers
 # GROSMOSDR_LIBRARIES The gr-osmosdr libraries (gnuradio-osmosdr)
 # GROSMOSDR_INCLUDE_DIR The location of gr-osmosdr headers
+#
+# Provides the following imported target:
+# Gnuradio::osmosdr
+#
+
 
 include(FindPkgConfig)
 pkg_check_modules(GROSMOSDR_PKG gnuradio-osmosdr)
@@ -89,4 +94,15 @@ find_library(GROSMOSDR_LIBRARIES
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(GROSMOSDR DEFAULT_MSG GROSMOSDR_LIBRARIES GROSMOSDR_INCLUDE_DIR)
+
+if(GROSMOSDR_FOUND AND NOT TARGET Gnuradio::osmosdr)
+    add_library(Gnuradio::osmosdr SHARED IMPORTED)
+    set_target_properties(Gnuradio::osmosdr PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+        IMPORTED_LOCATION "${GROSMOSDR_LIBRARIES}"
+        INTERFACE_INCLUDE_DIRECTORIES "${GROSMOSDR_INCLUDE_DIR};${GROSMOSDR_INCLUDE_DIR}/osmosdr"
+        INTERFACE_LINK_LIBRARIES "${GROSMOSDR_LIBRARIES}"
+    )
+endif()
+
 mark_as_advanced(GROSMOSDR_LIBRARIES GROSMOSDR_INCLUDE_DIR)

cmake/Modules/FindLIBIIO.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors)
+# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -15,6 +15,11 @@
 # You should have received a copy of the GNU General Public License
 # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
 
+#
+# Provides the following imported target:
+# Iio::iio
+#
+
 include(FindPkgConfig)
 pkg_check_modules(PC_LIBIIO libiio)
 
@@ -73,4 +78,15 @@ find_library(
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(LIBIIO DEFAULT_MSG LIBIIO_LIBRARIES LIBIIO_INCLUDE_DIRS)
+
+if(LIBIIO_FOUND AND NOT TARGET Iio::iio)
+    add_library(Iio::iio SHARED IMPORTED)
+    set_target_properties(Iio::iio PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+        IMPORTED_LOCATION "${LIBIIO_LIBRARIES}"
+        INTERFACE_INCLUDE_DIRECTORIES "${LIBIIO_INCLUDE_DIRS}"
+        INTERFACE_LINK_LIBRARIES "${LIBIIO_LIBRARIES}"
+    )
+endif()
+
 mark_as_advanced(LIBIIO_LIBRARIES LIBIIO_INCLUDE_DIRS)

cmake/Modules/FindLIBOSMOSDR.cmake

@@ -27,6 +27,10 @@
 # LIBOSMOSDR_FOUND System has libosmosdr libs/headers
 # LIBOSMOSDR_LIBRARIES The libosmosdr libraries
 # LIBOSMOSDR_INCLUDE_DIR The location of libosmosdr headers
+#
+# Provides the following imported target:
+# Osmosdr::osmosdr
+#
 
 include(FindPkgConfig)
 pkg_check_modules(LIBOSMOSDR_PKG libosmosdr)
@@ -77,4 +81,15 @@ find_library(LIBOSMOSDR_LIBRARIES NAMES osmosdr
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(LIBOSMOSDR DEFAULT_MSG LIBOSMOSDR_INCLUDE_DIR LIBOSMOSDR_LIBRARIES)
+
+if(LIBOSMOSDR_FOUND AND NOT TARGET Osmosdr::osmosdr)
+    add_library(Osmosdr::osmosdr SHARED IMPORTED)
+    set_target_properties(Osmosdr::osmosdr PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+        IMPORTED_LOCATION "${LIBOSMOSDR_LIBRARIES}"
+        INTERFACE_INCLUDE_DIRECTORIES "${LIBOSMOSDR_INCLUDE_DIR}"
+        INTERFACE_LINK_LIBRARIES "${LIBOSMOSDR_LIBRARIES}"
+    )
+endif()
+
 mark_as_advanced(LIBOSMOSDR_INCLUDE_DIR LIBOSMOSDR_LIBRARIES)

cmake/Modules/FindLOG4CPP.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors)
+# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -21,7 +21,10 @@
 #  LOG4CPP_INCLUDE_DIR - where to find LOG4CPP.h, etc.
 #  LOG4CPP_LIBRARIES   - List of libraries when using LOG4CPP.
 #  LOG4CPP_FOUND       - True if LOG4CPP found.
-
+#
+# Provides the following imported target:
+# Log4cpp::log4cpp
+#
 
 if(LOG4CPP_INCLUDE_DIR)
   # Already in cache, be silent
@@ -90,3 +93,18 @@ endif()
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(LOG4CPP DEFAULT_MSG LOG4CPP_INCLUDE_DIRS LOG4CPP_LIBRARIES)
+
+if (LOG4CPP_FOUND AND NOT TARGET Log4cpp::log4cpp)
+  add_library(Log4cpp::log4cpp SHARED IMPORTED)
+  set_target_properties(Log4cpp::log4cpp PROPERTIES
+      IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+      IMPORTED_LOCATION "${LOG4CPP_LIBRARIES}"
+      INTERFACE_INCLUDE_DIRECTORIES "${LOG4CPP_INCLUDE_DIRS}"
+      INTERFACE_LINK_LIBRARIES "${LOG4CPP_LIBRARIES}"
+  )
+endif()
+
+mark_as_advanced(
+  LOG4CPP_LIBRARIES
+  LOG4CPP_INCLUDE_DIRS
+)

cmake/Modules/FindMATIO.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors)
+# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -26,6 +26,9 @@
 #  MATIO_INCLUDE_DIRS - where to find matio.h, etc..
 #  MATIO_VERSION_STRING - version number as a string (e.g.: "1.3.4")
 #
+# Provides the following imported target:
+# Matio::matio
+#
 #=============================================================================
 # Copyright 2015 Avtech Scientific <http://avtechscientific.com>
 #
@@ -127,3 +130,13 @@ else()
   set(MATIO_LIBRARIES)
   set(MATIO_INCLUDE_DIRS)
 endif()
+
+if(MATIO_FOUND AND NOT TARGET Matio::matio)
+    add_library(Matio::matio SHARED IMPORTED)
+    set_target_properties(Matio::matio PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+        IMPORTED_LOCATION "${MATIO_LIBRARY}"
+        INTERFACE_INCLUDE_DIRECTORIES "${MATIO_INCLUDE_DIR}"
+        INTERFACE_LINK_LIBRARIES "${MATIO_LIBRARY}"
+    )
+endif()

cmake/Modules/FindPCAP.cmake

@@ -43,7 +43,10 @@
 #  PCAP_INCLUDE_DIRS - where to find pcap.h, etc.
 #  PCAP_LIBRARIES   - List of libraries when using pcap.
 #  PCAP_FOUND       - True if pcap found.
-
+#
+# Provides the following imported target:
+# Pcap::pcap
+#
 
 if(EXISTS $ENV{PCAPDIR})
   find_path(PCAP_INCLUDE_DIR
@@ -113,10 +116,20 @@ check_function_exists("pcap_list_datalinks" HAVE_PCAP_LIST_DATALINKS)
 check_function_exists("pcap_open_dead" HAVE_PCAP_OPEN_DEAD)
 check_function_exists("pcap_set_datalink" HAVE_PCAP_SET_DATALINK)
 
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(PCAP DEFAULT_MSG PCAP_INCLUDE_DIRS PCAP_LIBRARIES)
+
+if(PCAP_FOUND AND NOT TARGET Pcap::pcap)
+    add_library(Pcap::pcap SHARED IMPORTED)
+    set_target_properties(Pcap::pcap PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+        IMPORTED_LOCATION "${PCAP_LIBRARIES}"
+        INTERFACE_INCLUDE_DIRECTORIES "${PCAP_INCLUDE_DIRS}"
+        INTERFACE_LINK_LIBRARIES "${PCAP_LIBRARIES}"
+    )
+endif()
+
 mark_as_advanced(
   PCAP_LIBRARIES
   PCAP_INCLUDE_DIRS
 )
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(PCAP DEFAULT_MSG PCAP_INCLUDE_DIRS PCAP_LIBRARIES)

cmake/Modules/FindPUGIXML.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors)
+# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -22,6 +22,10 @@
 # PUGIXML_INCLUDE_DIR - header location
 # PUGIXML_LIBRARIES - library to link against
 # PUGIXML_FOUND - true if pugixml was found.
+#
+# Provides the following imported target:
+# Pugixml::pugixml
+#
 
 find_path(PUGIXML_INCLUDE_DIR
     NAMES pugixml.hpp
@@ -73,3 +77,13 @@ else()
 endif()
 
 mark_as_advanced(PUGIXML_LIBRARY PUGIXML_INCLUDE_DIR)
+
+if(PUGIXML_FOUND AND NOT TARGET Pugixml::pugixml)
+    add_library(Pugixml::pugixml SHARED IMPORTED)
+    set_target_properties(Pugixml::pugixml PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+        IMPORTED_LOCATION "${PUGIXML_LIBRARY}"
+        INTERFACE_INCLUDE_DIRECTORIES "${PUGIXML_INCLUDE_DIR}"
+        INTERFACE_LINK_LIBRARIES "${PUGIXML_LIBRARY}"
+    )
+endif()

cmake/Modules/FindTELEORBIT.cmake

@@ -47,4 +47,15 @@ find_library(TELEORBIT_LIBRARIES
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(TELEORBIT DEFAULT_MSG TELEORBIT_LIBRARIES TELEORBIT_INCLUDE_DIRS)
+
+if(TELEORBIT_FOUND AND NOT TARGET Gnuradio:teleorbit)
+    add_library(Gnuradio:teleorbit SHARED IMPORTED)
+    set_target_properties(Gnuradio:teleorbit PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+        IMPORTED_LOCATION "${TELEORBIT_LIBRARIES}"
+        INTERFACE_INCLUDE_DIRECTORIES "${TELEORBIT_INCLUDE_DIRS};${TELEORBIT_INCLUDE_DIR}/teleorbit"
+        INTERFACE_LINK_LIBRARIES "${TELEORBIT_LIBRARIES}"
+    )
+endif()
+
 mark_as_advanced(TELEORBIT_LIBRARIES TELEORBIT_INCLUDE_DIRS)

cmake/Modules/FindUHD.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors)
+# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -15,10 +15,14 @@
 # You should have received a copy of the GNU General Public License
 # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
 
+#
+# Provides the following imported target:
+# Iio::iio
+#
+
 ########################################################################
 # Find the library for the USRP Hardware Driver
 ########################################################################
-
 include(FindPkgConfig)
 pkg_check_modules(PC_UHD uhd)
 
@@ -72,4 +76,15 @@ find_library(UHD_LIBRARIES
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(UHD DEFAULT_MSG UHD_LIBRARIES UHD_INCLUDE_DIRS)
+
+if(UHD_FOUND AND NOT TARGET Uhd::uhd)
+    add_library(Uhd::uhd SHARED IMPORTED)
+    set_target_properties(Uhd::uhd PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+        IMPORTED_LOCATION "${UHD_LIBRARIES}"
+        INTERFACE_INCLUDE_DIRECTORIES "${UHD_INCLUDE_DIRS}"
+        INTERFACE_LINK_LIBRARIES "${UHD_LIBRARIES}"
+    )
+endif()
+
 mark_as_advanced(UHD_LIBRARIES UHD_INCLUDE_DIRS)

cmake/Modules/FindVOLK.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors)
+# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -15,6 +15,11 @@
 # You should have received a copy of the GNU General Public License
 # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
 
+#
+# Provides the following imported target:
+# Volk::volk
+#
+
 ########################################################################
 # Find VOLK (Vector-Optimized Library of Kernels)
 ########################################################################
@@ -74,3 +79,13 @@ find_library(VOLK_LIBRARIES
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(VOLK DEFAULT_MSG VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
 mark_as_advanced(VOLK_LIBRARIES VOLK_INCLUDE_DIRS VOLK_VERSION)
+
+if(VOLK_FOUND AND NOT TARGET Volk::volk)
+    add_library(Volk::volk SHARED IMPORTED)
+    set_target_properties(Volk::volk PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+        IMPORTED_LOCATION "${VOLK_LIBRARIES}"
+        INTERFACE_INCLUDE_DIRECTORIES "${VOLK_INCLUDE_DIRS}"
+        INTERFACE_LINK_LIBRARIES "${VOLK_LIBRARIES}"
+    )
+endif()

cmake/Modules/FindVOLKGNSSSDR.cmake

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors)
+# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -15,6 +15,12 @@
 # You should have received a copy of the GNU General Public License
 # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
 
+#
+# Provides the following imported target:
+# Volkgnsssdr::volkgnsssdr
+#
+
+
 ########################################################################
 # Find VOLK (Vector-Optimized Library of Kernels) GNSS-SDR library
 ########################################################################
@@ -51,3 +57,14 @@ find_library(VOLK_GNSSSDR_LIBRARIES
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(VOLKGNSSSDR DEFAULT_MSG VOLK_GNSSSDR_LIBRARIES VOLK_GNSSSDR_INCLUDE_DIRS)
 mark_as_advanced(VOLK_GNSSSDR_LIBRARIES VOLK_GNSSSDR_INCLUDE_DIRS)
+
+
+if(GFLAGS_FOUND AND NOT TARGET Volkgnsssdr::volkgnsssdr)
+    add_library(Volkgnsssdr::volkgnsssdr SHARED IMPORTED)
+    set_target_properties(Volkgnsssdr::volkgnsssdr PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+        IMPORTED_LOCATION "${VOLK_GNSSSDR_LIBRARIES}"
+        INTERFACE_INCLUDE_DIRECTORIES "${VOLK_GNSSSDR_INCLUDE_DIRS}"
+        INTERFACE_LINK_LIBRARIES "${VOLK_GNSSSDR_LIBRARIES}"
+    )
+endif()

docs/changelog

@@ -4,6 +4,10 @@
 
 - Added the BeiDou B1I receiver chain.
 
+### Improvements in Portability:
+
+- CMake scripts now follow a modern approach (targets and properties) but still work in 2.8.12
+
 
 ## [0.0.10](https://github.com/gnss-sdr/gnss-sdr/releases/tag/v0.0.10)
 

src/algorithms/PVT/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.
 #
@@ -17,10 +17,6 @@
 #
 
 
-if(Boost_VERSION LESS 105800)
-    add_definitions(-DOLD_BOOST=1)
-endif()
-
 set(PVT_ADAPTER_SOURCES
     rtklib_pvt.cc
 )
@@ -29,28 +25,27 @@ set(PVT_ADAPTER_HEADERS
     rtklib_pvt.h
 )
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/gnuradio_blocks
-    ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${ARMADILLO_INCLUDE_DIRS}
-    ${Boost_INCLUDE_DIRS}
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-)
+source_group(Headers FILES ${PVT_ADAPTER_HEADERS})
 
 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}
+    PUBLIC
+        pvt_gr_blocks
+        Armadillo::armadillo
+        Gnuradio::runtime
+        gnss_system_parameters
+        gnss_rx
+        pvt_lib
+    PRIVATE
+        Boost::serialization
+)
+
+if(Boost_VERSION LESS 105800)
+    target_compile_definitions(pvt_adapters PRIVATE -DOLD_BOOST=1)
+endif()
+
+set_property(TARGET pvt_adapters
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )

src/algorithms/PVT/adapters/rtklib_pvt.cc

@@ -52,7 +52,7 @@ using google::LogMessage;
 RtklibPvt::RtklibPvt(ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_streams,
-    unsigned int out_streams) : role_(std::move(role)),
+    unsigned int out_streams) : role_(role),
                                 in_streams_(in_streams),
                                 out_streams_(out_streams)
 {
@@ -520,6 +520,11 @@ RtklibPvt::RtklibPvt(ConfigurationInterface* configuration,
     pvt_output_parameters.nmea_output_file_path = configuration->property(role + ".nmea_output_file_path", default_output_path);
     pvt_output_parameters.rtcm_output_file_path = configuration->property(role + ".rtcm_output_file_path", default_output_path);
 
+    // Read PVT MONITOR Configuration
+    pvt_output_parameters.monitor_enabled = configuration->property(role + ".enable_monitor", false);
+    pvt_output_parameters.udp_addresses = configuration->property(role + ".monitor_client_addresses", std::string("127.0.0.1"));
+    pvt_output_parameters.udp_port = configuration->property(role + ".monitor_udp_port", 1234);
+
     // make PVT object
     pvt_ = rtklib_make_pvt_cc(in_streams_, pvt_output_parameters, rtk);
     DLOG(INFO) << "pvt(" << pvt_->unique_id() << ")";

src/algorithms/PVT/gnuradio_blocks/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.
 #
@@ -16,11 +16,6 @@
 # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
 #
 
-
-if(Boost_VERSION LESS 105800)
-    add_definitions(-DOLD_BOOST=1)
-endif()
-
 set(PVT_GR_BLOCKS_SOURCES
     rtklib_pvt_cc.cc
 )
@@ -29,21 +24,36 @@ set(PVT_GR_BLOCKS_HEADERS
     rtklib_pvt_cc.h
 )
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${ARMADILLO_INCLUDE_DIRS}
-    ${Boost_INCLUDE_DIRS}
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-)
+source_group(Headers FILES ${PVT_GR_BLOCKS_HEADERS})
 
 add_library(pvt_gr_blocks ${PVT_GR_BLOCKS_SOURCES} ${PVT_GR_BLOCKS_HEADERS})
-source_group(Headers FILES ${PVT_GR_BLOCKS_HEADERS})
-target_link_libraries(pvt_gr_blocks pvt_lib ${ARMADILLO_LIBRARIES})
+
+target_link_libraries(pvt_gr_blocks
+    PUBLIC
+        Boost::date_time
+        pvt_lib
+        Gnuradio::runtime
+        gnss_system_parameters
+        gnss_rx
+    PRIVATE
+        Gflags::gflags
+        Glog::glog
+        Boost::filesystem
+        Boost::system
+)
+
+target_include_directories(pvt_gr_blocks
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs
+        ${CMAKE_SOURCE_DIR}/src/core/system_parameters
+)
+
+if(Boost_VERSION LESS 105800)
+    target_compile_definitions(pvt_gr_blocks PRIVATE -DOLD_BOOST=1)
+endif()
+
+set_property(TARGET pvt_gr_blocks
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+        $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/core/system_parameters>
+)

src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc

@@ -67,7 +67,7 @@ rtklib_pvt_cc_sptr rtklib_make_pvt_cc(uint32_t nchannels,
 }
 
 
-void rtklib_pvt_cc::msg_handler_telemetry(pmt::pmt_t msg)
+void rtklib_pvt_cc::msg_handler_telemetry(const pmt::pmt_t& msg)
 {
     try
         {
@@ -334,10 +334,10 @@ rtklib_pvt_cc::rtklib_pvt_cc(uint32_t nchannels,
         {
             std::string dump_path;
             // Get path
-            if (d_dump_filename.find_last_of("/") != std::string::npos)
+            if (d_dump_filename.find_last_of('/') != std::string::npos)
                 {
-                    std::string dump_filename_ = d_dump_filename.substr(d_dump_filename.find_last_of("/") + 1);
-                    dump_path = d_dump_filename.substr(0, d_dump_filename.find_last_of("/"));
+                    std::string dump_filename_ = d_dump_filename.substr(d_dump_filename.find_last_of('/') + 1);
+                    dump_path = d_dump_filename.substr(0, d_dump_filename.find_last_of('/'));
                     d_dump_filename = dump_filename_;
                 }
             else
@@ -349,9 +349,9 @@ rtklib_pvt_cc::rtklib_pvt_cc(uint32_t nchannels,
                     d_dump_filename = "pvt";
                 }
             // remove extension if any
-            if (d_dump_filename.substr(1).find_last_of(".") != std::string::npos)
+            if (d_dump_filename.substr(1).find_last_of('.') != std::string::npos)
                 {
-                    d_dump_filename = d_dump_filename.substr(0, d_dump_filename.find_last_of("."));
+                    d_dump_filename = d_dump_filename.substr(0, d_dump_filename.find_last_of('.'));
                 }
             dump_ls_pvt_filename = dump_path + boost::filesystem::path::preferred_separator + d_dump_filename;
             dump_ls_pvt_filename.append(".dat");
@@ -559,6 +559,19 @@ rtklib_pvt_cc::rtklib_pvt_cc(uint32_t nchannels,
 
     d_last_status_print_seg = 0;
 
+    // PVT MONITOR
+    flag_monitor_pvt_enabled = conf_.monitor_enabled;
+    if (flag_monitor_pvt_enabled)
+        {
+            std::string address_string = conf_.udp_addresses;
+            std::vector<std::string> udp_addr_vec = split_string(address_string, '_');
+            std::sort(udp_addr_vec.begin(), udp_addr_vec.end());
+            udp_addr_vec.erase(std::unique(udp_addr_vec.begin(), udp_addr_vec.end()), udp_addr_vec.end());
+
+            udp_sink_ptr = std::unique_ptr<Monitor_Pvt_Udp_Sink>(new Monitor_Pvt_Udp_Sink(udp_addr_vec, conf_.udp_port));
+        }
+
+
     // Create Sys V message queue
     first_fix = true;
     sysv_msg_key = 1101;
@@ -574,7 +587,7 @@ rtklib_pvt_cc::rtklib_pvt_cc(uint32_t nchannels,
 
 rtklib_pvt_cc::~rtklib_pvt_cc()
 {
-    msgctl(sysv_msqid, IPC_RMID, NULL);
+    msgctl(sysv_msqid, IPC_RMID, nullptr);
     if (d_xml_storage)
         {
             // save GPS L2CM ephemeris to XML file
@@ -1085,7 +1098,7 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
             bool flag_write_RINEX_nav_output = false;
 
             gnss_observables_map.clear();
-            const Gnss_Synchro** in = reinterpret_cast<const Gnss_Synchro**>(&input_items[0]);  // Get the input buffer pointer
+            const auto** in = reinterpret_cast<const Gnss_Synchro**>(&input_items[0]);  // Get the input buffer pointer
             // ############ 1. READ PSEUDORANGES ####
             for (uint32_t i = 0; i < d_nchannels; i++)
                 {
@@ -1996,17 +2009,17 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                         case 1:  // GPS L1 C/A
                                                             if (flag_write_RTCM_1019_output == true)
                                                                 {
-                                                                    for (std::map<int, Gps_Ephemeris>::const_iterator gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin(); gps_eph_iter != d_pvt_solver->gps_ephemeris_map.cend(); gps_eph_iter++)
+                                                                    for (const auto& gps_eph_iter : d_pvt_solver->gps_ephemeris_map)
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MT1019(gps_eph_iter->second);
+                                                                            d_rtcm_printer->Print_Rtcm_MT1019(gps_eph_iter.second);
                                                                         }
                                                                 }
                                                             if (flag_write_RTCM_MSM_output == true)
                                                                 {
-                                                                    std::map<int, Gps_Ephemeris>::const_iterator gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin();
+                                                                    auto gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin();
                                                                     if (gps_eph_iter != d_pvt_solver->gps_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, gps_eph_iter->second, {}, {}, {}, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, gps_eph_iter->second, {}, {}, {}, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                 }
                                                             break;
@@ -2015,76 +2028,76 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                         case 6:
                                                             if (flag_write_RTCM_1045_output == true)
                                                                 {
-                                                                    for (std::map<int, Galileo_Ephemeris>::const_iterator gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin(); gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend(); gal_eph_iter++)
+                                                                    for (const auto& gal_eph_iter : d_pvt_solver->galileo_ephemeris_map)
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MT1045(gal_eph_iter->second);
+                                                                            d_rtcm_printer->Print_Rtcm_MT1045(gal_eph_iter.second);
                                                                         }
                                                                 }
                                                             if (flag_write_RTCM_MSM_output == true)
                                                                 {
-                                                                    std::map<int, Galileo_Ephemeris>::const_iterator gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin();
+                                                                    auto gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin();
                                                                     if (gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, gal_eph_iter->second, {}, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, gal_eph_iter->second, {}, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                 }
                                                             break;
                                                         case 7:  // GPS L1 C/A + GPS L2C
                                                             if (flag_write_RTCM_1019_output == true)
                                                                 {
-                                                                    for (std::map<int, Gps_Ephemeris>::const_iterator gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin(); gps_eph_iter != d_pvt_solver->gps_ephemeris_map.cend(); gps_eph_iter++)
+                                                                    for (const auto& gps_eph_iter : d_pvt_solver->gps_ephemeris_map)
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MT1019(gps_eph_iter->second);
+                                                                            d_rtcm_printer->Print_Rtcm_MT1019(gps_eph_iter.second);
                                                                         }
                                                                 }
                                                             if (flag_write_RTCM_MSM_output == true)
                                                                 {
-                                                                    std::map<int, Gps_Ephemeris>::const_iterator gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin();
-                                                                    std::map<int, Gps_CNAV_Ephemeris>::const_iterator gps_cnav_eph_iter = d_pvt_solver->gps_cnav_ephemeris_map.cbegin();
+                                                                    auto gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin();
+                                                                    auto gps_cnav_eph_iter = d_pvt_solver->gps_cnav_ephemeris_map.cbegin();
                                                                     if ((gps_eph_iter != d_pvt_solver->gps_ephemeris_map.cend()) and (gps_cnav_eph_iter != d_pvt_solver->gps_cnav_ephemeris_map.cend()))
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, gps_eph_iter->second, gps_cnav_eph_iter->second, {}, {}, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, gps_eph_iter->second, gps_cnav_eph_iter->second, {}, {}, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                 }
                                                             break;
                                                         case 8:  // L1+L5
                                                             if (flag_write_RTCM_1019_output == true)
                                                                 {
-                                                                    for (std::map<int, Gps_Ephemeris>::const_iterator gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin(); gps_eph_iter != d_pvt_solver->gps_ephemeris_map.cend(); gps_eph_iter++)
+                                                                    for (const auto& gps_eph_iter : d_pvt_solver->gps_ephemeris_map)
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MT1019(gps_eph_iter->second);
+                                                                            d_rtcm_printer->Print_Rtcm_MT1019(gps_eph_iter.second);
                                                                         }
                                                                 }
                                                             if (flag_write_RTCM_MSM_output == true)
                                                                 {
-                                                                    std::map<int, Gps_Ephemeris>::const_iterator gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin();
-                                                                    std::map<int, Gps_CNAV_Ephemeris>::const_iterator gps_cnav_eph_iter = d_pvt_solver->gps_cnav_ephemeris_map.cbegin();
+                                                                    auto gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin();
+                                                                    auto gps_cnav_eph_iter = d_pvt_solver->gps_cnav_ephemeris_map.cbegin();
                                                                     if ((gps_eph_iter != d_pvt_solver->gps_ephemeris_map.cend()) and (gps_cnav_eph_iter != d_pvt_solver->gps_cnav_ephemeris_map.cend()))
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, gps_eph_iter->second, gps_cnav_eph_iter->second, {}, {}, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, gps_eph_iter->second, gps_cnav_eph_iter->second, {}, {}, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                 }
                                                             break;
                                                         case 9:  // GPS L1 C/A + Galileo E1B
                                                             if (flag_write_RTCM_1019_output == true)
                                                                 {
-                                                                    for (std::map<int, Gps_Ephemeris>::const_iterator gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin(); gps_eph_iter != d_pvt_solver->gps_ephemeris_map.cend(); gps_eph_iter++)
+                                                                    for (const auto& gps_eph_iter : d_pvt_solver->gps_ephemeris_map)
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MT1019(gps_eph_iter->second);
+                                                                            d_rtcm_printer->Print_Rtcm_MT1019(gps_eph_iter.second);
                                                                         }
                                                                 }
                                                             if (flag_write_RTCM_1045_output == true)
                                                                 {
-                                                                    for (std::map<int, Galileo_Ephemeris>::const_iterator gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin(); gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend(); gal_eph_iter++)
+                                                                    for (const auto& gal_eph_iter : d_pvt_solver->galileo_ephemeris_map)
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MT1045(gal_eph_iter->second);
+                                                                            d_rtcm_printer->Print_Rtcm_MT1045(gal_eph_iter.second);
                                                                         }
                                                                 }
                                                             if (flag_write_RTCM_MSM_output == true)
                                                                 {
                                                                     std::map<int, Gnss_Synchro>::const_iterator gnss_observables_iter;
-                                                                    std::map<int, Gps_Ephemeris>::const_iterator gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin();
-                                                                    std::map<int, Galileo_Ephemeris>::const_iterator gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin();
+                                                                    auto gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin();
+                                                                    auto gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin();
                                                                     int gps_channel = 0;
                                                                     int gal_channel = 0;
                                                                     for (gnss_observables_iter = gnss_observables_map.cbegin(); gnss_observables_iter != gnss_observables_map.cend(); gnss_observables_iter++)
@@ -2092,7 +2105,7 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                                             std::string system(&gnss_observables_iter->second.System, 1);
                                                                             if (gps_channel == 0)
                                                                                 {
-                                                                                    if (system.compare("G") == 0)
+                                                                                    if (system == "G")
                                                                                         {
                                                                                             // This is a channel with valid GPS signal
                                                                                             gps_eph_iter = d_pvt_solver->gps_ephemeris_map.find(gnss_observables_iter->second.PRN);
@@ -2104,7 +2117,7 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                                                 }
                                                                             if (gal_channel == 0)
                                                                                 {
-                                                                                    if (system.compare("E") == 0)
+                                                                                    if (system == "E")
                                                                                         {
                                                                                             gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.find(gnss_observables_iter->second.PRN);
                                                                                             if (gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend())
@@ -2116,28 +2129,28 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                                         }
                                                                     if (gps_eph_iter != d_pvt_solver->gps_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, gps_eph_iter->second, {}, {}, {}, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, gps_eph_iter->second, {}, {}, {}, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                     if (gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, gal_eph_iter->second, {}, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, gal_eph_iter->second, {}, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                 }
                                                             break;
                                                         case 13:  // L5+E5a
                                                             if (flag_write_RTCM_1045_output == true)
                                                                 {
-                                                                    for (std::map<int, Galileo_Ephemeris>::const_iterator gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin(); gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend(); gal_eph_iter++)
+                                                                    for (const auto& gal_eph_iter : d_pvt_solver->galileo_ephemeris_map)
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MT1045(gal_eph_iter->second);
+                                                                            d_rtcm_printer->Print_Rtcm_MT1045(gal_eph_iter.second);
                                                                         }
                                                                 }
 
                                                             if (flag_write_RTCM_MSM_output and d_rtcm_MSM_rate_ms != 0)
                                                                 {
                                                                     std::map<int, Gnss_Synchro>::const_iterator gnss_observables_iter;
-                                                                    std::map<int, Galileo_Ephemeris>::const_iterator gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin();
-                                                                    std::map<int, Gps_CNAV_Ephemeris>::const_iterator gps_cnav_eph_iter = d_pvt_solver->gps_cnav_ephemeris_map.cbegin();
+                                                                    auto gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin();
+                                                                    auto gps_cnav_eph_iter = d_pvt_solver->gps_cnav_ephemeris_map.cbegin();
                                                                     int gal_channel = 0;
                                                                     int gps_channel = 0;
                                                                     for (gnss_observables_iter = gnss_observables_map.cbegin(); gnss_observables_iter != gnss_observables_map.cend(); gnss_observables_iter++)
@@ -2170,11 +2183,11 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
 
                                                                     if (gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend() and (d_rtcm_MT1097_rate_ms != 0))
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, gal_eph_iter->second, {}, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, gal_eph_iter->second, {}, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                     if (gps_cnav_eph_iter != d_pvt_solver->gps_cnav_ephemeris_map.cend() and (d_rtcm_MT1077_rate_ms != 0))
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, gps_cnav_eph_iter->second, {}, {}, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, gps_cnav_eph_iter->second, {}, {}, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                 }
                                                             break;
@@ -2182,17 +2195,17 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                         case 15:
                                                             if (flag_write_RTCM_1045_output == true)
                                                                 {
-                                                                    for (std::map<int, Galileo_Ephemeris>::const_iterator gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin(); gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend(); gal_eph_iter++)
+                                                                    for (const auto& gal_eph_iter : d_pvt_solver->galileo_ephemeris_map)
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MT1045(gal_eph_iter->second);
+                                                                            d_rtcm_printer->Print_Rtcm_MT1045(gal_eph_iter.second);
                                                                         }
                                                                 }
                                                             if (flag_write_RTCM_MSM_output == true)
                                                                 {
-                                                                    std::map<int, Galileo_Ephemeris>::const_iterator gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin();
+                                                                    auto gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin();
                                                                     if (gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, gal_eph_iter->second, {}, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, gal_eph_iter->second, {}, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                 }
                                                             break;
@@ -2201,17 +2214,17 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                         case 25:
                                                             if (flag_write_RTCM_1020_output == true)
                                                                 {
-                                                                    for (std::map<int, Glonass_Gnav_Ephemeris>::const_iterator glonass_gnav_ephemeris_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin(); glonass_gnav_ephemeris_iter != d_pvt_solver->glonass_gnav_ephemeris_map.cend(); glonass_gnav_ephemeris_iter++)
+                                                                    for (auto glonass_gnav_ephemeris_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin(); glonass_gnav_ephemeris_iter != d_pvt_solver->glonass_gnav_ephemeris_map.cend(); glonass_gnav_ephemeris_iter++)
                                                                         {
                                                                             d_rtcm_printer->Print_Rtcm_MT1020(glonass_gnav_ephemeris_iter->second, d_pvt_solver->glonass_gnav_utc_model);
                                                                         }
                                                                 }
                                                             if (flag_write_RTCM_MSM_output == true)
                                                                 {
-                                                                    std::map<int, Glonass_Gnav_Ephemeris>::const_iterator glo_gnav_ephemeris_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin();
+                                                                    auto glo_gnav_ephemeris_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin();
                                                                     if (glo_gnav_ephemeris_iter != d_pvt_solver->glonass_gnav_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, {}, glo_gnav_ephemeris_iter->second, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, {}, glo_gnav_ephemeris_iter->second, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                 }
                                                             b_rtcm_writing_started = true;
@@ -2219,14 +2232,14 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                         case 26:  // GPS L1 C/A + GLONASS L1 C/A
                                                             if (flag_write_RTCM_1019_output == true)
                                                                 {
-                                                                    for (std::map<int, Gps_Ephemeris>::const_iterator gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin(); gps_eph_iter != d_pvt_solver->gps_ephemeris_map.cend(); gps_eph_iter++)
+                                                                    for (const auto& gps_eph_iter : d_pvt_solver->gps_ephemeris_map)
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MT1019(gps_eph_iter->second);
+                                                                            d_rtcm_printer->Print_Rtcm_MT1019(gps_eph_iter.second);
                                                                         }
                                                                 }
                                                             if (flag_write_RTCM_1020_output == true)
                                                                 {
-                                                                    for (std::map<int, Glonass_Gnav_Ephemeris>::const_iterator glonass_gnav_ephemeris_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin(); glonass_gnav_ephemeris_iter != d_pvt_solver->glonass_gnav_ephemeris_map.cend(); glonass_gnav_ephemeris_iter++)
+                                                                    for (auto glonass_gnav_ephemeris_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin(); glonass_gnav_ephemeris_iter != d_pvt_solver->glonass_gnav_ephemeris_map.cend(); glonass_gnav_ephemeris_iter++)
                                                                         {
                                                                             d_rtcm_printer->Print_Rtcm_MT1020(glonass_gnav_ephemeris_iter->second, d_pvt_solver->glonass_gnav_utc_model);
                                                                         }
@@ -2234,8 +2247,8 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                             if (flag_write_RTCM_MSM_output == true)
                                                                 {
                                                                     std::map<int, Gnss_Synchro>::const_iterator gnss_observables_iter;
-                                                                    std::map<int, Glonass_Gnav_Ephemeris>::const_iterator glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin();
-                                                                    std::map<int, Gps_Ephemeris>::const_iterator gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin();
+                                                                    auto glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin();
+                                                                    auto gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin();
                                                                     int gps_channel = 0;
                                                                     int glo_channel = 0;
                                                                     for (gnss_observables_iter = gnss_observables_map.cbegin(); gnss_observables_iter != gnss_observables_map.cend(); gnss_observables_iter++)
@@ -2268,34 +2281,34 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
 
                                                                     if (glonass_gnav_eph_iter != d_pvt_solver->glonass_gnav_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, {}, glonass_gnav_eph_iter->second, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, {}, glonass_gnav_eph_iter->second, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                     if (gps_eph_iter != d_pvt_solver->gps_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, gps_eph_iter->second, {}, {}, {}, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, gps_eph_iter->second, {}, {}, {}, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                 }
                                                             break;
                                                         case 27:  // GLONASS L1 C/A + Galileo E1B
                                                             if (flag_write_RTCM_1020_output == true)
                                                                 {
-                                                                    for (std::map<int, Glonass_Gnav_Ephemeris>::const_iterator glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin(); glonass_gnav_eph_iter != d_pvt_solver->glonass_gnav_ephemeris_map.cend(); glonass_gnav_eph_iter++)
+                                                                    for (auto glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin(); glonass_gnav_eph_iter != d_pvt_solver->glonass_gnav_ephemeris_map.cend(); glonass_gnav_eph_iter++)
                                                                         {
                                                                             d_rtcm_printer->Print_Rtcm_MT1020(glonass_gnav_eph_iter->second, d_pvt_solver->glonass_gnav_utc_model);
                                                                         }
                                                                 }
                                                             if (flag_write_RTCM_1045_output == true)
                                                                 {
-                                                                    for (std::map<int, Galileo_Ephemeris>::const_iterator gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin(); gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend(); gal_eph_iter++)
+                                                                    for (const auto& gal_eph_iter : d_pvt_solver->galileo_ephemeris_map)
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MT1045(gal_eph_iter->second);
+                                                                            d_rtcm_printer->Print_Rtcm_MT1045(gal_eph_iter.second);
                                                                         }
                                                                 }
                                                             if (flag_write_RTCM_MSM_output == true)
                                                                 {
                                                                     std::map<int, Gnss_Synchro>::const_iterator gnss_observables_iter;
-                                                                    std::map<int, Galileo_Ephemeris>::const_iterator gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin();
-                                                                    std::map<int, Glonass_Gnav_Ephemeris>::const_iterator glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin();
+                                                                    auto gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin();
+                                                                    auto glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin();
                                                                     int gal_channel = 0;
                                                                     int glo_channel = 0;
                                                                     for (gnss_observables_iter = gnss_observables_map.cbegin(); gnss_observables_iter != gnss_observables_map.cend(); gnss_observables_iter++)
@@ -2327,25 +2340,25 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                                         }
                                                                     if (gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, gal_eph_iter->second, {}, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, gal_eph_iter->second, {}, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                     if (glonass_gnav_eph_iter != d_pvt_solver->glonass_gnav_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, {}, glonass_gnav_eph_iter->second, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, {}, glonass_gnav_eph_iter->second, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                 }
                                                             break;
                                                         case 29:  // GPS L1 C/A + GLONASS L2 C/A
                                                             if (flag_write_RTCM_1019_output == true)
                                                                 {
-                                                                    for (std::map<int, Gps_Ephemeris>::const_iterator gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin(); gps_eph_iter != d_pvt_solver->gps_ephemeris_map.cend(); gps_eph_iter++)
+                                                                    for (const auto& gps_eph_iter : d_pvt_solver->gps_ephemeris_map)
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MT1019(gps_eph_iter->second);
+                                                                            d_rtcm_printer->Print_Rtcm_MT1019(gps_eph_iter.second);
                                                                         }
                                                                 }
                                                             if (flag_write_RTCM_1020_output == true)
                                                                 {
-                                                                    for (std::map<int, Glonass_Gnav_Ephemeris>::const_iterator glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin(); glonass_gnav_eph_iter != d_pvt_solver->glonass_gnav_ephemeris_map.cend(); glonass_gnav_eph_iter++)
+                                                                    for (auto glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin(); glonass_gnav_eph_iter != d_pvt_solver->glonass_gnav_ephemeris_map.cend(); glonass_gnav_eph_iter++)
                                                                         {
                                                                             d_rtcm_printer->Print_Rtcm_MT1020(glonass_gnav_eph_iter->second, d_pvt_solver->glonass_gnav_utc_model);
                                                                         }
@@ -2353,8 +2366,8 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                             if (flag_write_RTCM_MSM_output == true)
                                                                 {
                                                                     std::map<int, Gnss_Synchro>::const_iterator gnss_observables_iter;
-                                                                    std::map<int, Gps_Ephemeris>::const_iterator gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin();
-                                                                    std::map<int, Glonass_Gnav_Ephemeris>::const_iterator glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin();
+                                                                    auto gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin();
+                                                                    auto glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin();
                                                                     int gps_channel = 0;
                                                                     int glo_channel = 0;
                                                                     for (gnss_observables_iter = gnss_observables_map.cbegin(); gnss_observables_iter != gnss_observables_map.cend(); gnss_observables_iter++)
@@ -2386,34 +2399,34 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                                         }
                                                                     if (glonass_gnav_eph_iter != d_pvt_solver->glonass_gnav_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, {}, glonass_gnav_eph_iter->second, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, {}, glonass_gnav_eph_iter->second, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                     if (gps_eph_iter != d_pvt_solver->gps_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, gps_eph_iter->second, {}, {}, {}, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, gps_eph_iter->second, {}, {}, {}, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                 }
                                                             break;
                                                         case 30:  // GLONASS L2 C/A + Galileo E1B
                                                             if (flag_write_RTCM_1020_output == true)
                                                                 {
-                                                                    for (std::map<int, Glonass_Gnav_Ephemeris>::const_iterator glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin(); glonass_gnav_eph_iter != d_pvt_solver->glonass_gnav_ephemeris_map.cend(); glonass_gnav_eph_iter++)
+                                                                    for (auto glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin(); glonass_gnav_eph_iter != d_pvt_solver->glonass_gnav_ephemeris_map.cend(); glonass_gnav_eph_iter++)
                                                                         {
                                                                             d_rtcm_printer->Print_Rtcm_MT1020(glonass_gnav_eph_iter->second, d_pvt_solver->glonass_gnav_utc_model);
                                                                         }
                                                                 }
                                                             if (flag_write_RTCM_1045_output == true)
                                                                 {
-                                                                    for (std::map<int, Galileo_Ephemeris>::const_iterator gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin(); gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend(); gal_eph_iter++)
+                                                                    for (const auto& gal_eph_iter : d_pvt_solver->galileo_ephemeris_map)
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MT1045(gal_eph_iter->second);
+                                                                            d_rtcm_printer->Print_Rtcm_MT1045(gal_eph_iter.second);
                                                                         }
                                                                 }
                                                             if (flag_write_RTCM_MSM_output == true)
                                                                 {
                                                                     std::map<int, Gnss_Synchro>::const_iterator gnss_observables_iter;
-                                                                    std::map<int, Galileo_Ephemeris>::const_iterator gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin();
-                                                                    std::map<int, Glonass_Gnav_Ephemeris>::const_iterator glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin();
+                                                                    auto gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin();
+                                                                    auto glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin();
                                                                     int gal_channel = 0;
                                                                     int glo_channel = 0;
                                                                     for (gnss_observables_iter = gnss_observables_map.cbegin(); gnss_observables_iter != gnss_observables_map.cend(); gnss_observables_iter++)
@@ -2445,34 +2458,34 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                                         }
                                                                     if (gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, gal_eph_iter->second, {}, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, gal_eph_iter->second, {}, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                     if (glonass_gnav_eph_iter != d_pvt_solver->glonass_gnav_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, {}, glonass_gnav_eph_iter->second, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, {}, glonass_gnav_eph_iter->second, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                 }
                                                             break;
                                                         case 32:  // L1+E1+L5+E5a
                                                             if (flag_write_RTCM_1019_output == true)
                                                                 {
-                                                                    for (std::map<int, Gps_Ephemeris>::const_iterator gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin(); gps_eph_iter != d_pvt_solver->gps_ephemeris_map.cend(); gps_eph_iter++)
+                                                                    for (const auto& gps_eph_iter : d_pvt_solver->gps_ephemeris_map)
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MT1019(gps_eph_iter->second);
+                                                                            d_rtcm_printer->Print_Rtcm_MT1019(gps_eph_iter.second);
                                                                         }
                                                                 }
                                                             if (flag_write_RTCM_1045_output == true)
                                                                 {
-                                                                    for (std::map<int, Galileo_Ephemeris>::const_iterator gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin(); gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend(); gal_eph_iter++)
+                                                                    for (const auto& gal_eph_iter : d_pvt_solver->galileo_ephemeris_map)
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MT1045(gal_eph_iter->second);
+                                                                            d_rtcm_printer->Print_Rtcm_MT1045(gal_eph_iter.second);
                                                                         }
                                                                 }
                                                             if (flag_write_RTCM_MSM_output == true)
                                                                 {
                                                                     std::map<int, Gnss_Synchro>::const_iterator gnss_observables_iter;
-                                                                    std::map<int, Galileo_Ephemeris>::const_iterator gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin();
-                                                                    std::map<int, Gps_Ephemeris>::const_iterator gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin();
+                                                                    auto gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin();
+                                                                    auto gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin();
                                                                     int gal_channel = 0;
                                                                     int gps_channel = 0;
                                                                     for (gnss_observables_iter = gnss_observables_map.cbegin(); gnss_observables_iter != gnss_observables_map.cend(); gnss_observables_iter++)
@@ -2504,11 +2517,11 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                                         }
                                                                     if (gps_eph_iter != d_pvt_solver->gps_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, gps_eph_iter->second, {}, {}, {}, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, gps_eph_iter->second, {}, {}, {}, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                     if (gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, gal_eph_iter->second, {}, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, gal_eph_iter->second, {}, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                 }
                                                             break;
@@ -2524,18 +2537,18 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                         case 1:                              // GPS L1 C/A
                                                             if (d_rtcm_MT1019_rate_ms != 0)  // allows deactivating messages by setting rate = 0
                                                                 {
-                                                                    for (std::map<int, Gps_Ephemeris>::const_iterator gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin(); gps_eph_iter != d_pvt_solver->gps_ephemeris_map.cend(); gps_eph_iter++)
+                                                                    for (const auto& gps_eph_iter : d_pvt_solver->gps_ephemeris_map)
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MT1019(gps_eph_iter->second);
+                                                                            d_rtcm_printer->Print_Rtcm_MT1019(gps_eph_iter.second);
                                                                         }
                                                                 }
                                                             if (d_rtcm_MSM_rate_ms != 0)  // allows deactivating messages by setting rate = 0
                                                                 {
-                                                                    std::map<int, Gps_Ephemeris>::const_iterator gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin();
+                                                                    auto gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin();
 
                                                                     if (gps_eph_iter != d_pvt_solver->gps_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, gps_eph_iter->second, {}, {}, {}, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, gps_eph_iter->second, {}, {}, {}, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                 }
                                                             b_rtcm_writing_started = true;
@@ -2545,17 +2558,17 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                         case 6:
                                                             if (d_rtcm_MT1045_rate_ms != 0)  // allows deactivating messages by setting rate = 0
                                                                 {
-                                                                    for (std::map<int, Galileo_Ephemeris>::const_iterator gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin(); gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend(); gal_eph_iter++)
+                                                                    for (const auto& gal_eph_iter : d_pvt_solver->galileo_ephemeris_map)
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MT1045(gal_eph_iter->second);
+                                                                            d_rtcm_printer->Print_Rtcm_MT1045(gal_eph_iter.second);
                                                                         }
                                                                 }
                                                             if (d_rtcm_MSM_rate_ms != 0)
                                                                 {
-                                                                    std::map<int, Galileo_Ephemeris>::const_iterator gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin();
+                                                                    auto gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin();
                                                                     if (gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, gal_eph_iter->second, {}, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, gal_eph_iter->second, {}, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                 }
                                                             b_rtcm_writing_started = true;
@@ -2563,18 +2576,18 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                         case 7:                              // GPS L1 C/A + GPS L2C
                                                             if (d_rtcm_MT1019_rate_ms != 0)  // allows deactivating messages by setting rate = 0
                                                                 {
-                                                                    for (std::map<int, Gps_Ephemeris>::const_iterator gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin(); gps_eph_iter != d_pvt_solver->gps_ephemeris_map.cend(); gps_eph_iter++)
+                                                                    for (const auto& gps_eph_iter : d_pvt_solver->gps_ephemeris_map)
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MT1019(gps_eph_iter->second);
+                                                                            d_rtcm_printer->Print_Rtcm_MT1019(gps_eph_iter.second);
                                                                         }
                                                                 }
                                                             if (d_rtcm_MSM_rate_ms != 0)
                                                                 {
-                                                                    std::map<int, Gps_Ephemeris>::const_iterator gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin();
-                                                                    std::map<int, Gps_CNAV_Ephemeris>::const_iterator gps_cnav_eph_iter = d_pvt_solver->gps_cnav_ephemeris_map.cbegin();
+                                                                    auto gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin();
+                                                                    auto gps_cnav_eph_iter = d_pvt_solver->gps_cnav_ephemeris_map.cbegin();
                                                                     if ((gps_eph_iter != d_pvt_solver->gps_ephemeris_map.cend()) and (gps_cnav_eph_iter != d_pvt_solver->gps_cnav_ephemeris_map.cend()))
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, gps_eph_iter->second, gps_cnav_eph_iter->second, {}, {}, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, gps_eph_iter->second, gps_cnav_eph_iter->second, {}, {}, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                 }
                                                             b_rtcm_writing_started = true;
@@ -2582,18 +2595,18 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                         case 8:                              // L1+L5
                                                             if (d_rtcm_MT1019_rate_ms != 0)  // allows deactivating messages by setting rate = 0
                                                                 {
-                                                                    for (std::map<int, Gps_Ephemeris>::const_iterator gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin(); gps_eph_iter != d_pvt_solver->gps_ephemeris_map.cend(); gps_eph_iter++)
+                                                                    for (const auto& gps_eph_iter : d_pvt_solver->gps_ephemeris_map)
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MT1019(gps_eph_iter->second);
+                                                                            d_rtcm_printer->Print_Rtcm_MT1019(gps_eph_iter.second);
                                                                         }
                                                                 }
                                                             if (d_rtcm_MSM_rate_ms != 0)
                                                                 {
-                                                                    std::map<int, Gps_Ephemeris>::const_iterator gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin();
-                                                                    std::map<int, Gps_CNAV_Ephemeris>::const_iterator gps_cnav_eph_iter = d_pvt_solver->gps_cnav_ephemeris_map.cbegin();
+                                                                    auto gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin();
+                                                                    auto gps_cnav_eph_iter = d_pvt_solver->gps_cnav_ephemeris_map.cbegin();
                                                                     if ((gps_eph_iter != d_pvt_solver->gps_ephemeris_map.cend()) and (gps_cnav_eph_iter != d_pvt_solver->gps_cnav_ephemeris_map.cend()))
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, gps_eph_iter->second, gps_cnav_eph_iter->second, {}, {}, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, gps_eph_iter->second, gps_cnav_eph_iter->second, {}, {}, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                 }
                                                             b_rtcm_writing_started = true;
@@ -2601,23 +2614,23 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                         case 9:                              // GPS L1 C/A + Galileo E1B
                                                             if (d_rtcm_MT1019_rate_ms != 0)  // allows deactivating messages by setting rate = 0
                                                                 {
-                                                                    for (std::map<int, Gps_Ephemeris>::const_iterator gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin(); gps_eph_iter != d_pvt_solver->gps_ephemeris_map.cend(); gps_eph_iter++)
+                                                                    for (const auto& gps_eph_iter : d_pvt_solver->gps_ephemeris_map)
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MT1019(gps_eph_iter->second);
+                                                                            d_rtcm_printer->Print_Rtcm_MT1019(gps_eph_iter.second);
                                                                         }
                                                                 }
                                                             if (d_rtcm_MT1045_rate_ms != 0)
                                                                 {
-                                                                    for (std::map<int, Galileo_Ephemeris>::const_iterator gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin(); gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend(); gal_eph_iter++)
+                                                                    for (const auto& gal_eph_iter : d_pvt_solver->galileo_ephemeris_map)
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MT1045(gal_eph_iter->second);
+                                                                            d_rtcm_printer->Print_Rtcm_MT1045(gal_eph_iter.second);
                                                                         }
                                                                 }
                                                             if (d_rtcm_MSM_rate_ms != 0)
                                                                 {
                                                                     std::map<int, Gnss_Synchro>::const_iterator gnss_observables_iter;
-                                                                    std::map<int, Galileo_Ephemeris>::const_iterator gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin();
-                                                                    std::map<int, Gps_Ephemeris>::const_iterator gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin();
+                                                                    auto gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin();
+                                                                    auto gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin();
                                                                     int gps_channel = 0;
                                                                     int gal_channel = 0;
                                                                     for (gnss_observables_iter = gnss_observables_map.cbegin(); gnss_observables_iter != gnss_observables_map.cend(); gnss_observables_iter++)
@@ -2649,11 +2662,11 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                                         }
                                                                     if (gps_eph_iter != d_pvt_solver->gps_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, gps_eph_iter->second, {}, {}, {}, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, gps_eph_iter->second, {}, {}, {}, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                     if (gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, gal_eph_iter->second, {}, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, gal_eph_iter->second, {}, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                 }
                                                             b_rtcm_writing_started = true;
@@ -2662,15 +2675,15 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                         case 13:  // L5+E5a
                                                             if (d_rtcm_MT1045_rate_ms != 0)
                                                                 {
-                                                                    for (std::map<int, Galileo_Ephemeris>::const_iterator gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin(); gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend(); gal_eph_iter++)
+                                                                    for (const auto& gal_eph_iter : d_pvt_solver->galileo_ephemeris_map)
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MT1045(gal_eph_iter->second);
+                                                                            d_rtcm_printer->Print_Rtcm_MT1045(gal_eph_iter.second);
                                                                         }
                                                                 }
                                                             if (d_rtcm_MSM_rate_ms != 0)
                                                                 {
                                                                     std::map<int, Gnss_Synchro>::const_iterator gnss_observables_iter;
-                                                                    std::map<int, Galileo_Ephemeris>::const_iterator gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin();
+                                                                    auto gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin();
                                                                     int gal_channel = 0;
                                                                     for (gnss_observables_iter = gnss_observables_map.cbegin(); gnss_observables_iter != gnss_observables_map.cend(); gnss_observables_iter++)
                                                                         {
@@ -2690,7 +2703,7 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
 
                                                                     if (gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend() and (d_rtcm_MT1097_rate_ms != 0))
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, gal_eph_iter->second, {}, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, gal_eph_iter->second, {}, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                 }
                                                             b_rtcm_writing_started = true;
@@ -2699,17 +2712,17 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                         case 15:
                                                             if (d_rtcm_MT1045_rate_ms != 0)  // allows deactivating messages by setting rate = 0
                                                                 {
-                                                                    for (std::map<int, Galileo_Ephemeris>::const_iterator gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin(); gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend(); gal_eph_iter++)
+                                                                    for (const auto& gal_eph_iter : d_pvt_solver->galileo_ephemeris_map)
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MT1045(gal_eph_iter->second);
+                                                                            d_rtcm_printer->Print_Rtcm_MT1045(gal_eph_iter.second);
                                                                         }
                                                                 }
                                                             if (d_rtcm_MSM_rate_ms != 0)
                                                                 {
-                                                                    std::map<int, Galileo_Ephemeris>::const_iterator gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin();
+                                                                    auto gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin();
                                                                     if (gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, gal_eph_iter->second, {}, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, gal_eph_iter->second, {}, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                 }
                                                             b_rtcm_writing_started = true;
@@ -2719,17 +2732,17 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                         case 25:
                                                             if (d_rtcm_MT1020_rate_ms != 0)  // allows deactivating messages by setting rate = 0
                                                                 {
-                                                                    for (std::map<int, Glonass_Gnav_Ephemeris>::const_iterator glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin(); glonass_gnav_eph_iter != d_pvt_solver->glonass_gnav_ephemeris_map.cend(); glonass_gnav_eph_iter++)
+                                                                    for (auto glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin(); glonass_gnav_eph_iter != d_pvt_solver->glonass_gnav_ephemeris_map.cend(); glonass_gnav_eph_iter++)
                                                                         {
                                                                             d_rtcm_printer->Print_Rtcm_MT1020(glonass_gnav_eph_iter->second, d_pvt_solver->glonass_gnav_utc_model);
                                                                         }
                                                                 }
                                                             if (d_rtcm_MSM_rate_ms != 0)
                                                                 {
-                                                                    std::map<int, Glonass_Gnav_Ephemeris>::const_iterator glo_gnav_ephemeris_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin();
+                                                                    auto glo_gnav_ephemeris_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin();
                                                                     if (glo_gnav_ephemeris_iter != d_pvt_solver->glonass_gnav_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, {}, glo_gnav_ephemeris_iter->second, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, {}, glo_gnav_ephemeris_iter->second, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                 }
                                                             b_rtcm_writing_started = true;
@@ -2737,14 +2750,14 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                         case 26:                             // GPS L1 C/A + GLONASS L1 C/A
                                                             if (d_rtcm_MT1019_rate_ms != 0)  // allows deactivating messages by setting rate = 0
                                                                 {
-                                                                    for (std::map<int, Gps_Ephemeris>::const_iterator gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin(); gps_eph_iter != d_pvt_solver->gps_ephemeris_map.cend(); gps_eph_iter++)
+                                                                    for (const auto& gps_eph_iter : d_pvt_solver->gps_ephemeris_map)
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MT1019(gps_eph_iter->second);
+                                                                            d_rtcm_printer->Print_Rtcm_MT1019(gps_eph_iter.second);
                                                                         }
                                                                 }
                                                             if (d_rtcm_MT1020_rate_ms != 0)  // allows deactivating messages by setting rate = 0
                                                                 {
-                                                                    for (std::map<int, Glonass_Gnav_Ephemeris>::const_iterator glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin(); glonass_gnav_eph_iter != d_pvt_solver->glonass_gnav_ephemeris_map.cend(); glonass_gnav_eph_iter++)
+                                                                    for (auto glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin(); glonass_gnav_eph_iter != d_pvt_solver->glonass_gnav_ephemeris_map.cend(); glonass_gnav_eph_iter++)
                                                                         {
                                                                             d_rtcm_printer->Print_Rtcm_MT1020(glonass_gnav_eph_iter->second, d_pvt_solver->glonass_gnav_utc_model);
                                                                         }
@@ -2752,8 +2765,8 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                             if (d_rtcm_MSM_rate_ms != 0)
                                                                 {
                                                                     std::map<int, Gnss_Synchro>::const_iterator gnss_observables_iter;
-                                                                    std::map<int, Gps_Ephemeris>::const_iterator gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin();
-                                                                    std::map<int, Glonass_Gnav_Ephemeris>::const_iterator glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin();
+                                                                    auto gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin();
+                                                                    auto glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin();
                                                                     int gps_channel = 0;
                                                                     int glo_channel = 0;
                                                                     for (gnss_observables_iter = gnss_observables_map.cbegin(); gnss_observables_iter != gnss_observables_map.cend(); gnss_observables_iter++)
@@ -2785,11 +2798,11 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                                         }
                                                                     if (glonass_gnav_eph_iter != d_pvt_solver->glonass_gnav_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, {}, glonass_gnav_eph_iter->second, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, {}, glonass_gnav_eph_iter->second, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                     if (gps_eph_iter != d_pvt_solver->gps_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, gps_eph_iter->second, {}, {}, {}, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, gps_eph_iter->second, {}, {}, {}, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                 }
                                                             b_rtcm_writing_started = true;
@@ -2797,16 +2810,16 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                         case 27:                             // GLONASS L1 C/A + Galileo E1B
                                                             if (d_rtcm_MT1020_rate_ms != 0)  // allows deactivating messages by setting rate = 0
                                                                 {
-                                                                    for (std::map<int, Glonass_Gnav_Ephemeris>::const_iterator glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin(); glonass_gnav_eph_iter != d_pvt_solver->glonass_gnav_ephemeris_map.cend(); glonass_gnav_eph_iter++)
+                                                                    for (auto glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin(); glonass_gnav_eph_iter != d_pvt_solver->glonass_gnav_ephemeris_map.cend(); glonass_gnav_eph_iter++)
                                                                         {
                                                                             d_rtcm_printer->Print_Rtcm_MT1020(glonass_gnav_eph_iter->second, d_pvt_solver->glonass_gnav_utc_model);
                                                                         }
                                                                 }
                                                             if (d_rtcm_MT1045_rate_ms != 0)  // allows deactivating messages by setting rate = 0
                                                                 {
-                                                                    for (std::map<int, Galileo_Ephemeris>::const_iterator gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin(); gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend(); gal_eph_iter++)
+                                                                    for (const auto& gal_eph_iter : d_pvt_solver->galileo_ephemeris_map)
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MT1045(gal_eph_iter->second);
+                                                                            d_rtcm_printer->Print_Rtcm_MT1045(gal_eph_iter.second);
                                                                         }
                                                                 }
                                                             if (d_rtcm_MSM_rate_ms != 0)
@@ -2814,8 +2827,8 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                                     int gal_channel = 0;
                                                                     int glo_channel = 0;
                                                                     std::map<int, Gnss_Synchro>::const_iterator gnss_observables_iter;
-                                                                    std::map<int, Galileo_Ephemeris>::const_iterator gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin();
-                                                                    std::map<int, Glonass_Gnav_Ephemeris>::const_iterator glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin();
+                                                                    auto gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin();
+                                                                    auto glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin();
                                                                     for (gnss_observables_iter = gnss_observables_map.cbegin(); gnss_observables_iter != gnss_observables_map.cend(); gnss_observables_iter++)
                                                                         {
                                                                             std::string system(&gnss_observables_iter->second.System, 1);
@@ -2845,11 +2858,11 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                                         }
                                                                     if (gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, gal_eph_iter->second, {}, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, gal_eph_iter->second, {}, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                     if (glonass_gnav_eph_iter != d_pvt_solver->glonass_gnav_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, {}, glonass_gnav_eph_iter->second, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, {}, glonass_gnav_eph_iter->second, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                 }
                                                             b_rtcm_writing_started = true;
@@ -2857,22 +2870,22 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                         case 29:                             // GPS L1 C/A + GLONASS L2 C/A
                                                             if (d_rtcm_MT1019_rate_ms != 0)  // allows deactivating messages by setting rate = 0
                                                                 {
-                                                                    for (std::map<int, Gps_Ephemeris>::const_iterator gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin(); gps_eph_iter != d_pvt_solver->gps_ephemeris_map.cend(); gps_eph_iter++)
+                                                                    for (const auto& gps_eph_iter : d_pvt_solver->gps_ephemeris_map)
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MT1019(gps_eph_iter->second);
+                                                                            d_rtcm_printer->Print_Rtcm_MT1019(gps_eph_iter.second);
                                                                         }
                                                                 }
                                                             if (d_rtcm_MT1020_rate_ms != 0)  // allows deactivating messages by setting rate = 0
                                                                 {
-                                                                    for (std::map<int, Glonass_Gnav_Ephemeris>::const_iterator glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin(); glonass_gnav_eph_iter != d_pvt_solver->glonass_gnav_ephemeris_map.cend(); glonass_gnav_eph_iter++)
+                                                                    for (auto glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin(); glonass_gnav_eph_iter != d_pvt_solver->glonass_gnav_ephemeris_map.cend(); glonass_gnav_eph_iter++)
                                                                         {
                                                                             d_rtcm_printer->Print_Rtcm_MT1020(glonass_gnav_eph_iter->second, d_pvt_solver->glonass_gnav_utc_model);
                                                                         }
                                                                 }
                                                             if (d_rtcm_MSM_rate_ms != 0)
                                                                 {
-                                                                    std::map<int, Gps_Ephemeris>::const_iterator gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin();
-                                                                    std::map<int, Glonass_Gnav_Ephemeris>::const_iterator glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin();
+                                                                    auto gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin();
+                                                                    auto glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin();
                                                                     std::map<int, Gnss_Synchro>::const_iterator gnss_observables_iter;
                                                                     int gps_channel = 0;
                                                                     int glo_channel = 0;
@@ -2905,12 +2918,12 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                                         }
                                                                     if (glonass_gnav_eph_iter != d_pvt_solver->glonass_gnav_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, {}, glonass_gnav_eph_iter->second, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, {}, glonass_gnav_eph_iter->second, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
 
                                                                     if (gps_eph_iter != d_pvt_solver->gps_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, gps_eph_iter->second, {}, {}, {}, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, gps_eph_iter->second, {}, {}, {}, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                 }
                                                             b_rtcm_writing_started = true;
@@ -2918,16 +2931,16 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                         case 30:                             // GLONASS L2 C/A + Galileo E1B
                                                             if (d_rtcm_MT1020_rate_ms != 0)  // allows deactivating messages by setting rate = 0
                                                                 {
-                                                                    for (std::map<int, Glonass_Gnav_Ephemeris>::const_iterator glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin(); glonass_gnav_eph_iter != d_pvt_solver->glonass_gnav_ephemeris_map.cend(); glonass_gnav_eph_iter++)
+                                                                    for (auto glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin(); glonass_gnav_eph_iter != d_pvt_solver->glonass_gnav_ephemeris_map.cend(); glonass_gnav_eph_iter++)
                                                                         {
                                                                             d_rtcm_printer->Print_Rtcm_MT1020(glonass_gnav_eph_iter->second, d_pvt_solver->glonass_gnav_utc_model);
                                                                         }
                                                                 }
                                                             if (d_rtcm_MT1045_rate_ms != 0)  // allows deactivating messages by setting rate = 0
                                                                 {
-                                                                    for (std::map<int, Galileo_Ephemeris>::const_iterator gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin(); gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend(); gal_eph_iter++)
+                                                                    for (const auto& gal_eph_iter : d_pvt_solver->galileo_ephemeris_map)
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MT1045(gal_eph_iter->second);
+                                                                            d_rtcm_printer->Print_Rtcm_MT1045(gal_eph_iter.second);
                                                                         }
                                                                 }
                                                             if (d_rtcm_MSM_rate_ms != 0)
@@ -2935,8 +2948,8 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                                     int gal_channel = 0;
                                                                     int glo_channel = 0;
                                                                     std::map<int, Gnss_Synchro>::const_iterator gnss_observables_iter;
-                                                                    std::map<int, Galileo_Ephemeris>::const_iterator gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin();
-                                                                    std::map<int, Glonass_Gnav_Ephemeris>::const_iterator glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin();
+                                                                    auto gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin();
+                                                                    auto glonass_gnav_eph_iter = d_pvt_solver->glonass_gnav_ephemeris_map.cbegin();
                                                                     for (gnss_observables_iter = gnss_observables_map.cbegin(); gnss_observables_iter != gnss_observables_map.cend(); gnss_observables_iter++)
                                                                         {
                                                                             std::string system(&gnss_observables_iter->second.System, 1);
@@ -2966,11 +2979,11 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                                         }
                                                                     if (gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, gal_eph_iter->second, {}, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, gal_eph_iter->second, {}, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                     if (glonass_gnav_eph_iter != d_pvt_solver->glonass_gnav_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, {}, glonass_gnav_eph_iter->second, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, {}, glonass_gnav_eph_iter->second, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                 }
                                                             b_rtcm_writing_started = true;
@@ -2978,23 +2991,23 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                         case 32:                             // L1+E1+L5+E5a
                                                             if (d_rtcm_MT1019_rate_ms != 0)  // allows deactivating messages by setting rate = 0
                                                                 {
-                                                                    for (std::map<int, Gps_Ephemeris>::const_iterator gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin(); gps_eph_iter != d_pvt_solver->gps_ephemeris_map.cend(); gps_eph_iter++)
+                                                                    for (const auto& gps_eph_iter : d_pvt_solver->gps_ephemeris_map)
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MT1019(gps_eph_iter->second);
+                                                                            d_rtcm_printer->Print_Rtcm_MT1019(gps_eph_iter.second);
                                                                         }
                                                                 }
                                                             if (d_rtcm_MT1045_rate_ms != 0)  // allows deactivating messages by setting rate = 0
                                                                 {
-                                                                    for (std::map<int, Galileo_Ephemeris>::const_iterator gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin(); gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend(); gal_eph_iter++)
+                                                                    for (const auto& gal_eph_iter : d_pvt_solver->galileo_ephemeris_map)
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MT1045(gal_eph_iter->second);
+                                                                            d_rtcm_printer->Print_Rtcm_MT1045(gal_eph_iter.second);
                                                                         }
                                                                 }
                                                             if (d_rtcm_MSM_rate_ms != 0)
                                                                 {
                                                                     std::map<int, Gnss_Synchro>::const_iterator gnss_observables_iter;
-                                                                    std::map<int, Galileo_Ephemeris>::const_iterator gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin();
-                                                                    std::map<int, Gps_Ephemeris>::const_iterator gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin();
+                                                                    auto gal_eph_iter = d_pvt_solver->galileo_ephemeris_map.cbegin();
+                                                                    auto gps_eph_iter = d_pvt_solver->gps_ephemeris_map.cbegin();
                                                                     int gps_channel = 0;
                                                                     int gal_channel = 0;
                                                                     for (gnss_observables_iter = gnss_observables_map.cbegin(); gnss_observables_iter != gnss_observables_map.cend(); gnss_observables_iter++)
@@ -3026,11 +3039,11 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                                         }
                                                                     if (gps_eph_iter != d_pvt_solver->gps_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, gps_eph_iter->second, {}, {}, {}, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, gps_eph_iter->second, {}, {}, {}, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                     if (gal_eph_iter != d_pvt_solver->galileo_ephemeris_map.cend())
                                                                         {
-                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, gal_eph_iter->second, {}, d_rx_time, gnss_observables_map, 0, 0, 0, 0, 0);
+                                                                            d_rtcm_printer->Print_Rtcm_MSM(7, {}, {}, gal_eph_iter->second, {}, d_rx_time, gnss_observables_map, 0, 0, 0, false, false);
                                                                         }
                                                                 }
                                                             b_rtcm_writing_started = true;
@@ -3086,8 +3099,29 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                          << d_pvt_solver->get_vdop()
                                          << " GDOP = " << d_pvt_solver->get_gdop() << std::endl; */
                         }
+
+                    // PVT MONITOR
+                    if (d_pvt_solver->is_valid_position() and flag_monitor_pvt_enabled)
+                        {
+                            Monitor_Pvt monitor_pvt = d_pvt_solver->get_monitor_pvt();
+                            udp_sink_ptr->write_monitor_pvt(monitor_pvt);
+                        }
                 }
         }
 
     return noutput_items;
 }
+
+std::vector<std::string> rtklib_pvt_cc::split_string(const std::string& s, char delim)
+{
+    std::vector<std::string> v;
+    std::stringstream ss(s);
+    std::string item;
+
+    while (std::getline(ss, item, delim))
+        {
+            *(std::back_inserter(v)++) = item;
+        }
+
+    return v;
+}

src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h

@@ -35,6 +35,7 @@
 #include "gps_ephemeris.h"
 #include "gpx_printer.h"
 #include "kml_printer.h"
+#include "monitor_pvt_udp_sink.h"
 #include "nmea_printer.h"
 #include "pvt_conf.h"
 #include "rinex_printer.h"
@@ -71,7 +72,7 @@ private:
         const Pvt_Conf& conf_,
         const rtk_t& rtk);
 
-    void msg_handler_telemetry(pmt::pmt_t msg);
+    void msg_handler_telemetry(const pmt::pmt_t& msg);
 
     bool d_dump;
     bool d_dump_mat;
@@ -143,6 +144,9 @@ private:
         return (pt - boost::posix_time::ptime(boost::gregorian::date(1970, 1, 1))).total_seconds();
     }
 
+    bool flag_monitor_pvt_enabled;
+    std::unique_ptr<Monitor_Pvt_Udp_Sink> udp_sink_ptr;
+    std::vector<std::string> split_string(const std::string& s, char delim);
 
 public:
     rtklib_pvt_cc(uint32_t nchannels,

src/algorithms/PVT/libs/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.
 #
@@ -16,7 +16,6 @@
 # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
 #
 
-add_definitions(-DGNSS_SDR_VERSION="${VERSION}")
 
 set(PVT_LIB_SOURCES
     pvt_solution.cc
@@ -30,6 +29,7 @@ set(PVT_LIB_SOURCES
     geojson_printer.cc
     rtklib_solver.cc
     pvt_conf.cc
+    monitor_pvt_udp_sink.cc
 )
 
 set(PVT_LIB_HEADERS
@@ -44,50 +44,44 @@ set(PVT_LIB_HEADERS
     geojson_printer.h
     rtklib_solver.h
     pvt_conf.h
-)
-
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/adapters
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib
-    ${Boost_INCLUDE_DIRS}
-    ${ARMADILLO_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${GLOG_INCLUDE_DIRS}
-    ${MATIO_INCLUDE_DIRS}
+    monitor_pvt_udp_sink.h
+    monitor_pvt.h
 )
 
 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})
 
-if(MATIO_FOUND)
-    add_dependencies(pvt_lib
-        glog-${glog_RELEASE}
-        armadillo-${armadillo_RELEASE}
-    )
-else()
-    add_dependencies(pvt_lib
-        glog-${glog_RELEASE}
-        armadillo-${armadillo_RELEASE}
-        matio-${GNSSSDR_MATIO_LOCAL_VERSION}
-    )
-endif()
+add_library(pvt_lib ${PVT_LIB_SOURCES} ${PVT_LIB_HEADERS})
 
 target_link_libraries(pvt_lib
-    rtklib_lib
-    gnss_sdr_flags
-    gnss_sp_libs
-    ${Boost_LIBRARIES}
-    ${GLOG_LIBRARIES}
-    ${ARMADILLO_LIBRARIES}
-    ${BLAS}
-    ${LAPACK}
-    ${MATIO_LIBRARIES}
+    PUBLIC
+        Armadillo::armadillo
+        Boost::date_time
+        gnss_system_parameters
+        gnss_sp_libs
+        rtklib_lib
+        gnss_rx
+    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_compile_definitions(pvt_lib PUBLIC -DGNSS_SDR_VERSION="${VERSION}")
+
+set_property(TARGET pvt_lib APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/algorithms/libs>
+    $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib>
+    $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/core/system_parameters>
 )

src/algorithms/PVT/libs/monitor_pvt.h

@@ -0,0 +1,140 @@
+/*!
+ * \file monitor_pvt.h
+ * \brief  Interface of the Monitor_Pvt class
+ * \author
+ *  Álvaro Cebrián Juan, 2019. acebrianjuan(at)gmail.com
+ * -------------------------------------------------------------------------
+ *
+ * Copyright (C) 2010-2018  (see AUTHORS file for a list of contributors)
+ *
+ * GNSS-SDR is a software defined Global Navigation
+ *          Satellite Systems receiver
+ *
+ * This file is part of GNSS-SDR.
+ *
+ * GNSS-SDR is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GNSS-SDR is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * -------------------------------------------------------------------------
+ */
+
+#ifndef MONITOR_PVT_H_
+#define MONITOR_PVT_H_
+
+#include <boost/serialization/nvp.hpp>
+#include <cstdint>
+
+/*!
+ * \brief This class contains parameters and outputs of the PVT block
+ */
+class Monitor_Pvt
+{
+public:
+    // TOW
+    uint32_t TOW_at_current_symbol_ms;
+    // WEEK
+    uint32_t week;
+    // PVT GPS time
+    double RX_time;
+    // User clock offset [s]
+    double user_clk_offset;
+
+    // ECEF POS X,Y,X [m] + ECEF VEL X,Y,X [m/s] (6 x double)
+    double pos_x;
+    double pos_y;
+    double pos_z;
+    double vel_x;
+    double vel_y;
+    double vel_z;
+
+    // position variance/covariance (m^2) {c_xx,c_yy,c_zz,c_xy,c_yz,c_zx} (6 x double)
+    double cov_xx;
+    double cov_yy;
+    double cov_zz;
+    double cov_xy;
+    double cov_yz;
+    double cov_zx;
+
+    // GEO user position Latitude [deg]
+    double latitude;
+    // GEO user position Longitude [deg]
+    double longitude;
+    // GEO user position Height [m]
+    double height;
+
+    // NUMBER OF VALID SATS
+    uint8_t valid_sats;
+    // RTKLIB solution status
+    uint8_t solution_status;
+    // RTKLIB solution type (0:xyz-ecef,1:enu-baseline)
+    uint8_t solution_type;
+    // AR ratio factor for validation
+    float AR_ratio_factor;
+    // AR ratio threshold for validation
+    float AR_ratio_threshold;
+
+    // GDOP / PDOP/ HDOP/ VDOP
+    double gdop;
+    double pdop;
+    double hdop;
+    double vdop;
+
+    /*!
+     * \brief This member function serializes and restores
+     * Monitor_Pvt objects from a byte stream.
+     */
+    template <class Archive>
+
+    void serialize(Archive& ar, const unsigned int version)
+    {
+        if (version)
+            {
+            };
+
+        ar& BOOST_SERIALIZATION_NVP(TOW_at_current_symbol_ms);
+        ar& BOOST_SERIALIZATION_NVP(week);
+        ar& BOOST_SERIALIZATION_NVP(RX_time);
+        ar& BOOST_SERIALIZATION_NVP(user_clk_offset);
+
+        ar& BOOST_SERIALIZATION_NVP(pos_x);
+        ar& BOOST_SERIALIZATION_NVP(pos_y);
+        ar& BOOST_SERIALIZATION_NVP(pos_z);
+        ar& BOOST_SERIALIZATION_NVP(vel_x);
+        ar& BOOST_SERIALIZATION_NVP(vel_y);
+        ar& BOOST_SERIALIZATION_NVP(vel_z);
+
+        ar& BOOST_SERIALIZATION_NVP(cov_xx);
+        ar& BOOST_SERIALIZATION_NVP(cov_yy);
+        ar& BOOST_SERIALIZATION_NVP(cov_zz);
+        ar& BOOST_SERIALIZATION_NVP(cov_xy);
+        ar& BOOST_SERIALIZATION_NVP(cov_yz);
+        ar& BOOST_SERIALIZATION_NVP(cov_zx);
+
+        ar& BOOST_SERIALIZATION_NVP(latitude);
+        ar& BOOST_SERIALIZATION_NVP(longitude);
+        ar& BOOST_SERIALIZATION_NVP(height);
+
+        ar& BOOST_SERIALIZATION_NVP(valid_sats);
+        ar& BOOST_SERIALIZATION_NVP(solution_status);
+        ar& BOOST_SERIALIZATION_NVP(solution_type);
+        ar& BOOST_SERIALIZATION_NVP(AR_ratio_factor);
+        ar& BOOST_SERIALIZATION_NVP(AR_ratio_threshold);
+
+        ar& BOOST_SERIALIZATION_NVP(gdop);
+        ar& BOOST_SERIALIZATION_NVP(pdop);
+        ar& BOOST_SERIALIZATION_NVP(hdop);
+        ar& BOOST_SERIALIZATION_NVP(vdop);
+    }
+};
+
+#endif /* MONITOR_PVT_H_ */

src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc

@@ -0,0 +1,69 @@
+/*!
+ * \file monitor_pvt_udp_sink.cc
+ * \brief Implementation of a class that sends serialized Monitor_Pvt
+ * objects over udp to one or multiple endpoints
+ * \author Álvaro Cebrián Juan, 2019. acebrianjuan(at)gmail.com
+ *
+ * -------------------------------------------------------------------------
+ *
+ * Copyright (C) 2010-2018  (see AUTHORS file for a list of contributors)
+ *
+ * GNSS-SDR is a software defined Global Navigation
+ *          Satellite Systems receiver
+ *
+ * This file is part of GNSS-SDR.
+ *
+ * GNSS-SDR is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GNSS-SDR is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * -------------------------------------------------------------------------
+ */
+
+#include "monitor_pvt_udp_sink.h"
+#include <boost/archive/binary_oarchive.hpp>
+//#include <boost/serialization/vector.hpp>
+#include <iostream>
+#include <sstream>
+
+Monitor_Pvt_Udp_Sink::Monitor_Pvt_Udp_Sink(std::vector<std::string> addresses, const uint16_t& port) : socket{io_service}
+{
+    for (auto address : addresses)
+        {
+            boost::asio::ip::udp::endpoint endpoint(boost::asio::ip::address::from_string(address, error), port);
+            endpoints.push_back(endpoint);
+        }
+}
+
+bool Monitor_Pvt_Udp_Sink::write_monitor_pvt(Monitor_Pvt monitor_pvt)
+{
+    std::ostringstream archive_stream;
+    boost::archive::binary_oarchive oa{archive_stream};
+    oa << monitor_pvt;
+    std::string outbound_data = archive_stream.str();
+
+    for (auto endpoint : endpoints)
+        {
+            socket.open(endpoint.protocol(), error);
+            socket.connect(endpoint, error);
+
+            try
+                {
+                    socket.send(boost::asio::buffer(outbound_data));
+                }
+            catch (boost::system::system_error const& e)
+                {
+                    return false;
+                }
+        }
+    return true;
+}

src/algorithms/PVT/libs/monitor_pvt_udp_sink.h

@@ -0,0 +1,53 @@
+/*!
+ * \file monitor_pvt_udp_sink.h
+ * \brief Interface of a class that sends serialized Monitor_Pvt objects
+ * over udp to one or multiple endpoints
+ * \author Álvaro Cebrián Juan, 2019. acebrianjuan(at)gmail.com
+ *
+ * -------------------------------------------------------------------------
+ *
+ * Copyright (C) 2010-2018  (see AUTHORS file for a list of contributors)
+ *
+ * GNSS-SDR is a software defined Global Navigation
+ *          Satellite Systems receiver
+ *
+ * This file is part of GNSS-SDR.
+ *
+ * GNSS-SDR is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GNSS-SDR is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * -------------------------------------------------------------------------
+ */
+
+#ifndef MONITOR_PVT_UDP_SINK_H_
+#define MONITOR_PVT_UDP_SINK_H_
+
+#include "monitor_pvt.h"
+#include <boost/asio.hpp>
+
+class Monitor_Pvt_Udp_Sink
+{
+public:
+    Monitor_Pvt_Udp_Sink(std::vector<std::string> addresses, const uint16_t &port);
+    bool write_monitor_pvt(Monitor_Pvt monitor_pvt);
+
+private:
+    boost::asio::io_service io_service;
+    boost::asio::ip::udp::socket socket;
+    boost::system::error_code error;
+    std::vector<boost::asio::ip::udp::endpoint> endpoints;
+    Monitor_Pvt monitor_pvt;
+};
+
+
+#endif /* MONITOR_PVT_UDP_SINK_H_ */

src/algorithms/PVT/libs/nmea_printer.h

@@ -38,6 +38,7 @@
 
 #include "rtklib_solver.h"
 #include <fstream>
+#include <memory>
 #include <string>
 
 

src/algorithms/PVT/libs/pvt_conf.h

@@ -80,6 +80,10 @@ public:
     std::string xml_output_path;
     std::string rtcm_output_file_path;
 
+    bool monitor_enabled;
+    std::string udp_addresses;
+    int udp_port;
+
     Pvt_Conf();
 };
 

src/algorithms/PVT/libs/rinex_printer.cc

@@ -31,7 +31,6 @@
 #include "rinex_printer.h"
 #include <boost/date_time/gregorian/gregorian.hpp>
 #include <boost/date_time/local_time/local_time.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/date_time/time_zone_base.hpp>
 #include <boost/filesystem/operations.hpp>   // for create_directories, exists
 #include <boost/filesystem/path.hpp>         // for path, operator<<

src/algorithms/PVT/libs/rtcm_printer.cc

@@ -143,7 +143,7 @@ Rtcm_Printer::Rtcm_Printer(const std::string& filename, bool flag_rtcm_file_dump
                 }
         }
 
-    rtcm_devname = std::move(rtcm_dump_devname);
+    rtcm_devname = rtcm_dump_devname;
     if (flag_rtcm_tty_port == true)
         {
             rtcm_dev_descriptor = init_serial(rtcm_devname.c_str());

src/algorithms/PVT/libs/rtcm_printer.h

@@ -36,8 +36,8 @@
 
 #include "rtcm.h"
 #include <fstream>  // std::ofstream
-#include <memory>   // std::shared_ptr
-
+#include <map>
+#include <memory>  // std::shared_ptr
 
 /*!
  * \brief This class provides a implementation of a subset of the RTCM Standard 10403.2 messages

src/algorithms/PVT/libs/rtklib_solver.cc

@@ -440,6 +440,10 @@ double rtklib_solver::get_vdop() const
     return dop_[3];
 }
 
+Monitor_Pvt rtklib_solver::get_monitor_pvt() const
+{
+    return monitor_pvt;
+}
 
 bool rtklib_solver::get_PVT(const std::map<int, Gnss_Synchro> &gnss_observables_map, bool flag_averaging)
 {
@@ -907,6 +911,58 @@ bool rtklib_solver::get_PVT(const std::map<int, Gnss_Synchro> &gnss_observables_
                                << " [deg], Height= " << this->get_height() << " [m]"
                                << " RX time offset= " << this->get_time_offset_s() << " [s]";
 
+                    // PVT MONITOR
+
+                    // TOW
+                    monitor_pvt.TOW_at_current_symbol_ms = gnss_observables_map.begin()->second.TOW_at_current_symbol_ms;
+                    // WEEK
+                    monitor_pvt.week = adjgpsweek(nav_data.eph[0].week);
+                    // PVT GPS time
+                    monitor_pvt.RX_time = gnss_observables_map.begin()->second.RX_time;
+                    // User clock offset [s]
+                    monitor_pvt.user_clk_offset = rx_position_and_time(3);
+
+                    // ECEF POS X,Y,X [m] + ECEF VEL X,Y,X [m/s] (6 x double)
+                    monitor_pvt.pos_x = pvt_sol.rr[0];
+                    monitor_pvt.pos_y = pvt_sol.rr[1];
+                    monitor_pvt.pos_z = pvt_sol.rr[2];
+                    monitor_pvt.vel_x = pvt_sol.rr[3];
+                    monitor_pvt.vel_y = pvt_sol.rr[4];
+                    monitor_pvt.vel_z = pvt_sol.rr[5];
+
+                    // position variance/covariance (m^2) {c_xx,c_yy,c_zz,c_xy,c_yz,c_zx} (6 x double)
+                    monitor_pvt.cov_xx = pvt_sol.qr[0];
+                    monitor_pvt.cov_yy = pvt_sol.qr[1];
+                    monitor_pvt.cov_zz = pvt_sol.qr[2];
+                    monitor_pvt.cov_xy = pvt_sol.qr[3];
+                    monitor_pvt.cov_yz = pvt_sol.qr[4];
+                    monitor_pvt.cov_zx = pvt_sol.qr[5];
+
+                    // GEO user position Latitude [deg]
+                    monitor_pvt.latitude = get_latitude();
+                    // GEO user position Longitude [deg]
+                    monitor_pvt.longitude = get_longitude();
+                    // GEO user position Height [m]
+                    monitor_pvt.height = get_height();
+
+                    // NUMBER OF VALID SATS
+                    monitor_pvt.valid_sats = pvt_sol.ns;
+                    // RTKLIB solution status
+                    monitor_pvt.solution_status = pvt_sol.stat;
+                    // RTKLIB solution type (0:xyz-ecef,1:enu-baseline)
+                    monitor_pvt.solution_type = pvt_sol.type;
+                    // AR ratio factor for validation
+                    monitor_pvt.AR_ratio_factor = pvt_sol.ratio;
+                    // AR ratio threshold for validation
+                    monitor_pvt.AR_ratio_threshold = pvt_sol.thres;
+
+                    // GDOP / PDOP/ HDOP/ VDOP
+                    monitor_pvt.gdop = dop_[0];
+                    monitor_pvt.pdop = dop_[1];
+                    monitor_pvt.hdop = dop_[2];
+                    monitor_pvt.vdop = dop_[3];
+
+
                     // ######## LOG FILE #########
                     if (d_flag_dump_enabled == true)
                         {

src/algorithms/PVT/libs/rtklib_solver.h

@@ -62,6 +62,7 @@
 #include "gnss_synchro.h"
 #include "gps_cnav_navigation_message.h"
 #include "gps_navigation_message.h"
+#include "monitor_pvt.h"
 #include "pvt_solution.h"
 #include "rtklib_rtkpos.h"
 #include <array>
@@ -85,6 +86,7 @@ private:
     bool d_flag_dump_mat_enabled;
     int d_nchannels;  // Number of available channels for positioning
     std::array<double, 4> dop_;
+    Monitor_Pvt monitor_pvt;
 
 public:
     sol_t pvt_sol;
@@ -97,6 +99,7 @@ public:
     double get_vdop() const;
     double get_pdop() const;
     double get_gdop() const;
+    Monitor_Pvt get_monitor_pvt() const;
 
     std::map<int, Galileo_Ephemeris> galileo_ephemeris_map;            //!< Map storing new Galileo_Ephemeris
     std::map<int, Gps_Ephemeris> gps_ephemeris_map;                    //!< Map storing new GPS_Ephemeris

src/algorithms/acquisition/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.
 #
@@ -83,33 +83,30 @@ if(OPENCL_FOUND)
     )
 endif()
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/gnuradio_blocks
-    ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/libs
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${Boost_INCLUDE_DIRS}
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${ARMADILLO_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${GNURADIO_BLOCKS_INCLUDE_DIRS}
-    ${VOLK_GNSSSDR_INCLUDE_DIRS}
-)
-
 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
-    acquisition_lib
-    gnss_sp_libs
-    gnss_sdr_flags
-    acq_gr_blocks
-    ${Boost_LIBRARIES}
-    ${GNURADIO_RUNTIME_LIBRARIES}
-    ${GNURADIO_BLOCKS_LIBRARIES}
+    PUBLIC
+        gnss_sp_libs
+        gnss_sdr_flags
+        acq_gr_blocks
+        rx_core_lib
+        Gnuradio::blocks
+        gnss_system_parameters
+    PRIVATE
+        Boost::boost
+        Gflags::gflags
+        Glog::glog
+        Volkgnsssdr::volkgnsssdr
+        acquisition_lib
+)
+
+set_property(TARGET acq_adapters
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )

src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h

@@ -34,7 +34,6 @@
 #ifndef GNSS_SDR_BEIDOU_B1I_PCPS_ACQUISITION_H_
 #define GNSS_SDR_BEIDOU_B1I_PCPS_ACQUISITION_H_
 
-#include "acq_conf.h"
 #include "acquisition_interface.h"
 #include "complex_byte_to_float_x2.h"
 #include "gnss_synchro.h"

src/algorithms/acquisition/gnuradio_blocks/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.
 #
@@ -49,21 +49,6 @@ if(OPENCL_FOUND)
     set(ACQ_GR_BLOCKS_HEADERS ${ACQ_GR_BLOCKS_HEADERS} pcps_opencl_acquisition_cc.h)
 endif()
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/libs
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${Boost_INCLUDE_DIRS}
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${ARMADILLO_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${VOLK_GNSSSDR_INCLUDE_DIRS}
-    ${MATIO_INCLUDE_DIRS}
-)
 
 if(OPENCL_FOUND)
     include_directories(${OPENCL_INCLUDE_DIRS})
@@ -76,35 +61,36 @@ 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})
 
-if(ENABLE_FPGA)
-    target_link_libraries(acq_gr_blocks
+add_library(acq_gr_blocks ${ACQ_GR_BLOCKS_SOURCES} ${ACQ_GR_BLOCKS_HEADERS})
+
+target_link_libraries(acq_gr_blocks
+    PUBLIC
+        Gnuradio::runtime
+        Gnuradio::fft
+        Volk::volk
+        gnss_system_parameters
         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()
-    target_link_libraries(acq_gr_blocks
+    PRIVATE
+        Boost::filesystem
+        Gflags::gflags
+        Glog::glog
+        Matio::matio
+        Volkgnsssdr::volkgnsssdr
         gnss_sp_libs
-        gnss_system_parameters
-        ${GNURADIO_RUNTIME_LIBRARIES}
-        ${GNURADIO_FFT_LIBRARIES}
-        ${VOLK_LIBRARIES}
-        ${VOLK_GNSSSDR_LIBRARIES}
-        ${OPT_LIBRARIES}
-        ${MATIO_LIBRARIES}
-        ${OPT_ACQUISITION_LIBRARIES}
-    )
+        gnss_rx
+)
+
+if(OPENCL_FOUND)
+    target_include_directories(acq_gr_blocks PUBLIC ${OPENCL_INCLUDE_DIRS})
 endif()
 
-if(NOT VOLKGNSSSDR_FOUND)
-    add_dependencies(acq_gr_blocks volk_gnsssdr_module)
-endif()
+target_include_directories(acq_gr_blocks PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
+
+set_property(TARGET acq_gr_blocks
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)

src/algorithms/acquisition/libs/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.
 #
@@ -19,17 +19,6 @@
 if(ENABLE_FPGA)
     set(ACQUISITION_LIB_SOURCES fpga_acquisition.cc)
     set(ACQUISITION_LIB_HEADERS fpga_acquisition.h)
-    include_directories(
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-        ${CMAKE_SOURCE_DIR}/src/core/interfaces
-        ${CMAKE_SOURCE_DIR}/src/core/receiver
-        ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-        ${VOLK_INCLUDE_DIRS}
-        ${GLOG_INCLUDE_DIRS}
-        ${GFlags_INCLUDE_DIRS}
-        ${VOLK_GNSSSDR_INCLUDE_DIRS}
-    )
 endif()
 
 set(ACQUISITION_LIB_HEADERS ${ACQUISITION_LIB_HEADERS} acq_conf.h)
@@ -38,21 +27,26 @@ 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
-    ${VOLK_LIBRARIES}
-    ${VOLK_GNSSSDR_LIBRARIES}
-    ${GNURADIO_RUNTIME_LIBRARIES}
+    PUBLIC
+        Volk::volk
+        Gnuradio::fft
+    PRIVATE
+        Gflags::gflags
+        Glog::glog
+        gnss_system_parameters
+        gnss_rx
+        gnss_sp_libs
 )
 
-if(VOLKGNSSSDR_FOUND)
-    add_dependencies(acquisition_lib glog-${glog_RELEASE})
-else()
-    add_dependencies(acquisition_lib glog-${glog_RELEASE} volk_gnsssdr_module)
-endif()
+set_property(TARGET acquisition_lib
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)

src/algorithms/channel/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.
 #
@@ -19,19 +19,6 @@
 set(CHANNEL_ADAPTER_SOURCES channel.cc)
 set(CHANNEL_ADAPTER_HEADERS channel.h)
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/channel/libs
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${Boost_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-)
-
 add_library(channel_adapters
     ${CHANNEL_ADAPTER_SOURCES}
     ${CHANNEL_ADAPTER_HEADERS}
@@ -40,8 +27,17 @@ add_library(channel_adapters
 source_group(Headers FILES ${CHANNEL_ADAPTER_HEADERS})
 
 target_link_libraries(channel_adapters
-    channel_fsm
-    ${GNURADIO_RUNTIME_LIBRARIES}
-    ${Boost_LIBRARIES}
-    gnss_sdr_flags
+    PUBLIC
+        Gnuradio::runtime
+        channel_fsm
+        gnss_rx
+    PRIVATE
+        Gflags::gflags
+        Glog::glog
+        gnss_sdr_flags
+)
+
+set_property(TARGET channel_adapters
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )

src/algorithms/channel/libs/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.
 #
@@ -26,23 +26,23 @@ set(CHANNEL_FSM_HEADERS
     channel_msg_receiver_cc.h
 )
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/channel/adapters
-    ${Boost_INCLUDE_DIRS}
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-)
-
 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_dependencies(channel_fsm glog-${glog_RELEASE})
 
-target_link_libraries(channel_fsm gnss_rx)
+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
+)
+
+set_property(TARGET channel_fsm
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)

src/algorithms/conditioner/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.
 #
@@ -27,21 +27,23 @@ set(COND_ADAPTER_HEADERS
     array_signal_conditioner.h
 )
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/gnuradio_blocks
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-)
-
 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_dependencies(conditioner_adapters glog-${glog_RELEASE})
+
+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
+)
+
+set_property(TARGET conditioner_adapters
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)

src/algorithms/data_type_adapter/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.
 #
@@ -35,30 +35,35 @@ set(DATATYPE_ADAPTER_HEADERS
     ishort_to_complex.h
 )
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/algorithms/data_type_adapter/gnuradio_blocks
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${VOLK_INCLUDE_DIRS}
-)
-
 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})
-add_dependencies(datatype_adapters glog-${glog_RELEASE})
 target_link_libraries(datatype_adapters
-    data_type_gr_blocks
-    ${GNURADIO_RUNTIME_LIBRARIES}
-    ${GNURADIO_BLOCKS_LIBRARIES}
+    PUBLIC
+        Gnuradio::blocks
+        gnss_system_parameters
+        gnss_rx
+        data_type_gr_blocks
+        gnss_sp_libs
+    PRIVATE
+        Gflags::gflags
+        Glog::glog
+        Volk::volk
+)
+
+target_include_directories(datatype_adapters
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/algorithms/libs
+)
+
+set_property(TARGET datatype_adapters
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )

src/algorithms/data_type_adapter/gnuradio_blocks/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.
 #
@@ -29,23 +29,26 @@ set(DATA_TYPE_GR_BLOCKS_HEADERS
     interleaved_byte_to_complex_short.h
 )
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${VOLK_INCLUDE_DIRS}
-)
-
 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
-    ${GNURADIO_RUNTIME_LIBRARIES}
-    ${VOLK_LIBRARIES}
+    PUBLIC
+        Gnuradio::runtime
+        Boost::boost
+        gnss_sp_libs
+    PRIVATE
+        Volk::volk
+)
+
+set_property(TARGET data_type_gr_blocks
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )

src/algorithms/input_filter/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.
 #
@@ -34,36 +34,36 @@ set(INPUT_FILTER_ADAPTER_HEADERS
     notch_filter_lite.h
 )
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/algorithms/input_filter/gnuradio_blocks
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${VOLK_INCLUDE_DIRS}
-)
-
-if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
-    add_definitions(-DGR_GREATER_38=1)
-endif()
-
 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})
-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
+    PUBLIC
+        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
+)
+
+if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
+    target_compile_definitions(input_filter_adapters PUBLIC -DGR_GREATER_38=1)
+endif()
+
+set_property(TARGET input_filter_adapters
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )

src/algorithms/input_filter/gnuradio_blocks/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.
 #
@@ -31,31 +31,27 @@ set(INPUT_FILTER_GR_BLOCKS_HEADERS
     notch_lite_cc.h
 )
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${GNURADIO_BLOCKS_INCLUDE_DIRS}
-    ${VOLK_GNSSSDR_INCLUDE_DIRS}
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-)
-
 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
-    ${GNURADIO_FILTER_LIBRARIES}
-    ${VOLK_GNSSSDR_LIBRARIES}
-    ${LOG4CPP_LIBRARIES})
+    PUBLIC
+        Gnuradio::blocks
+        Gnuradio::filter
+        Volkgnsssdr::volkgnsssdr
+    PRIVATE
+        Gflags::gflags
+        Glog::glog
+        Log4cpp::log4cpp
+)
 
-if(NOT VOLKGNSSSDR_FOUND)
-    add_dependencies(input_filter_gr_blocks volk_gnsssdr_module glog-${glog_RELEASE})
-else()
-    add_dependencies(input_filter_gr_blocks glog-${glog_RELEASE})
-endif()
+set_property(TARGET input_filter_gr_blocks
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)

src/algorithms/libs/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.
 #
@@ -90,20 +90,6 @@ if(OPENCL_FOUND)
     )
 endif()
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${Boost_INCLUDE_DIRS}
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${ARMADILLO_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${GNURADIO_BLOCKS_INCLUDE_DIRS}
-    ${VOLK_INCLUDE_DIRS}
-    ${VOLK_GNSSSDR_INCLUDE_DIRS}
-)
 
 if(OPENCL_FOUND)
     include_directories(${OPENCL_INCLUDE_DIRS})
@@ -114,38 +100,67 @@ if(OPENCL_FOUND)
     endif()
 endif()
 
-add_definitions(-DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}")
-
 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
-    ${GNURADIO_RUNTIME_LIBRARIES}
-    ${VOLK_LIBRARIES} ${ORC_LIBRARIES}
-    ${VOLK_GNSSSDR_LIBRARIES}  ${ORC_LIBRARIES}
-    ${GFlags_LIBS}
-    ${ARMADILLO_LIBRARIES}
-    ${GNURADIO_BLOCKS_LIBRARIES}
-    ${GNURADIO_FFT_LIBRARIES}
-    ${GNURADIO_FILTER_LIBRARIES}
-    ${OPT_LIBRARIES}
-    gnss_rx
+    PUBLIC
+        Boost::boost
+        Gflags::gflags
+        Armadillo::armadillo
+        Gnuradio::runtime
+        Gnuradio::blocks
+        Volk::volk ${ORC_LIBRARIES}
+        Volkgnsssdr::volkgnsssdr
+        gnss_system_parameters
+        ${OPT_LIBRARIES}
+    PRIVATE
+        Boost::filesystem
+        Gflags::gflags
+        Glog::glog
+        gnss_rx
 )
 
-if(NOT VOLKGNSSSDR_FOUND)
-    add_dependencies(gnss_sp_libs volk_gnsssdr_module
-        armadillo-${armadillo_RELEASE})
-else()
-    add_dependencies(gnss_sp_libs armadillo-${armadillo_RELEASE})
-endif()
+target_compile_definitions(gnss_sp_libs
+    PUBLIC -DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}"
+)
 
 if(${GFLAGS_GREATER_20})
-    add_definitions(-DGFLAGS_GREATER_2_0=1)
+    target_compile_definitions(gnss_sp_libs PUBLIC -DGFLAGS_GREATER_2_0=1)
 endif()
 
-add_library(gnss_sdr_flags gnss_sdr_flags.cc gnss_sdr_flags.h)
+set_property(TARGET gnss_sp_libs
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
+
+
+###############################################################################
+
 source_group(Headers FILES gnss_sdr_flags.h)
-target_link_libraries(gnss_sdr_flags ${GFlags_LIBS})
+
+add_library(gnss_sdr_flags gnss_sdr_flags.cc gnss_sdr_flags.h)
+
+target_link_libraries(gnss_sdr_flags
+    PUBLIC
+        Gflags::gflags
+    PRIVATE
+        Boost::filesystem
+)
+
+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}"
+)
+
+set_property(TARGET gnss_sdr_flags
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)

src/algorithms/libs/rtklib/CMakeLists.txt

@@ -16,7 +16,6 @@
 # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
 #
 
-add_definitions(-DGNSS_SDR_VERSION="${VERSION}")
 
 set(RTKLIB_LIB_SOURCES
     rtklib_rtkcmn.cc
@@ -59,33 +58,32 @@ set(RTKLIB_LIB_HEADERS
     rtklib.h
 )
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${Boost_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${GLOG_INCLUDE_DIRS}
-)
-
 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_dependencies(rtklib_lib glog-${glog_RELEASE})
+
+add_library(rtklib_lib ${RTKLIB_LIB_SOURCES} ${RTKLIB_LIB_HEADERS})
 
 if(OS_IS_MACOSX)
     set(MAC_LIBRARIES "-framework Accelerate")
 endif()
 
-target_link_libraries(
-    rtklib_lib
-    ${Boost_LIBRARIES}
-    ${GFlags_LIBS}
-    ${GLOG_LIBRARIES}
-    ${BLAS}
-    ${LAPACK}
-    ${MAC_LIBRARIES}
+target_link_libraries(rtklib_lib
+    PUBLIC
+        gnss_rx
+        gnss_system_parameters
+    PRIVATE
+        Gflags::gflags
+        Glog::glog
+        ${BLAS}
+        ${LAPACK}
+        ${MAC_LIBRARIES}
+)
+
+target_compile_definitions(rtklib_lib PUBLIC -DGNSS_SDR_VERSION="${VERSION}")
+
+set_property(TARGET rtklib_lib
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )

src/algorithms/libs/rtklib/rtklib_ionex.cc

@@ -59,6 +59,7 @@
 
 #include "rtklib_ionex.h"
 #include "rtklib_rtkcmn.h"
+#include <cstring>
 
 /* get index -----------------------------------------------------------------*/
 int getindex(double value, const double *range)

src/algorithms/libs/rtklib/rtklib_lambda.cc

@@ -52,6 +52,7 @@
 
 #include "rtklib_lambda.h"
 #include "rtklib_rtkcmn.h"
+#include <cstring>
 
 /* LD factorization (Q=L'*diag(D)*L) -----------------------------------------*/
 int LD(int n, const double *Q, double *L, double *D)

src/algorithms/libs/rtklib/rtklib_pntpos.cc

@@ -54,6 +54,7 @@
 #include "rtklib_ephemeris.h"
 #include "rtklib_ionex.h"
 #include "rtklib_sbas.h"
+#include <cstring>
 
 /* pseudorange measurement error variance ------------------------------------*/
 double varerr(const prcopt_t *opt, double el, int sys)

src/algorithms/libs/rtklib/rtklib_ppp.cc

@@ -57,6 +57,7 @@
 #include "rtklib_rtkcmn.h"
 #include "rtklib_sbas.h"
 #include "rtklib_tides.h"
+#include <cstring>
 
 /* wave length of LC (m) -----------------------------------------------------*/
 double lam_LC(int i, int j, int k)

src/algorithms/libs/rtklib/rtklib_preceph.cc

@@ -62,6 +62,7 @@
 
 #include "rtklib_preceph.h"
 #include "rtklib_rtkcmn.h"
+#include <cstring>
 
 /* satellite code to satellite system ----------------------------------------*/
 int code2sys(char code)

src/algorithms/libs/rtklib/rtklib_rtcm3.cc

@@ -54,6 +54,7 @@
 
 #include "rtklib_rtcm3.h"
 #include "rtklib_rtkcmn.h"
+#include <cstring>
 
 
 /* msm signal id table -------------------------------------------------------*/

src/algorithms/libs/rtklib/rtklib_rtkcmn.cc

@@ -52,6 +52,7 @@
 
 #include "rtklib_rtkcmn.h"
 //#include <cstdio>
+#include <glog/logging.h>
 #include <dirent.h>
 #include <iostream>
 #include <sstream>

src/algorithms/libs/rtklib/rtklib_rtkcmn.h

@@ -79,7 +79,7 @@
 #define GNSS_SDR_RTKLIB_RTKCMN_H_
 
 #include "rtklib.h"
-#include <glog/logging.h>
+//#include <glog/logging.h>
 
 /* coordinate rotation matrix ------------------------------------------------*/
 #define Rx(t, X)                                     \

src/algorithms/libs/rtklib/rtklib_rtkpos.cc

@@ -57,6 +57,7 @@
 #include "rtklib_pntpos.h"
 #include "rtklib_ppp.h"
 #include "rtklib_tides.h"
+#include <cstring>
 
 static int resamb_WLNL(rtk_t *rtk __attribute((unused)), const obsd_t *obs __attribute((unused)), const int *sat __attribute((unused)),
     const int *iu __attribute((unused)), const int *ir __attribute((unused)), int ns __attribute__((unused)), const nav_t *nav __attribute((unused)),

src/algorithms/libs/rtklib/rtklib_rtksvr.cc

@@ -7,6 +7,7 @@
 #include "rtklib_sbas.h"
 #include "rtklib_solution.h"
 #include "rtklib_stream.h"
+#include <cstring>
 
 /* write solution header to output stream ------------------------------------*/
 void writesolhead(stream_t *stream, const solopt_t *solopt)

src/algorithms/libs/rtklib/rtklib_sbas.cc

@@ -61,6 +61,7 @@
 
 #include "rtklib_sbas.h"
 #include "rtklib_rtkcmn.h"
+#include <cstring>
 
 /* extract field from line ---------------------------------------------------*/
 char *getfield(char *p, int pos)

src/algorithms/libs/rtklib/rtklib_solution.cc

@@ -55,6 +55,7 @@
 #include "rtklib_rtkcmn.h"
 #include "rtklib_rtksvr.h"
 #include <cctype>
+#include <cstring>
 
 
 /* constants and macros ------------------------------------------------------*/

src/algorithms/libs/rtklib/rtklib_stream.cc

@@ -50,15 +50,16 @@
  *
  *----------------------------------------------------------------------------*/
 
+#include "rtklib_stream.h"
+#include "rtklib_rtkcmn.h"
+#include "rtklib_solution.h"
 #include <arpa/inet.h>
 #include <cctype>
 #include <cerrno>
+#include <cstring>
 #include <fcntl.h>
 #include <netdb.h>
 #include <netinet/tcp.h>
-#include <rtklib_rtkcmn.h>
-#include <rtklib_solution.h>
-#include <rtklib_stream.h>
 #include <string>
 #include <sys/socket.h>
 #include <sys/stat.h>

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt

@@ -20,7 +20,7 @@
 ########################################################################
 # Project setup
 ########################################################################
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "Choose build type: None Debug Release RelWithDebInfo MinSizeRel")
 project(volk_gnsssdr)
 enable_language(CXX)
@@ -135,7 +135,7 @@ message(STATUS "Build type set to ${CMAKE_BUILD_TYPE}.")
 
 set(VERSION_INFO_MAJOR_VERSION 0)
 set(VERSION_INFO_MINOR_VERSION 0)
-set(VERSION_INFO_MAINT_VERSION 10)
+set(VERSION_INFO_MAINT_VERSION 10.git)
 include(VolkVersion) #setup version info
 
 
@@ -369,6 +369,10 @@ install(
     COMPONENT "volk_gnsssdr_devel"
 )
 
+install(EXPORT VOLK_GNSSSDR-export FILE VolkGnsssdrTargets.cmake
+    NAMESPACE VolkGnsssdr:: DESTINATION ${CMAKE_MODULES_DIR}/volk_gnsssdr
+)
+
 ########################################################################
 # Option to enable QA testing, on by default
 ########################################################################

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkGnsssdrConfig.cmake.in

@@ -15,33 +15,8 @@
 # You should have received a copy of the GNU General Public License
 # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
 
-include(FindPkgConfig)
-pkg_check_modules(PC_VOLK_GNSSSDR volk_gnsssdr)
+get_filename_component(VOLK_GNSSSDR_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
 
-find_path(
-    VOLK_GNSSSDR_INCLUDE_DIRS
-    NAMES volk_gnsssdr/volk_gnsssdr.h
-    HINTS $ENV{VOLK_DIR}/include
-        ${PC_VOLK_INCLUDEDIR}
-    PATHS /usr/local/include
-        /usr/include
-        /opt/local/include
-        "@CMAKE_INSTALL_PREFIX@/include"
-)
-
-find_library(
-    VOLK_GNSSSDR_LIBRARIES
-    NAMES volk_gnsssdr
-    HINTS $ENV{VOLK_DIR}/lib
-        ${PC_VOLK_LIBDIR}
-    PATHS /usr/local/lib
-        /usr/local/lib64
-        /usr/lib
-        /usr/lib64
-        /opt/local/lib
-        "@CMAKE_INSTALL_PREFIX@/lib"
-)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(VOLKGNSSSDR DEFAULT_MSG VOLK_GNSSSDR_LIBRARIES VOLK_GNSSSDR_INCLUDE_DIRS)
-mark_as_advanced(VOLK_GNSSSDR_LIBRARIES VOLK_GNSSSDR_INCLUDE_DIRS)
+if(NOT TARGET VolkGnsssdr::volkgnsssdr)
+  include("${VOLK_GNSSSDR_CMAKE_DIR}/VolkGnsssdrTargets.cmake")
+endif()

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/archs.xml

@@ -6,14 +6,17 @@
 
 <arch name="softfp">
   <flag compiler="gnu">-mfloat-abi=softfp</flag>
+  <flag compiler="clang">-mfloat-abi=softfp</flag>
 </arch>
 
 <arch name="hardfp">
   <flag compiler="gnu">-mfloat-abi=hard</flag>
+  <flag compiler="clang">-mfloat-abi=hard</flag>
 </arch>
 
 <arch name="neon">
   <flag compiler="gnu">-funsafe-math-optimizations</flag>
+  <flag compiler="clang">-funsafe-math-optimizations</flag>
   <alignment>16</alignment>
   <check name="has_neon"></check>
 </arch>
@@ -21,18 +24,22 @@
 <arch name="neonv7">
   <flag compiler="gnu">-mfpu=neon</flag>
   <flag compiler="gnu">-funsafe-math-optimizations</flag>
+  <flag compiler="clang">-mfpu=neon</flag>
+  <flag compiler="clang">-funsafe-math-optimizations</flag>
   <alignment>16</alignment>
   <check name="has_neonv7"></check>
 </arch>
 
 <arch name="neonv8">
   <flag compiler="gnu">-funsafe-math-optimizations</flag>
+  <flag compiler="clang">-funsafe-math-optimizations</flag>
   <alignment>16</alignment>
   <check name="has_neonv8"></check>
 </arch>
 
 <arch name="32">
   <flag compiler="gnu">-m32</flag>
+  <flag compiler="clang">-m32</flag>
 </arch>
 
 <arch name="64">

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/gen/volk_gnsssdr_kernel_defs.py

@@ -53,7 +53,7 @@ def split_into_nested_ifdef_sections(code):
     header = 'text'
     in_section_depth = 0
     for i, line in enumerate(code.splitlines()):
-        m = re.match('^(\s*)#(\s*)(\w+)(.*)$', line)
+        m = re.match(r'^(\s*)#(\s*)(\w+)(.*)$', line)
         line_is = 'normal'
         if m:
             p0, p1, fcn, stuff = m.groups()
@@ -121,11 +121,11 @@ def flatten_section_text(sections):
 class impl_class(object):
     def __init__(self, kern_name, header, body):
         #extract LV_HAVE_*
-        self.deps = set(res.lower() for res in re.findall('LV_HAVE_(\w+)', header))
+        self.deps = set(res.lower() for res in re.findall(r'LV_HAVE_(\w+)', header))
         #extract function suffix and args
         body = flatten_section_text(body)
         try:
-            fcn_matcher = re.compile('^.*(%s\\w*)\\s*\\((.*)$'%kern_name, re.DOTALL | re.MULTILINE)
+            fcn_matcher = re.compile(r'^.*(%s\w*)\s*\((.*)$'%kern_name, re.DOTALL | re.MULTILINE)
             body = body.split('{')[0].rsplit(')', 1)[0] #get the part before the open ){ bracket
             m = fcn_matcher.match(body)
             impl_name, the_rest = m.groups()
@@ -133,7 +133,7 @@ class impl_class(object):
             self.args = list()
             fcn_args = the_rest.split(',')
             for fcn_arg in fcn_args:
-                arg_matcher = re.compile('^\s*(.*\\W)\s*(\w+)\s*$', re.DOTALL | re.MULTILINE)
+                arg_matcher = re.compile(r'^\s*(.*\W)\s*(\w+)\s*$', re.DOTALL | re.MULTILINE)
                 m = arg_matcher.match(fcn_arg)
                 arg_type, arg_name = m.groups()
                 self.args.append((arg_type, arg_name))
@@ -153,7 +153,7 @@ def extract_lv_haves(code):
     haves = list()
     for line in code.splitlines():
         if not line.strip().startswith('#'): continue
-        have_set = set(res.lower() for res in  re.findall('LV_HAVE_(\w+)', line))
+        have_set = set(res.lower() for res in  re.findall(r'LV_HAVE_(\w+)', line))
         if have_set: haves.append(have_set)
     return haves
 

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt

@@ -254,6 +254,8 @@ if(NOT CPU_IS_x86)
     overrule_arch(sse4_1 "Architecture is not x86 or x86_64")
     overrule_arch(sse4_2 "Architecture is not x86 or x86_64")
     overrule_arch(avx "Architecture is not x86 or x86_64")
+    overrule_arch(avx512f "Architecture is not x86 or x86_64")
+    overrule_arch(avx512cd "Architecture is not x86 or x86_64")
 endif()
 
 ########################################################################
@@ -477,7 +479,7 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.9")
       endforeach()
     endif()
     enable_language(ASM)
-    set(CMAKE_ASM_FLAGS ${ARCH_ASM_FLAGS})
+    set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} ${ARCH_ASM_FLAGS}")
     message(STATUS "c flags: ${FULL_C_FLAGS}")
     message(STATUS "asm flags: ${CMAKE_ASM_FLAGS}")
   endforeach()
@@ -567,71 +569,67 @@ if(MSVC)
     set_source_files_properties(${volk_gnsssdr_sources} PROPERTIES LANGUAGE CXX)
 endif()
 
-#Use object library for faster overall build in newer versions of cmake
-if(CMAKE_VERSION VERSION_GREATER "2.8.7")
-    #Create a volk_gnsssdr object library (requires cmake >= 2.8.8)
-    add_library(volk_gnsssdr_obj OBJECT ${volk_gnsssdr_sources})
+#Create a volk_gnsssdr object library
+add_library(volk_gnsssdr_obj OBJECT ${volk_gnsssdr_sources})
+target_include_directories(volk_gnsssdr_obj
+    PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
+    PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+    PUBLIC $<INSTALL_INTERFACE:include>
+    PRIVATE ${PROJECT_SOURCE_DIR}/kernels
+    PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
+    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
+)
 
-    #Add dynamic library
-    add_library(volk_gnsssdr SHARED $<TARGET_OBJECTS:volk_gnsssdr_obj>)
-    target_link_libraries(volk_gnsssdr ${volk_gnsssdr_libraries} ${Boost_LIBRARIES})
+#Add dynamic library
+add_library(volk_gnsssdr SHARED $<TARGET_OBJECTS:volk_gnsssdr_obj>)
+target_link_libraries(volk_gnsssdr ${volk_gnsssdr_libraries} m)
+target_include_directories(volk_gnsssdr
+    PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
+    PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+    PUBLIC $<INSTALL_INTERFACE:include>
+    PRIVATE ${PROJECT_SOURCE_DIR}/kernels
+    PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
+    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
+)
 
-    #Configure target properties
-    set_target_properties(volk_gnsssdr_obj PROPERTIES COMPILE_FLAGS "-fPIC")
-    set_target_properties(volk_gnsssdr PROPERTIES SOVERSION ${LIBVER})
-    set_target_properties(volk_gnsssdr PROPERTIES DEFINE_SYMBOL "volk_gnsssdr_EXPORTS")
+#Configure target properties
+set_target_properties(volk_gnsssdr_obj PROPERTIES COMPILE_FLAGS "-fPIC")
+set_target_properties(volk_gnsssdr PROPERTIES SOVERSION ${LIBVER})
+set_target_properties(volk_gnsssdr PROPERTIES DEFINE_SYMBOL "volk_gnsssdr_EXPORTS")
 
-    #Install locations
-    install(TARGETS volk_gnsssdr
-        LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT "volk_gnsssdr_runtime" # .so file
-        ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "volk_gnsssdr_devel"   # .lib file
-        RUNTIME DESTINATION bin              COMPONENT "volk_gnsssdr_runtime" # .dll file
+#Install locations
+install(TARGETS volk_gnsssdr
+    EXPORT VOLK_GNSSSDR-export
+    LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT "volk_gnsssdr_runtime" # .so file
+    ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "volk_gnsssdr_devel"   # .lib file
+    RUNTIME DESTINATION bin              COMPONENT "volk_gnsssdr_runtime" # .dll file
+)
+
+#Configure static library
+if(ENABLE_STATIC_LIBS)
+    add_library(volk_gnsssdr_static STATIC $<TARGET_OBJECTS:volk_gnsssdr_obj>)
+    target_link_libraries(volk_gnsssdr_static ${volk_gnsssdr_libraries} pthread m)
+    target_include_directories(volk_gnsssdr_static
+        PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
+        PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+        PUBLIC $<INSTALL_INTERFACE:include>
+        PRIVATE ${PROJECT_SOURCE_DIR}/kernels
+        PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
+        PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
     )
 
-    #Configure static library
-    if(ENABLE_STATIC_LIBS)
-        add_library(volk_gnsssdr_static STATIC $<TARGET_OBJECTS:volk_gnsssdr_obj>)
-
-        set_target_properties(volk_gnsssdr_static PROPERTIES OUTPUT_NAME volk_gnsssdr)
-
-        install(TARGETS volk_gnsssdr_static
-            ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "volk_gnsssdr_devel"
-        )
-    endif()
-
-#Older cmake versions (slower to build when building dynamic/static libs)
-else()
-    #create the volk_gnsssdr runtime library
-    add_library(volk_gnsssdr SHARED ${volk_gnsssdr_sources})
-    target_link_libraries(volk_gnsssdr ${volk_gnsssdr_libraries})
-    set_target_properties(volk_gnsssdr PROPERTIES SOVERSION ${LIBVER})
-    set_target_properties(volk_gnsssdr PROPERTIES DEFINE_SYMBOL "volk_gnsssdr_EXPORTS")
-
-    install(TARGETS volk_gnsssdr
-        LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT "volk_gnsssdr_runtime" # .so file
-        ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "volk_gnsssdr_devel"   # .lib file
-        RUNTIME DESTINATION bin              COMPONENT "volk_gnsssdr_runtime" # .dll file
+    install(TARGETS volk_gnsssdr_static
+        EXPORT VOLK_GNSSSDR-export
+        ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "volk_gnsssdr_devel"
     )
 
-    if(ENABLE_STATIC_LIBS)
-        add_library(volk_gnsssdr_static STATIC ${volk_gnsssdr_sources})
-
-        if(NOT WIN32)
-            set_target_properties(volk_gnsssdr_static
-                PROPERTIES OUTPUT_NAME volk_gnsssdr)
-        endif()
-
-        install(TARGETS volk_gnsssdr_static
-            ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "volk_gnsssdr_devel"   # .lib file
-        )
-    endif()
+    set_target_properties(volk_gnsssdr_static PROPERTIES OUTPUT_NAME volk_gnsssdr)
 endif()
 
 ########################################################################
 # Build the QA test application
 ########################################################################
 if(ENABLE_TESTING)
-
     #include Boost headers
     include_directories(${Boost_INCLUDE_DIRS})
     file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/.unittest)
@@ -645,11 +643,11 @@ if(ENABLE_TESTING)
         SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/testqa.cc
         ${CMAKE_CURRENT_SOURCE_DIR}/qa_utils.cc
         TARGET_DEPS volk_gnsssdr
-      )
+    )
+
     foreach(kernel ${h_files})
       get_filename_component(kernel ${kernel} NAME)
       string(REPLACE ".h" "" kernel ${kernel})
       volk_add_test(${kernel} "volk_gnsssdr_test_all")
     endforeach()
-
 endif()

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/cfg.py

@@ -29,7 +29,7 @@ from six.moves import configparser, input
 
 class volk_gnsssdr_modtool_config(object):
     def key_val_sub(self, num, stuff, section):
-        return re.sub('\$' + 'k' + str(num), stuff[num][0], (re.sub('\$' + str(num), stuff[num][1], section[1][num])));
+        return re.sub(r'\$' + 'k' + str(num), stuff[num][0], (re.sub(r'\$' + str(num), stuff[num][1], section[1][num])));
 
     def verify(self):
         for i in self.verification:
@@ -95,4 +95,3 @@ class volk_gnsssdr_modtool_config(object):
         for i in stuff:
             retval[i[0]] = i[1]
         return retval
-

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/volk_gnsssdr_modtool_generate.py

@@ -28,13 +28,13 @@ class volk_gnsssdr_modtool(object):
     def __init__(self, cfg):
         self.volk_gnsssdr = re.compile('volk_gnsssdr');
         self.remove_after_underscore = re.compile("_.*");
-        self.volk_gnsssdr_run_tests = re.compile('^\s*VOLK_RUN_TESTS.*\n', re.MULTILINE);
-        self.volk_gnsssdr_profile = re.compile('^\s*(VOLK_PROFILE|VOLK_PUPPET_PROFILE).*\n', re.MULTILINE);
+        self.volk_gnsssdr_run_tests = re.compile(r'^\s*VOLK_RUN_TESTS.*\n', re.MULTILINE);
+        self.volk_gnsssdr_profile = re.compile(r'^\s*(VOLK_PROFILE|VOLK_PUPPET_PROFILE).*\n', re.MULTILINE);
         self.my_dict = cfg;
-        self.lastline = re.compile('\s*char path\[1024\];.*');
-        self.badassert = re.compile('^\s*assert\(toked\[0\] == "volk_gnsssdr_.*\n', re.MULTILINE);
+        self.lastline = re.compile(r'\s*char path\[1024\];.*');
+        self.badassert = re.compile(r'^\s*assert\(toked\[0\] == "volk_gnsssdr_.*\n', re.MULTILINE);
         self.goodassert = '    assert(toked[0] == "volk_gnsssdr");\n'
-        self.baderase = re.compile('^\s*toked.erase\(toked.begin\(\)\);.*\n', re.MULTILINE);
+        self.baderase = re.compile(r'^\s*toked.erase\(toked.begin\(\)\);.*\n', re.MULTILINE);
         self.gooderase = '    toked.erase(toked.begin());\n    toked.erase(toked.begin());\n';
 
     def get_basename(self, base=None):
@@ -65,7 +65,7 @@ class volk_gnsssdr_modtool(object):
 
         for line in hdr_files:
 
-            subline = re.search(".*\.h.*", os.path.basename(line))
+            subline = re.search(r".*\.h.*", os.path.basename(line))
             if subline:
                 subsubline = begins.search(subline.group(0));
                 if subsubline:
@@ -81,7 +81,7 @@ class volk_gnsssdr_modtool(object):
             for dt in datatypes:
                 if dt in line:
                     #subline = re.search("(?<=volk_gnsssdr_)" + dt + ".*(?=\.h)", line);
-                    subline = re.search(begins.pattern[:-2] + dt + ".*(?=\.h)", line);
+                    subline = re.search(begins.pattern[:-2] + dt + r".*(?=\.h)", line);
                     if subline:
                         functions.append(subline.group(0));
 
@@ -188,8 +188,8 @@ class volk_gnsssdr_modtool(object):
         inpath = os.path.abspath(base);
         kernel = re.compile(name)
         search_kernels = set([kernel])
-        profile = re.compile('^\s*VOLK_PROFILE')
-        puppet = re.compile('^\s*VOLK_PUPPET')
+        profile = re.compile(r'^\s*VOLK_PROFILE')
+        puppet = re.compile(r'^\s*VOLK_PUPPET')
         src_dest = os.path.join(inpath, 'apps/', top[:-1] + '_profile.cc');
         infile = open(src_dest);
         otherlines = infile.readlines();
@@ -257,8 +257,8 @@ class volk_gnsssdr_modtool(object):
         kernel = re.compile(name)
         search_kernels = set([kernel])
 
-        profile = re.compile('^\s*VOLK_PROFILE')
-        puppet = re.compile('^\s*VOLK_PUPPET')
+        profile = re.compile(r'^\s*VOLK_PROFILE')
+        puppet = re.compile(r'^\s*VOLK_PUPPET')
         infile = open(os.path.join(inpath, 'apps/', oldvolk_gnsssdr.pattern + '_profile.cc'));
         otherinfile = open(os.path.join(self.my_dict['destination'], 'volk_gnsssdr_' + self.my_dict['name'], 'apps/volk_gnsssdr_' + self.my_dict['name'] + '_profile.cc'));
         dest = os.path.join(self.my_dict['destination'], 'volk_gnsssdr_' + self.my_dict['name'], 'apps/volk_gnsssdr_' + self.my_dict['name'] + '_profile.cc');

src/algorithms/observables/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.
 #
@@ -24,19 +24,26 @@ set(OBS_ADAPTER_HEADERS
     hybrid_observables.h
 )
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/observables/gnuradio_blocks
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-)
+source_group(Headers FILES ${OBS_ADAPTER_HEADERS})
 
 add_library(obs_adapters ${OBS_ADAPTER_SOURCES} ${OBS_ADAPTER_HEADERS})
-source_group(Headers FILES ${OBS_ADAPTER_HEADERS})
-target_link_libraries(obs_adapters obs_gr_blocks ${GNURADIO_RUNTIME_LIBRARIES})
+
+target_include_directories(obs_adapters
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/algorithms/libs
+)
+
+target_link_libraries(obs_adapters
+    PUBLIC
+        obs_gr_blocks
+        gnss_rx
+        gnss_sp_libs
+    PRIVATE
+        Gflags::gflags
+        Glog::glog
+)
+
+set_property(TARGET obs_adapters
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)

src/algorithms/observables/gnuradio_blocks/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.
 #
@@ -24,42 +24,29 @@ set(OBS_GR_BLOCKS_HEADERS
     hybrid_observables_cc.h
 )
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${ARMADILLO_INCLUDE_DIRS}
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${MATIO_INCLUDE_DIRS}
-)
+source_group(Headers FILES ${OBS_GR_BLOCKS_HEADERS})
 
 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}
-    )
-else()
-    add_dependencies(obs_gr_blocks
-        gnss_sp_libs
-        glog-${glog_RELEASE}
-        armadillo-${armadillo_RELEASE}
-        matio-${GNSSSDR_MATIO_LOCAL_VERSION}
-    )
-endif()
+target_include_directories(obs_gr_blocks
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/algorithms/libs
+)
 
 target_link_libraries(obs_gr_blocks
-    gnss_sp_libs
-    ${GNURADIO_RUNTIME_LIBRARIES}
-    ${ARMADILLO_LIBRARIES}
-    ${MATIO_LIBRARIES}
+    PUBLIC
+        Boost::boost
+        Gnuradio::blocks
+        gnss_system_parameters
+    PRIVATE
+        Gflags::gflags
+        Glog::glog
+        Boost::filesystem
+        Matio::matio
+        gnss_sp_libs
+)
+
+set_property(TARGET obs_gr_blocks
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )

src/algorithms/resampler/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.
 #
@@ -27,28 +27,32 @@ set(RESAMPLER_ADAPTER_HEADERS
     mmse_resampler_conditioner.h
 )
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/algorithms/resampler/gnuradio_blocks
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${VOLK_INCLUDE_DIRS}
-)
-
-if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
-    add_definitions(-DGR_GREATER_38=1)
-endif()
-
 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
+)
 
-target_link_libraries(resampler_adapters resampler_gr_blocks)
+if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
+    target_compile_definitions(resampler_adapters PUBLIC -DGR_GREATER_38=1)
+endif()
+
+set_property(TARGET resampler_adapters
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)

src/algorithms/resampler/gnuradio_blocks/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.
 #
@@ -29,22 +29,26 @@ set(RESAMPLER_GR_BLOCKS_HEADERS
     direct_resampler_conditioner_cb.h
 )
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${VOLK_INCLUDE_DIRS}
-)
-
 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}
 )
 
-source_group(Headers FILES ${RESAMPLER_GR_BLOCKS_HEADERS})
+target_link_libraries(resampler_gr_blocks
+    PUBLIC
+        Gnuradio::runtime
+        Volk::volk
+    PRIVATE
+        Gflags::gflags
+        Glog::glog
+)
 
-add_dependencies(resampler_gr_blocks glog-${glog_RELEASE})
+set_property(TARGET resampler_gr_blocks
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)

src/algorithms/signal_generator/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.
 #
@@ -19,29 +19,26 @@
 set(SIGNAL_GENERATOR_ADAPTER_SOURCES signal_generator.cc)
 set(SIGNAL_GENERATOR_ADAPTER_HEADERS signal_generator.h)
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/signal_generator/gnuradio_blocks
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-)
+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
-    gnss_sp_libs
-    signal_generator_blocks
-    ${GNURADIO_RUNTIME_LIBRARIES}
-    ${GNURADIO_BLOCKS_LIBRARIES}
-    ${GNURADIO_FILTER_LIBRARIES}
+    PUBLIC
+        signal_generator_blocks
+        Gnuradio::runtime
+        Gnuradio::blocks
+        gnss_rx
+    PRIVATE
+        Gflags::gflags
+        Glog::glog
+        gnss_sp_libs
+)
+
+set_property(TARGET signal_generator_adapters
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )

src/algorithms/signal_generator/gnuradio_blocks/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.
 #
@@ -19,36 +19,29 @@
 set(SIGNAL_GENERATOR_BLOCK_SOURCES signal_generator_c.cc)
 set(SIGNAL_GENERATOR_BLOCK_HEADERS signal_generator_c.h)
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${VOLK_GNSSSDR_INCLUDE_DIRS}
-)
+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
-    gnss_system_parameters
-    gnss_sp_libs
-    ${GNURADIO_RUNTIME_LIBRARIES}
-    ${GNURADIO_FFT_LIBRARIES}
-    ${VOLK_GNSSSDR_LIBRARIES}
-    ${ORC_LIBRARIES}
+    PUBLIC
+        Boost::boost
+        Gnuradio::runtime
+        gnss_system_parameters
+    PRIVATE
+        gnss_sp_libs
+        Volkgnsssdr::volkgnsssdr
 )
 
-if(VOLKGNSSSDR_FOUND)
-    # add_dependencies(signal_generator_blocks glog-${glog_RELEASE})
-else()
-    add_dependencies(signal_generator_blocks volk_gnsssdr_module)
-endif()
+target_include_directories(signal_generator_blocks
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/algorithms/libs
+)
+
+set_property(TARGET signal_generator_blocks
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)

src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h

@@ -33,7 +33,6 @@
 
 #include "gnss_signal.h"
 #include <boost/scoped_array.hpp>
-//#include <gnuradio/random.h>
 #include <gnuradio/block.h>
 #include <random>
 #include <string>

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.
 #
@@ -19,20 +19,13 @@
 
 # Optional drivers
 
-if(ENABLE_RAW_UDP)
-    find_package(PCAP)
-    if(NOT PCAP_FOUND)
-        message(FATAL_ERROR "PCAP required to compile custom UDP packet sample source (ENABLE_RAW_UDP)")
-    endif()
-    get_filename_component(PCAP_LIBRARY_DIRS ${PCAP_LIBRARY} DIRECTORY CACHE)
-    set(OPT_LIBRARIES ${OPT_LIBRARIES} ${PCAP_LIBRARIES})
-    set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${PCAP_INCLUDE_DIRS})
+if(ENABLE_RAW_UDP AND PCAP_FOUND)
     set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} custom_udp_signal_source.cc)
     set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} custom_udp_signal_source.h)
 endif()
 
+
 if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2)
-    find_package(GRIIO REQUIRED)
     if(NOT GRIIO_FOUND)
         message(STATUS "gnuradio-iio not found, its installation is required.")
         message(STATUS "Please build and install the following projects:")
@@ -41,12 +34,10 @@ if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2)
         message(STATUS " * gnuradio-iio from https://github.com/analogdevicesinc/gr-iio")
         message(FATAL_ERROR "gnuradio-iio is required for building gnss-sdr with this option enabled.")
     endif()
-    set(OPT_LIBRARIES ${OPT_LIBRARIES} ${IIO_LIBRARIES})
-    set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS})
 endif()
 
+
 if(ENABLE_AD9361)
-    find_package(LIBIIO REQUIRED)
     if(NOT LIBIIO_FOUND)
         message(STATUS "libiio not found, its installation is required.")
         message(STATUS "Please build and install the following projects:")
@@ -55,8 +46,6 @@ if(ENABLE_AD9361)
         message(STATUS " * gnuradio-iio from https://github.com/analogdevicesinc/gr-iio")
         message(FATAL_ERROR "libiio is required for building gnss-sdr with this option enabled.")
     endif()
-    set(OPT_LIBRARIES ${OPT_LIBRARIES} ${LIBIIO_LIBRARIES})
-    set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${LIBIIO_INCLUDE_DIRS})
 endif()
 
 
@@ -97,33 +86,16 @@ if(ENABLE_GN3S)
     ##############################################
     # GN3S (USB dongle)
     ##############################################
-    find_package(GRGN3S REQUIRED)
     if(NOT GRGN3S_FOUND)
         message(" gr-gn3s not found, install it from https://github.com/gnss-sdr/gr-gn3s ")
         message(FATAL_ERROR "gr-gn3s required for building gnss-sdr with this option enabled")
     endif()
-    set(OPT_LIBRARIES ${OPT_LIBRARIES} ${GR_GN3S_LIBRARIES})
-    set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${GR_GN3S_INCLUDE_DIRS})
     set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} gn3s_signal_source.cc)
     set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} gn3s_signal_source.h)
 endif()
 
 
-if(ENABLE_FLEXIBAND)
-    ##############################################
-    # TELEORBIT FLEXIBAND FRONTEND ADAPTER
-    ##############################################
-    find_package(TELEORBIT REQUIRED)
-    if(NOT TELEORBIT_FOUND)
-        message(FATAL_ERROR "Teleorbit Flexiband GNU Radio driver required to build gnss-sdr with the optional FLEXIBAND adapter")
-    endif()
-    # Set up variables
-    set(FLEXIBAND_DRIVER_INCLUDE_DIRS
-        ${OPT_DRIVER_INCLUDE_DIRS}
-        ${TELEORBIT_INCLUDE_DIR}/teleorbit
-    )
-    set(OPT_LIBRARIES ${OPT_LIBRARIES} ${TELEORBIT_LIBRARIES})
-    set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${FLEXIBAND_DRIVER_INCLUDE_DIRS})
+if(ENABLE_FLEXIBAND AND TELEORBIT_FOUND)
     set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} flexiband_signal_source.cc)
     set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} flexiband_signal_source.h)
 endif()
@@ -133,7 +105,6 @@ if(ENABLE_ARRAY)
     ##############################################
     # DBFCTTC GNSS EXPERIMENTAL ARRAY PROTOTYPE
     ##############################################
-    find_package(GRDBFCTTC REQUIRED)
     if(NOT GRDBFCTTC_FOUND)
         message(" gr-dbfcttc not found, install it from https://github.com/gnss-sdr/gr-dbfcttc ")
         message(FATAL_ERROR "gr-dbfcttc required for building gnss-sdr with this option enabled")
@@ -154,15 +125,8 @@ if(ENABLE_OSMOSDR)
             list(REMOVE_ITEM SIGNAL_SOURCE_ADAPTER_HEADERS ${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/adapters/osmosdr_signal_source.h)
         endif()
     else()
-        # set OSMO include dirs
-        set(OSMO_DRIVER_INCLUDE_DIRS
-            ${OPT_DRIVER_INCLUDE_DIRS}
-            ${GROSMOSDR_INCLUDE_DIR}/osmosdr
-        )
         set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} osmosdr_signal_source.cc)
         set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} osmosdr_signal_source.h)
-        set(OPT_LIBRARIES ${OPT_LIBRARIES} ${GROSMOSDR_LIBRARIES})
-        set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${OSMO_DRIVER_INCLUDE_DIRS})
     endif()
 endif()
 
@@ -170,8 +134,6 @@ endif()
 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)
-    set(OPT_LIBRARIES ${OPT_LIBRARIES} ${UHD_LIBRARIES} ${GNURADIO_UHD_LIBRARIES})
-    set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${UHD_INCLUDE_DIRS})
 endif()
 
 
@@ -197,7 +159,6 @@ set(SIGNAL_SOURCE_ADAPTER_HEADERS
     ${OPT_DRIVER_HEADERS}
 )
 
-
 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
@@ -207,36 +168,90 @@ if(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.3)
         two_bit_packed_file_signal_source.h)
 endif()
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${OPT_DRIVER_INCLUDE_DIRS}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/libs
-    ${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/gnuradio_blocks
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${Boost_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${VOLK_INCLUDE_DIRS}
-)
-
-if(ARCH_64BITS)
-    add_definitions(-DARCH_64BITS=1)
-endif()
-
-add_definitions(-DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}")
-
 list(SORT SIGNAL_SOURCE_ADAPTER_HEADERS)
 list(SORT SIGNAL_SOURCE_ADAPTER_SOURCES)
 
-add_library(signal_source_adapters ${SIGNAL_SOURCE_ADAPTER_SOURCES} ${SIGNAL_SOURCE_ADAPTER_HEADERS})
 source_group(Headers FILES ${SIGNAL_SOURCE_ADAPTER_HEADERS})
-target_link_libraries(signal_source_adapters signal_source_gr_blocks
-    ${Boost_LIBRARIES}
-    ${GNURADIO_PMT_LIBRARIES}
-    ${GNURADIO_BLOCKS_LIBRARIES}
-    ${OPT_LIBRARIES}
-    gnss_sp_libs
+
+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_link_libraries(signal_source_adapters
+    PUBLIC
+        Boost::boost
+        Gnuradio::runtime
+        Gnuradio::blocks
+        signal_source_gr_blocks
+        gnss_sp_libs
+        gnss_rx
+        signal_source_lib
+    PRIVATE
+        Gflags::gflags
+        Glog::glog
+        Volk::volk
+)
+
+if(ENABLE_RAW_UDP AND PCAP_FOUND)
+    target_link_libraries(signal_source_adapters
+        PRIVATE
+            Pcap::pcap
+    )
+endif()
+
+if(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd)
+    target_link_libraries(signal_source_adapters
+        PUBLIC
+            Gnuradio::uhd
+        PRIVATE
+            Uhd::uhd
+    )
+endif()
+
+if(ENABLE_OSMOSDR AND GROSMOSDR_FOUND)
+    target_link_libraries(signal_source_adapters
+        PUBLIC
+            Gnuradio::osmosdr
+    )
+endif()
+
+if(ENABLE_AD9361 AND LIBIIO_FOUND)
+    target_link_libraries(signal_source_adapters
+        PRIVATE
+            Iio::iio
+    )
+endif()
+
+if(ENABLE_FLEXIBAND AND TELEORBIT_FOUND)
+    target_link_libraries(signal_source_adapters
+        PRIVATE
+            Gnuradio::teleorbit
+    )
+endif()
+
+if(ENABLE_GN3S AND GRGN3S_FOUND)
+    target_link_libraries(signal_source_adapters
+        PRIVATE
+            Gnuradio::gn3s
+    )
+endif()
+
+if(ENABLE_ARRAY AND GRDBFCTTC_FOUND)
+    target_link_libraries(signal_source_adapters
+        PRIVATE
+            Gnuradio::dbfcttc
+    )
+endif()
+
+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/adapters/rtl_tcp_signal_source.cc

@@ -48,10 +48,10 @@ RtlTcpSignalSource::RtlTcpSignalSource(ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_stream,
     unsigned int out_stream,
-    boost::shared_ptr<gr::msg_queue> queue) : role_(std::move(role)),
+    boost::shared_ptr<gr::msg_queue> queue) : role_(role),
                                               in_stream_(in_stream),
                                               out_stream_(out_stream),
-                                              queue_(queue)
+                                              queue_(std::move(std::move(queue)))
 {
     // DUMP PARAMETERS
     std::string empty = "";

src/algorithms/signal_source/gnuradio_blocks/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.
 #
@@ -17,14 +17,7 @@
 #
 
 
-if(ENABLE_RAW_UDP)
-    find_package(PCAP)
-    if(NOT PCAP_FOUND)
-        message(FATAL_ERROR "PCAP required to compile custom UDP packet sample source")
-    endif()
-    get_filename_component(PCAP_LIBRARY_DIRS ${PCAP_LIBRARY} DIRECTORY CACHE)
-    set(OPT_LIBRARIES ${OPT_LIBRARIES} ${PCAP_LIBRARIES})
-    set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${PCAP_INCLUDE_DIRS})
+if(ENABLE_RAW_UDP AND PCAP_FOUND)
     set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} gr_complex_ip_packet_source.cc)
     set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} gr_complex_ip_packet_source.h)
 endif()
@@ -55,32 +48,33 @@ set(SIGNAL_SOURCE_GR_BLOCKS_HEADERS
     ${OPT_DRIVER_HEADERS}
 )
 
-
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/libs
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${Boost_INCLUDE_DIRS}
-    ${OPT_DRIVER_INCLUDE_DIRS}
-)
-
 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
-    signal_source_lib
-    ${GNURADIO_RUNTIME_LIBRARIES}
-    ${Boost_LIBRARIES}
-    ${OPT_LIBRARIES}
+    PUBLIC
+        signal_source_lib
+        Gnuradio::runtime
+        Boost::thread
+    PRIVATE
+        Gflags::gflags
+        Glog::glog
 )
 
-add_dependencies(signal_source_gr_blocks glog-${glog_RELEASE})
+if(ENABLE_RAW_UDP AND PCAP_FOUND)
+    target_link_libraries(signal_source_gr_blocks
+        PUBLIC
+            Pcap::pcap
+    )
+endif()
+
+set_property(TARGET signal_source_gr_blocks APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)

src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc

@@ -333,7 +333,7 @@ int rtl_tcp_signal_source_c::work(int noutput_items,
     gr_vector_const_void_star & /*input_items*/,
     gr_vector_void_star &output_items)
 {
-    gr_complex *out = reinterpret_cast<gr_complex *>(output_items[0]);
+    auto *out = reinterpret_cast<gr_complex *>(output_items[0]);
     int i = 0;
     if (io_service_.stopped())
         {

src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h

@@ -39,7 +39,7 @@
  *
  *   Value_0, Value_1, Value_2, ..., Value_n, Value_n+1, Value_n+2, ...
  *
- * \author Cillian O'Driscoll cillian.odriscoll (at) gmail . com 
+ * \author Cillian O'Driscoll cillian.odriscoll (at) gmail . com
  * -------------------------------------------------------------------------
  *
  * Copyright (C) 2010-2018  (see AUTHORS file for a list of contributors)

src/algorithms/signal_source/libs/CMakeLists.txt

@@ -17,36 +17,25 @@
 #
 
 if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2)
-    find_package(GRIIO REQUIRED)
-        if(NOT GRIIO_FOUND)
-            message(STATUS "gnuradio-iio not found, its installation is required.")
-            message(STATUS "Please build and install the following projects:")
-            message(STATUS " * libiio from https://github.com/analogdevicesinc/libiio")
-            message(STATUS " * libad9361-iio from https://github.com/analogdevicesinc/libad9361-iio")
-            message(STATUS " * gnuradio-iio from https://github.com/analogdevicesinc/gr-iio")
-            message(FATAL_ERROR "gnuradio-iio is required for building gnss-sdr with this option enabled")
-        endif()
-    set(OPT_LIBRARIES ${OPT_LIBRARIES} ${IIO_LIBRARIES})
-    set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS})
+    if(NOT GRIIO_FOUND)
+        message(STATUS "gnuradio-iio not found, its installation is required.")
+        message(STATUS "Please build and install the following projects:")
+        message(STATUS " * libiio from https://github.com/analogdevicesinc/libiio")
+        message(STATUS " * libad9361-iio from https://github.com/analogdevicesinc/libad9361-iio")
+        message(STATUS " * gnuradio-iio from https://github.com/analogdevicesinc/gr-iio")
+        message(FATAL_ERROR "gnuradio-iio is required for building gnss-sdr with this option enabled")
+    endif()
 endif()
 
 if(ENABLE_FMCOMMS2 OR ENABLE_AD9361)
-    find_package(LIBIIO REQUIRED)
-        if(NOT LIBIIO_FOUND)
-            message(STATUS "libiio not found, its installation is required.")
-            message(STATUS "Please build and install the following projects:")
-            message(STATUS " * libiio from https://github.com/analogdevicesinc/libiio")
-            message(STATUS " * libad9361-iio from https://github.com/analogdevicesinc/libad9361-iio")
-            message(STATUS " * gnuradio-iio from https://github.com/analogdevicesinc/gr-iio")
-            message(FATAL_ERROR "libiio is required for building gnss-sdr with this option enabled")
-        endif()
-    set(OPT_LIBRARIES ${OPT_LIBRARIES} ${LIBIIO_LIBRARIES})
-    set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${LIBIIO_INCLUDE_DIRS})
-
-    ###############################################
-    # FMCOMMS2 based SDR Hardware
-    ###############################################
-    if(LIBIIO_FOUND)
+    if(NOT LIBIIO_FOUND)
+        message(STATUS "libiio not found, its installation is required.")
+        message(STATUS "Please build and install the following projects:")
+        message(STATUS " * libiio from https://github.com/analogdevicesinc/libiio")
+        message(STATUS " * libad9361-iio from https://github.com/analogdevicesinc/libad9361-iio")
+        message(STATUS " * gnuradio-iio from https://github.com/analogdevicesinc/gr-iio")
+        message(FATAL_ERROR "libiio is required for building gnss-sdr with this option enabled")
+    else()
         set(OPT_SIGNAL_SOURCE_LIB_SOURCES ad9361_manager.cc)
         set(OPT_SIGNAL_SOURCE_LIB_HEADERS ad9361_manager.h)
     endif()
@@ -57,14 +46,6 @@ if(ENABLE_FPGA OR ENABLE_AD9361)
     set(OPT_SIGNAL_SOURCE_LIB_HEADERS ${OPT_SIGNAL_SOURCE_LIB_HEADERS} fpga_switch.h)
 endif()
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${Boost_INCLUDE_DIRS}
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${OPT_DRIVER_INCLUDE_DIRS}
-)
-
 set(SIGNAL_SOURCE_LIB_SOURCES
     rtl_tcp_commands.cc
     rtl_tcp_dongle_info.cc
@@ -80,7 +61,34 @@ 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})
-target_link_libraries(signal_source_lib ${OPT_LIBRARIES})
-add_dependencies(signal_source_lib glog-${glog_RELEASE})
+
+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
+)
+
+if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2)
+    target_link_libraries(signal_source_lib
+        PUBLIC
+            Gnuradio::iio
+        PRIVATE
+            Iio::iio
+    )
+endif()
+
+if(ENABLE_FMCOMMS2 OR ENABLE_AD9361)
+    target_link_libraries(signal_source_lib
+        PUBLIC
+            Iio::iio
+    )
+endif()
+
+set_property(TARGET signal_source_lib APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)

src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc

@@ -121,7 +121,7 @@ double rtl_tcp_dongle_info::clip_gain(int gain) const
         }
 
     // clip
-    if (gains.size() == 0)
+    if (gains.empty())
         {
             // no defined gains to clip to
             return gain;

src/algorithms/telemetry_decoder/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.
 #
@@ -41,32 +41,29 @@ set(TELEMETRY_DECODER_ADAPTER_HEADERS
     beidou_b1i_telemetry_decoder.h
 )
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/gnuradio_blocks
-    ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/libs
-    ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/libs/libswiftcnav
-    ${Boost_INCLUDE_DIRS}
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-)
-
 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
-    telemetry_decoder_gr_blocks
-    gnss_system_parameters
-    ${GNURADIO_RUNTIME_LIBRARIES}
+    PUBLIC
+        telemetry_decoder_gr_blocks
+        gnss_system_parameters
+        gnss_rx
+    PRIVATE
+        Gflags::gflags
+        Glog::glog
+        Gnuradio::runtime
+        telemetry_decoder_lib
+)
+
+set_property(TARGET telemetry_decoder_adapters
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )

src/algorithms/telemetry_decoder/gnuradio_blocks/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.
 #
@@ -38,37 +38,31 @@ set(TELEMETRY_DECODER_GR_BLOCKS_HEADERS
     beidou_b1i_telemetry_decoder_cc.h
 )
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/libs
-    ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/libs/libswiftcnav
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${Boost_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${VOLK_GNSSSDR_INCLUDE_DIRS}
-)
-
 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
-    telemetry_decoder_libswiftcnav
-    telemetry_decoder_lib
-    gnss_system_parameters
-    ${GNURADIO_RUNTIME_LIBRARIES}
-    ${VOLK_GNSSSDR_LIBRARIES}
+    PUBLIC
+        telemetry_decoder_libswiftcnav
+        telemetry_decoder_lib
+        gnss_system_parameters
+        gnss_rx
+        Gnuradio::runtime
+        Volkgnsssdr::volkgnsssdr
+    PRIVATE
+        Boost::boost
+        Gflags::gflags
+        Glog::glog
 )
 
-if(NOT VOLKGNSSSDR_FOUND)
-    add_dependencies(telemetry_decoder_gr_blocks volk_gnsssdr_module)
-endif()
+set_property(TARGET telemetry_decoder_gr_blocks
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)

src/algorithms/telemetry_decoder/libs/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.
 #
@@ -28,24 +28,26 @@ set(TELEMETRY_DECODER_LIB_HEADERS
     convolutional.h
 )
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/adapters
-    ${Boost_INCLUDE_DIRS}
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-)
-
 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 gnss_system_parameters)
+target_link_libraries(telemetry_decoder_lib
+    PUBLIC
+        gnss_system_parameters
+        gnss_rx
+    PRIVATE
+        Gflags::gflags
+        Glog::glog
+)
+
+set_property(TARGET telemetry_decoder_lib
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)

src/algorithms/telemetry_decoder/libs/libswiftcnav/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.
 #
@@ -31,19 +31,21 @@ set(TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS
     fec.h
 )
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
 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}
 )
 
-source_group(Headers FILES ${TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS})
+set_property(TARGET telemetry_decoder_libswiftcnav
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
 
 set_target_properties(telemetry_decoder_libswiftcnav
-    PROPERTIES LINKER_LANGUAGE C)
+    PROPERTIES LINKER_LANGUAGE C
+)

src/algorithms/tracking/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.
 #
@@ -87,34 +87,29 @@ set(TRACKING_ADAPTER_HEADERS
     ${OPT_TRACKING_ADAPTERS_HEADERS}
 )
 
-include_directories(
-     ${CMAKE_CURRENT_SOURCE_DIR}
-     ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-     ${CMAKE_SOURCE_DIR}/src/core/interfaces
-     ${CMAKE_SOURCE_DIR}/src/core/receiver
-     ${CMAKE_SOURCE_DIR}/src/algorithms/tracking/gnuradio_blocks
-     ${CMAKE_SOURCE_DIR}/src/algorithms/tracking/libs
-     ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-     ${ARMADILLO_INCLUDE_DIRS}
-     ${GLOG_INCLUDE_DIRS}
-     ${GFlags_INCLUDE_DIRS}
-     ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-     ${VOLK_GNSSSDR_INCLUDE_DIRS}
-     ${OPT_TRACKING_INCLUDE_DIRS}
-)
-
 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
-    tracking_gr_blocks
-    gnss_sp_libs
-    gnss_sdr_flags
+    PUBLIC
+        tracking_gr_blocks
+        gnss_sp_libs
+        gnss_sdr_flags
+)
+
+target_include_directories(tracking_adapters
+    PUBLIC
+        ${OPT_TRACKING_INCLUDE_DIRS}
+)
+
+set_property(TARGET tracking_adapters
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )

src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc

@@ -48,7 +48,7 @@ using google::LogMessage;
 
 GalileoE1TcpConnectorTracking::GalileoE1TcpConnectorTracking(
     ConfigurationInterface* configuration, const std::string& role,
-    unsigned int in_streams, unsigned int out_streams) : role_(std::move(role)), in_streams_(in_streams), out_streams_(out_streams)
+    unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
     DLOG(INFO) << "role " << role;
     //################# CONFIGURATION PARAMETERS ########################

src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc

@@ -47,7 +47,7 @@ using google::LogMessage;
 
 GpsL1CaTcpConnectorTracking::GpsL1CaTcpConnectorTracking(
     ConfigurationInterface* configuration, const std::string& role,
-    unsigned int in_streams, unsigned int out_streams) : role_(std::move(role)), in_streams_(in_streams), out_streams_(out_streams)
+    unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
     DLOG(INFO) << "role " << role;
     //################# CONFIGURATION PARAMETERS ########################

src/algorithms/tracking/gnuradio_blocks/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.
 #
@@ -78,59 +78,35 @@ set(TRACKING_GR_BLOCKS_HEADERS
     ${OPT_TRACKING_BLOCKS_HEADERS}
 )
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/tracking/libs
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${ARMADILLO_INCLUDE_DIRS}
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${Boost_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${VOLK_GNSSSDR_INCLUDE_DIRS}
-    ${OPT_TRACKING_INCLUDES}
-    ${MATIO_INCLUDE_DIRS}
-)
-
-if(ENABLE_GENERIC_ARCH)
-    add_definitions(-DGENERIC_ARCH=1)
-endif()
-
 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}
 )
 
-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}
+    PUBLIC
+        Boost::boost
+        tracking_lib
+        Gnuradio::blocks
+        Volkgnsssdr::volkgnsssdr
+        gnss_sdr_flags
+        gnss_sp_libs
+        gnss_rx
+        Matio::matio
+        ${OPT_TRACKING_LIBRARIES}
 )
 
-if(NOT VOLKGNSSSDR_FOUND)
-    if(MATIO_FOUND)
-        add_dependencies(tracking_gr_blocks volk_gnsssdr_module)
-    else()
-        add_dependencies(tracking_gr_blocks volk_gnsssdr_module
-            matio-${GNSSSDR_MATIO_LOCAL_VERSION}
-        )
-    endif()
-else()
-    if(NOT MATIO_FOUND)
-        add_dependencies(tracking_gr_blocks
-            matio-${GNSSSDR_MATIO_LOCAL_VERSION}
-        )
-    endif()
-endif()
+target_include_directories(tracking_gr_blocks
+    PUBLIC
+        ${OPT_TRACKING_INCLUDES}
+)
+
+set_property(TARGET tracking_gr_blocks
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)

src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc

@@ -104,7 +104,7 @@ Galileo_E1_Tcp_Connector_Tracking_cc::Galileo_E1_Tcp_Connector_Tracking_cc(
     d_dump = dump;
     d_fs_in = fs_in;
     d_vector_length = vector_length;
-    d_dump_filename = std::move(dump_filename);
+    d_dump_filename = dump_filename;
 
     // Initialize tracking  ==========================================
     //--- DLL variables --------------------------------------------------------
@@ -270,7 +270,7 @@ void Galileo_E1_Tcp_Connector_Tracking_cc::set_channel(uint32_t channel)
                 {
                     try
                         {
-                            d_dump_filename.append(boost::lexical_cast<std::string>(d_channel));
+                            d_dump_filename.append(std::to_string(d_channel));
                             d_dump_filename.append(".dat");
                             d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit);
                             d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary);
@@ -309,8 +309,8 @@ int Galileo_E1_Tcp_Connector_Tracking_cc::general_work(int noutput_items __attri
     // GNSS_SYNCHRO OBJECT to interchange data between tracking->telemetry_decoder
     Gnss_Synchro current_synchro_data = Gnss_Synchro();
     // Block input data and block output stream pointers
-    const gr_complex *in = reinterpret_cast<const gr_complex *>(input_items[0]);
-    Gnss_Synchro **out = reinterpret_cast<Gnss_Synchro **>(&output_items[0]);
+    const auto *in = reinterpret_cast<const gr_complex *>(input_items[0]);
+    auto **out = reinterpret_cast<Gnss_Synchro **>(&output_items[0]);
     if (d_enable_tracking == true)
         {
             // Fill the acquisition data

src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc

@@ -95,7 +95,7 @@ Gps_L1_Ca_Tcp_Connector_Tracking_cc::Gps_L1_Ca_Tcp_Connector_Tracking_cc(
     d_dump = dump;
     d_fs_in = fs_in;
     d_vector_length = vector_length;
-    d_dump_filename = std::move(dump_filename);
+    d_dump_filename = dump_filename;
 
     //--- DLL variables --------------------------------------------------------
     d_early_late_spc_chips = early_late_space_chips;  // Define early-late offset (in chips)
@@ -300,7 +300,7 @@ void Gps_L1_Ca_Tcp_Connector_Tracking_cc::set_channel(uint32_t channel)
                 {
                     try
                         {
-                            d_dump_filename.append(boost::lexical_cast<std::string>(d_channel));
+                            d_dump_filename.append(std::to_string(d_channel));
                             d_dump_filename.append(".dat");
                             d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit);
                             d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary);
@@ -341,8 +341,8 @@ int Gps_L1_Ca_Tcp_Connector_Tracking_cc::general_work(int noutput_items __attrib
     Gnss_Synchro current_synchro_data = Gnss_Synchro();
 
     // Block input data and block output stream pointers
-    const gr_complex *in = reinterpret_cast<const gr_complex *>(input_items[0]);
-    Gnss_Synchro **out = reinterpret_cast<Gnss_Synchro **>(&output_items[0]);
+    const auto *in = reinterpret_cast<const gr_complex *>(input_items[0]);
+    auto **out = reinterpret_cast<Gnss_Synchro **>(&output_items[0]);
 
     if (d_enable_tracking == true)
         {

src/algorithms/tracking/libs/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.
 #
@@ -66,45 +66,32 @@ if(ENABLE_FPGA)
     set(TRACKING_LIB_HEADERS ${TRACKING_LIB_HEADERS} fpga_multicorrelator.h dll_pll_conf_fpga.h)
 endif()
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/interfaces
-    ${CMAKE_SOURCE_DIR}/src/core/receiver
-    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-    ${ARMADILLO_INCLUDE_DIRS}
-    ${VOLK_INCLUDE_DIRS}
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${OPT_TRACKING_INCLUDES}
-    ${VOLK_GNSSSDR_INCLUDE_DIRS}
-)
-
-if(ENABLE_GENERIC_ARCH)
-    add_definitions(-DGENERIC_ARCH=1)
-endif()
-
-if(SSE3_AVAILABLE)
-    add_definitions(-DHAVE_SSE3=1)
-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
-    ${OPT_TRACKING_LIBRARIES}
-    ${VOLK_LIBRARIES}
-    ${VOLK_GNSSSDR_LIBRARIES}
-    ${Boost_LIBRARIES}
-    ${GNURADIO_RUNTIME_LIBRARIES}
+    PUBLIC
+        Armadillo::armadillo
+        Boost::boost
+        Gnuradio::runtime
+        Volkgnsssdr::volkgnsssdr
+        gnss_system_parameters
+        ${OPT_TRACKING_LIBRARIES}
+    PRIVATE
+        Gflags::gflags
+        Glog::glog
 )
 
-if(VOLKGNSSSDR_FOUND)
-    add_dependencies(tracking_lib glog-${glog_RELEASE})
-else()
-    add_dependencies(tracking_lib glog-${glog_RELEASE} volk_gnsssdr_module)
-endif()
+target_include_directories(tracking_lib
+    PUBLIC
+        ${OPT_TRACKING_INCLUDES}
+)
+
+set_property(TARGET tracking_lib
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)

src/core/libs/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.
 #
@@ -18,10 +18,6 @@
 
 add_subdirectory(supl)
 
-if(OPENSSL_FOUND)
-    add_definitions(-DUSE_OPENSSL_FALLBACK=1)
-endif()
-
 set(CORE_LIBS_SOURCES
     ini.cc
     INIReader.cc
@@ -36,25 +32,27 @@ set(CORE_LIBS_HEADERS
     gnss_sdr_supl_client.h
 )
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${CMAKE_SOURCE_DIR}/src/core/libs/supl
-    ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp
-    ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${Boost_INCLUDE_DIRS}
-    ${PUGIXML_INCLUDE_DIR}
-)
-
 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})
-target_link_libraries(rx_core_lib supl_library ${PUGIXML_LIBRARY})
 
-if(PUGIXML_LOCAL)
-    add_dependencies(rx_core_lib pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION})
-endif()
+add_library(rx_core_lib ${CORE_LIBS_SOURCES} ${CORE_LIBS_HEADERS})
+
+target_link_libraries(rx_core_lib
+    PUBLIC
+        Boost::boost
+        supl_library
+        gnss_system_parameters
+    PRIVATE
+        Boost::serialization
+        Gflags::gflags
+        Glog::glog
+        Pugixml::pugixml
+)
+
+set_property(TARGET rx_core_lib
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+        $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/core/interfaces>
+)

src/core/libs/gnss_sdr_supl_client.cc

@@ -32,6 +32,7 @@
  */
 
 #include "gnss_sdr_supl_client.h"
+#include <glog/logging.h>
 #include <pugixml.hpp>
 #include <cmath>
 #include <utility>

src/core/libs/gnss_sdr_supl_client.h

@@ -57,7 +57,6 @@ extern "C"
 #include <boost/archive/xml_iarchive.hpp>
 #include <boost/archive/xml_oarchive.hpp>
 #include <boost/serialization/map.hpp>
-#include <glog/logging.h>
 #include <fstream>
 #include <map>
 #include <string>

src/core/libs/supl/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.
 #
@@ -25,25 +25,28 @@ set(SUPL_SOURCES
     supl.c
 )
 
-if(OPENSSL_FOUND)
-    add_definitions(-DUSE_OPENSSL_FALLBACK=1)
-endif()
-
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/libs/supl
-    ${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")
         set(MY_C_FLAGS "${MY_C_FLAGS} -Wno-parentheses-equality")
     endif()
 endif()
+
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_C_FLAGS}")
 
 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)
-set_target_properties(supl_library PROPERTIES LINKER_LANGUAGE C)
+
+target_link_libraries(supl_library
+    PUBLIC
+        ${GNUTLS_LIBRARIES}
+        ${GNUTLS_OPENSSL_LIBRARY}
+        gnss_system_parameters
+)
+
+set_target_properties(supl_library PROPERTIES
+    LINKER_LANGUAGE C
+    INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl;${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp;${GNUTLS_INCLUDE_DIR}"
+)
+
+if(OPENSSL_FOUND)
+    target_compile_definitions(supl_library PUBLIC -DUSE_OPENSSL_FALLBACK=1)
+endif()

src/core/monitor/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.
 #
@@ -27,25 +27,29 @@ set(CORE_MONITOR_LIBS_HEADERS
     gnss_synchro_udp_sink.h
 )
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-    ${GLOG_INCLUDE_DIRS}
-    ${GFlags_INCLUDE_DIRS}
-    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-    ${Boost_INCLUDE_DIRS}
-)
-
 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
+        Gnuradio::runtime
+        gnss_system_parameters
+    PRIVATE
+        Gflags::gflags
+        Glog::glog
+        Gnuradio::pmt
+)
 
-target_link_libraries(core_monitor_lib ${Boost_LIBRARIES})
-
-add_dependencies(core_monitor_lib glog-${glog_RELEASE})
+set_property(TARGET core_monitor_lib
+    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)