diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9caeece66..8f57d6c41 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,18 +98,17 @@ set(THIS_IS_A_RELEASE OFF)   # only related to version name, no further implicat
 if(NOT ${THIS_IS_A_RELEASE})
     # Get the current working branch
     execute_process(
-        COMMAND git rev-parse --abbrev-ref HEAD
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-        OUTPUT_VARIABLE GIT_BRANCH
-        OUTPUT_STRIP_TRAILING_WHITESPACE
+      COMMAND git rev-parse --abbrev-ref HEAD
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+      OUTPUT_VARIABLE GIT_BRANCH
+      OUTPUT_STRIP_TRAILING_WHITESPACE
     )
-
     # Get the latest abbreviated commit hash of the working branch
     execute_process(
-        COMMAND git log -1 --format=%h
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-        OUTPUT_VARIABLE GIT_COMMIT_HASH
-        OUTPUT_STRIP_TRAILING_WHITESPACE
+      COMMAND git log -1 --format=%h
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+      OUTPUT_VARIABLE GIT_COMMIT_HASH
+      OUTPUT_STRIP_TRAILING_WHITESPACE
     )
 endif(NOT ${THIS_IS_A_RELEASE})
 
@@ -131,7 +130,7 @@ set(VERSION ${VERSION_INFO_MAJOR_VERSION}.${VERSION_INFO_API_COMPAT}.${VERSION_I
 include(ExternalProject)
 # Detect 64-bits machine
 if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
-     set(ARCH_64BITS TRUE)
+    set(ARCH_64BITS TRUE)
 endif( CMAKE_SIZEOF_VOID_P EQUAL 8 )
 
 set(OS_IS_MACOSX "")
@@ -139,85 +138,85 @@ set(OS_IS_LINUX "")
 
 # Detect Linux Distribution
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-     set(OperatingSystem "Linux")
-     set(OS_IS_LINUX TRUE)
-     if(ARCH_64BITS)
-         set(ARCH_ "(64 bits)")
-     else(ARCH_64BITS)
-         set(ARCH_ "(32 bits)")
-     endif(ARCH_64BITS)
-     if(EXISTS "/etc/lsb-release")
-         execute_process(COMMAND cat /etc/lsb-release
-                         COMMAND grep DISTRIB_ID
-                         COMMAND awk -F= "{ print $2 }"
-                         COMMAND tr "\n" " "
-                         COMMAND sed "s/ //"
-                         OUTPUT_VARIABLE LINUX_DISTRIBUTION
-                         RESULT_VARIABLE LINUX_ID_RESULT
-         )
-         execute_process(COMMAND cat /etc/lsb-release
-                         COMMAND grep DISTRIB_RELEASE
-                         COMMAND awk -F= "{ print $2 }"
-                         COMMAND tr "\n" " "
-                         COMMAND sed "s/ //"
-                         OUTPUT_VARIABLE LINUX_VER
-                         RESULT_VARIABLE LINUX_VER_RESULT
-         )
-     endif(EXISTS "/etc/lsb-release")
-     if(NOT LINUX_DISTRIBUTION)
-         if(EXISTS "/etc/linuxmint/info")
-             set(LINUX_DISTRIBUTION "LinuxMint")
-             execute_process(COMMAND cat /etc/linuxmint/info
-                             COMMAND grep -m1 RELEASE
-                             COMMAND awk -F= "{ print $2 }"
-                             COMMAND tr "\n" " "
-                             COMMAND sed "s/ //"
-                             OUTPUT_VARIABLE LINUX_VER
-                             RESULT_VARIABLE LINUX_VER_RESULT
-             )
-         endif(EXISTS "/etc/linuxmint/info")
-     endif(NOT LINUX_DISTRIBUTION)
-     if(NOT LINUX_DISTRIBUTION)
-         if(EXISTS "/etc/os-release")
-             execute_process(COMMAND cat /etc/os-release
-                             COMMAND grep -m1 NAME
-                             COMMAND awk -F= "{ print $2 }"
-                             COMMAND tr "\n" " "
-                             COMMAND sed "s/ //"
-                             OUTPUT_VARIABLE LINUX_DISTRIBUTION
-                             RESULT_VARIABLE LINUX_ID_RESULT
-             )
-             execute_process(COMMAND cat /etc/os-release
-                             COMMAND grep VERSION_ID
-                             COMMAND awk -F= "{ print $2 }"
-                             COMMAND tr "\n" " "
-                             COMMAND sed "s/ //"
-                             OUTPUT_VARIABLE LINUX_VER
-                             RESULT_VARIABLE LINUX_VER_RESULT
-             )
-             if(${LINUX_DISTRIBUTION} MATCHES "Debian")
-                 set(LINUX_DISTRIBUTION "Debian")
-                 file(READ /etc/debian_version LINUX_VER)
-             endif(${LINUX_DISTRIBUTION} MATCHES "Debian")
-         endif(EXISTS "/etc/os-release")
-     endif(NOT LINUX_DISTRIBUTION)
-     if(NOT LINUX_DISTRIBUTION)
-         if(EXISTS "/etc/redhat-release")
-             set(LINUX_DISTRIBUTION "Red Hat")
-             file (READ /etc/redhat-release LINUX_VER)
-         endif(EXISTS "/etc/redhat-release")
-     endif(NOT LINUX_DISTRIBUTION)
-     if(NOT LINUX_DISTRIBUTION)
-         if(EXISTS "/etc/debian_version")
-             set(LINUX_DISTRIBUTION "Debian")
-             file (READ /etc/debian_version LINUX_VER)
-         endif(EXISTS "/etc/debian_version")
-     endif(NOT LINUX_DISTRIBUTION)
-     if(NOT LINUX_DISTRIBUTION)
-         set(LINUX_DISTRIBUTION "Generic")
-         set(LINUX_VER "Unknown")
-     endif(NOT LINUX_DISTRIBUTION)
-     message(STATUS "Configuring GNSS-SDR v${VERSION} to be built on ${LINUX_DISTRIBUTION} GNU/Linux Release ${LINUX_VER} ${ARCH_}")
+    set(OperatingSystem "Linux")
+    set(OS_IS_LINUX TRUE)
+    if(ARCH_64BITS)
+        set(ARCH_ "(64 bits)")
+    else(ARCH_64BITS)
+        set(ARCH_ "(32 bits)")
+    endif(ARCH_64BITS)
+    if(EXISTS "/etc/lsb-release")
+        execute_process(COMMAND cat /etc/lsb-release
+                    COMMAND grep DISTRIB_ID
+                    COMMAND awk -F= "{ print $2 }"
+                    COMMAND tr "\n" " "
+                    COMMAND sed "s/ //"
+                    OUTPUT_VARIABLE LINUX_DISTRIBUTION
+                    RESULT_VARIABLE LINUX_ID_RESULT
+        )
+        execute_process(COMMAND cat /etc/lsb-release
+                    COMMAND grep DISTRIB_RELEASE
+                    COMMAND awk -F= "{ print $2 }"
+                    COMMAND tr "\n" " "
+                    COMMAND sed "s/ //"
+                    OUTPUT_VARIABLE LINUX_VER
+                    RESULT_VARIABLE LINUX_VER_RESULT
+        )
+    endif(EXISTS "/etc/lsb-release")
+    if(NOT LINUX_DISTRIBUTION)
+        if(EXISTS "/etc/linuxmint/info")
+          set(LINUX_DISTRIBUTION "LinuxMint")
+          execute_process(COMMAND cat /etc/linuxmint/info
+                    COMMAND grep -m1 RELEASE
+                    COMMAND awk -F= "{ print $2 }"
+                    COMMAND tr "\n" " "
+                    COMMAND sed "s/ //"
+                    OUTPUT_VARIABLE LINUX_VER
+                    RESULT_VARIABLE LINUX_VER_RESULT
+          )
+        endif(EXISTS "/etc/linuxmint/info")
+    endif(NOT LINUX_DISTRIBUTION)
+    if(NOT LINUX_DISTRIBUTION)
+        if(EXISTS "/etc/os-release")
+          execute_process(COMMAND cat /etc/os-release
+                    COMMAND grep -m1 NAME
+                    COMMAND awk -F= "{ print $2 }"
+                    COMMAND tr "\n" " "
+                    COMMAND sed "s/ //"
+                    OUTPUT_VARIABLE LINUX_DISTRIBUTION
+                    RESULT_VARIABLE LINUX_ID_RESULT
+          )
+          execute_process(COMMAND cat /etc/os-release
+                    COMMAND grep VERSION_ID
+                    COMMAND awk -F= "{ print $2 }"
+                    COMMAND tr "\n" " "
+                    COMMAND sed "s/ //"
+                    OUTPUT_VARIABLE LINUX_VER
+                    RESULT_VARIABLE LINUX_VER_RESULT
+          )
+          if(${LINUX_DISTRIBUTION} MATCHES "Debian")
+            set(LINUX_DISTRIBUTION "Debian")
+            file(READ /etc/debian_version LINUX_VER)
+          endif(${LINUX_DISTRIBUTION} MATCHES "Debian")
+        endif(EXISTS "/etc/os-release")
+    endif(NOT LINUX_DISTRIBUTION)
+    if(NOT LINUX_DISTRIBUTION)
+        if(EXISTS "/etc/redhat-release")
+          set(LINUX_DISTRIBUTION "Red Hat")
+          file(READ /etc/redhat-release LINUX_VER)
+        endif(EXISTS "/etc/redhat-release")
+    endif(NOT LINUX_DISTRIBUTION)
+    if(NOT LINUX_DISTRIBUTION)
+        if(EXISTS "/etc/debian_version")
+          set(LINUX_DISTRIBUTION "Debian")
+          file(READ /etc/debian_version LINUX_VER)
+        endif(EXISTS "/etc/debian_version")
+    endif(NOT LINUX_DISTRIBUTION)
+    if(NOT LINUX_DISTRIBUTION)
+        set(LINUX_DISTRIBUTION "Generic")
+        set(LINUX_VER "Unknown")
+    endif(NOT LINUX_DISTRIBUTION)
+    message(STATUS "Configuring GNSS-SDR v${VERSION} to be built on ${LINUX_DISTRIBUTION} GNU/Linux Release ${LINUX_VER} ${ARCH_}")
 endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 if(NOT LINUX_DISTRIBUTION)
     set(LINUX_DISTRIBUTION "Unknown")
@@ -225,56 +224,56 @@ endif(NOT LINUX_DISTRIBUTION)
 
 # Detect macOS / Mac OS X Version
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-     set(OperatingSystem "Mac OS X")
-     set(OS_IS_MACOSX TRUE)
-     execute_process(COMMAND uname -v OUTPUT_VARIABLE DARWIN_VERSION)
-     string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION})
-     if(${DARWIN_VERSION} MATCHES "18")
-         set(MACOS_MOJAVE TRUE)
-         set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++14")
-         set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
-         message(STATUS "Configuring GNSS-SDR v${VERSION} to be built on macOS Mojave 10.14")
-     endif(${DARWIN_VERSION} MATCHES "18")
-     if(${DARWIN_VERSION} MATCHES "17")
-         set(MACOS_HIGH_SIERRA TRUE)
-         set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++14")
-         set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
-         message(STATUS "Configuring GNSS-SDR v${VERSION} to be built on macOS High Sierra 10.13")
-     endif(${DARWIN_VERSION} MATCHES "17")
-     if(${DARWIN_VERSION} MATCHES "16")
-         set(MACOS_SIERRA TRUE)
-         set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++14")
-         set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
-         message(STATUS "Configuring GNSS-SDR v${VERSION} to be built on macOS Sierra 10.12")
-     endif(${DARWIN_VERSION} MATCHES "16")
-     if(${DARWIN_VERSION} MATCHES "15")
-         set(MACOSX_EL_CAPITAN TRUE)
-         set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")
-         set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
-         message(STATUS "Configuring GNSS-SDR v${VERSION} to be built on Mac OS X 10.11 El Capitan")
-     endif(${DARWIN_VERSION} MATCHES "15")
-     if(${DARWIN_VERSION} MATCHES "14")
-         set(MACOSX_YOSEMITE TRUE)
-         set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")
-         set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
-         message(STATUS "Configuring GNSS-SDR v${VERSION} to be built on Mac OS X 10.10 Yosemite")
-     endif(${DARWIN_VERSION} MATCHES "14")
-     if(${DARWIN_VERSION} MATCHES "13")
-         set(MACOSX_MAVERICKS TRUE)
-         set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")
-         set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
-         set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION="com.apple.compilers.llvm.clang.1_0")
-         message(STATUS "Configuring GNSS-SDR v${VERSION} to be built on Mac OS X 10.9 Mavericks")
-     endif(${DARWIN_VERSION} MATCHES "13")
-     if(${DARWIN_VERSION} MATCHES "12")
-         message(STATUS "Configuring GNSS-SDR v${VERSION} to be built on Mac OS X 10.8 Mountain Lion")
-     endif(${DARWIN_VERSION} MATCHES "12")
-     if(${DARWIN_VERSION} MATCHES "11")
-         message(STATUS "Configuring GNSS-SDR v${VERSION} to be built on Mac OS X 10.7 Lion")
-     endif(${DARWIN_VERSION} MATCHES "11")
-     if(${DARWIN_VERSION} MATCHES "10")
-         message(STATUS "Configuring GNSS-SDR v${VERSION} to be built on Mac OS X 10.6 Snow Leopard")
-     endif(${DARWIN_VERSION} MATCHES "10")
+    set(OperatingSystem "Mac OS X")
+    set(OS_IS_MACOSX TRUE)
+    execute_process(COMMAND uname -v OUTPUT_VARIABLE DARWIN_VERSION)
+    string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION})
+    if(${DARWIN_VERSION} MATCHES "18")
+        set(MACOS_MOJAVE TRUE)
+        set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++14")
+        set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
+        message(STATUS "Configuring GNSS-SDR v${VERSION} to be built on macOS Mojave 10.14")
+    endif(${DARWIN_VERSION} MATCHES "18")
+    if(${DARWIN_VERSION} MATCHES "17")
+        set(MACOS_HIGH_SIERRA TRUE)
+        set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++14")
+        set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
+        message(STATUS "Configuring GNSS-SDR v${VERSION} to be built on macOS High Sierra 10.13")
+    endif(${DARWIN_VERSION} MATCHES "17")
+    if(${DARWIN_VERSION} MATCHES "16")
+        set(MACOS_SIERRA TRUE)
+        set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++14")
+        set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
+        message(STATUS "Configuring GNSS-SDR v${VERSION} to be built on macOS Sierra 10.12")
+    endif(${DARWIN_VERSION} MATCHES "16")
+    if(${DARWIN_VERSION} MATCHES "15")
+        set(MACOSX_EL_CAPITAN TRUE)
+        set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")
+        set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
+        message(STATUS "Configuring GNSS-SDR v${VERSION} to be built on Mac OS X 10.11 El Capitan")
+    endif(${DARWIN_VERSION} MATCHES "15")
+    if(${DARWIN_VERSION} MATCHES "14")
+        set(MACOSX_YOSEMITE TRUE)
+        set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")
+        set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
+        message(STATUS "Configuring GNSS-SDR v${VERSION} to be built on Mac OS X 10.10 Yosemite")
+    endif(${DARWIN_VERSION} MATCHES "14")
+    if(${DARWIN_VERSION} MATCHES "13")
+        set(MACOSX_MAVERICKS TRUE)
+        set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")
+        set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
+        set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION="com.apple.compilers.llvm.clang.1_0")
+        message(STATUS "Configuring GNSS-SDR v${VERSION} to be built on Mac OS X 10.9 Mavericks")
+    endif(${DARWIN_VERSION} MATCHES "13")
+    if(${DARWIN_VERSION} MATCHES "12")
+        message(STATUS "Configuring GNSS-SDR v${VERSION} to be built on Mac OS X 10.8 Mountain Lion")
+    endif(${DARWIN_VERSION} MATCHES "12")
+    if(${DARWIN_VERSION} MATCHES "11")
+        message(STATUS "Configuring GNSS-SDR v${VERSION} to be built on Mac OS X 10.7 Lion")
+    endif(${DARWIN_VERSION} MATCHES "11")
+    if(${DARWIN_VERSION} MATCHES "10")
+        message(STATUS "Configuring GNSS-SDR v${VERSION} to be built on Mac OS X 10.6 Snow Leopard")
+    endif(${DARWIN_VERSION} MATCHES "10")
 endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 
 # Define extra build types and select Release by default to get optimization flags
@@ -291,36 +290,33 @@ include(GnsssdrBuildTypes)
 #  - O3WithASM: -O3 -g -save-temps
 #  - ASAN: -Wall -Wextra -g -O2 -fsanitize=address -fno-omit-frame-pointer
 if(NOT CMAKE_BUILD_TYPE)
-     if(ENABLE_GPERFTOOLS OR ENABLE_GPROF)
-         set(CMAKE_BUILD_TYPE "RelWithDebInfo")
-         message(STATUS "Build type not specified: defaulting to RelWithDebInfo.")
-     else(ENABLE_GPERFTOOLS OR ENABLE_GPROF)
-         set(CMAKE_BUILD_TYPE "Release")
-         message(STATUS "Build type not specified: defaulting to Release.")
-     endif(ENABLE_GPERFTOOLS OR ENABLE_GPROF)
+    if(ENABLE_GPERFTOOLS OR ENABLE_GPROF)
+        set(CMAKE_BUILD_TYPE "RelWithDebInfo")
+        message(STATUS "Build type not specified: defaulting to RelWithDebInfo.")
+    else(ENABLE_GPERFTOOLS OR ENABLE_GPROF)
+        set(CMAKE_BUILD_TYPE "Release")
+        message(STATUS "Build type not specified: defaulting to Release.")
+    endif(ENABLE_GPERFTOOLS OR ENABLE_GPROF)
 else(NOT CMAKE_BUILD_TYPE)
-     message(STATUS "Build type set to ${CMAKE_BUILD_TYPE}.")
+    message(STATUS "Build type set to ${CMAKE_BUILD_TYPE}.")
 endif(NOT CMAKE_BUILD_TYPE)
 GNSSSDR_CHECK_BUILD_TYPE(${CMAKE_BUILD_TYPE})
 set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "")
 
 # allow 'large' files in 32 bit builds
 if(UNIX)
-    add_definitions( -D_LARGEFILE_SOURCE
-                     -D_FILE_OFFSET_BITS=64
-                     -D_LARGE_FILES
-                   )
+    add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES)
 endif(UNIX)
 
 # Determine if we are using make or ninja
 if(CMAKE_MAKE_PROGRAM MATCHES "make")
-   set(CMAKE_MAKE_PROGRAM_PRETTY_NAME "make")
+    set(CMAKE_MAKE_PROGRAM_PRETTY_NAME "make")
 endif(CMAKE_MAKE_PROGRAM MATCHES "make")
 if(CMAKE_MAKE_PROGRAM MATCHES "ninja")
-   set(CMAKE_MAKE_PROGRAM_PRETTY_NAME "ninja")
+    set(CMAKE_MAKE_PROGRAM_PRETTY_NAME "ninja")
 endif(CMAKE_MAKE_PROGRAM MATCHES "ninja")
 if(NOT CMAKE_MAKE_PROGRAM_PRETTY_NAME)
-   set(CMAKE_MAKE_PROGRAM_PRETTY_NAME "${CMAKE_MAKE_PROGRAM}")
+    set(CMAKE_MAKE_PROGRAM_PRETTY_NAME "${CMAKE_MAKE_PROGRAM}")
 endif(NOT CMAKE_MAKE_PROGRAM_PRETTY_NAME)
 
 
@@ -354,16 +350,18 @@ set(GNSSSDR_GPSTK_LOCAL_VERSION "2.10.6")
 set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.13")
 set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.9")
 
-if(CMAKE_VERSION VERSION_LESS "3.0.2")
-   set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.1")
+if(CMAKE_VERSION VERSION_LESS "3.0.2") # Fix for CentOS 7
+    set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.1")
 endif(CMAKE_VERSION VERSION_LESS "3.0.2")
 
+
+
 ################################################################################
-# Check cmake version
+# Check CMake version
 ################################################################################
 if(CMAKE_VERSION VERSION_LESS ${GNSSSDR_CMAKE_MIN_VERSION})
-      message(STATUS "Your CMake version is too old and does not support some features required by GNSS-SDR. CMake version must be at least ${GNSSSDR_CMAKE_MIN_VERSION}.") # For more information check https://github.com/joakimkarlsson/bandit/issues/40
-      message(FATAL_ERROR "Fatal error: CMake >= ${GNSSSDR_CMAKE_MIN_VERSION} required.")
+    message(STATUS "Your CMake version is too old and does not support some features required by GNSS-SDR. CMake version must be at least ${GNSSSDR_CMAKE_MIN_VERSION}.")
+    message(FATAL_ERROR "Fatal error: CMake >= ${GNSSSDR_CMAKE_MIN_VERSION} required.")
 endif(CMAKE_VERSION VERSION_LESS ${GNSSSDR_CMAKE_MIN_VERSION})
 
 
@@ -372,10 +370,10 @@ endif(CMAKE_VERSION VERSION_LESS ${GNSSSDR_CMAKE_MIN_VERSION})
 # Check compiler version
 ################################################################################
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-      if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${GNSSSDR_GCC_MIN_VERSION})
-          message(STATUS "Your GCC version is too old and does not support some C++ features required by GNSS-SDR. GCC version must be at least ${GNSSSDR_GCC_MIN_VERSION}")
-          message(FATAL_ERROR "Fatal error: GCC >= ${GNSSSDR_GCC_MIN_VERSION} required.")
-      endif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${GNSSSDR_GCC_MIN_VERSION})
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${GNSSSDR_GCC_MIN_VERSION})
+        message(STATUS "Your GCC version is too old and does not support some C++ features required by GNSS-SDR. GCC version must be at least ${GNSSSDR_GCC_MIN_VERSION}")
+        message(FATAL_ERROR "Fatal error: GCC >= ${GNSSSDR_GCC_MIN_VERSION} required.")
+    endif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${GNSSSDR_GCC_MIN_VERSION})
 endif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -387,20 +385,20 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         # output is in error stream
         string(REGEX MATCH "^Apple.*" IS_APPLE ${_err})
         if("${IS_APPLE}" STREQUAL "")
-            set(MIN_VERSION ${GNSSSDR_CLANG_MIN_VERSION})
-            set(APPLE_STR "")
-            # retrieve the compiler's version from it
-            string(REGEX MATCH "clang version [0-9.]+" CLANG_OTHER_VERSION ${_err})
-            string(REGEX MATCH "[0-9.]+" CLANG_VERSION ${CLANG_OTHER_VERSION})
+          set(MIN_VERSION ${GNSSSDR_CLANG_MIN_VERSION})
+          set(APPLE_STR "")
+          # retrieve the compiler's version from it
+          string(REGEX MATCH "clang version [0-9.]+" CLANG_OTHER_VERSION ${_err})
+          string(REGEX MATCH "[0-9.]+" CLANG_VERSION ${CLANG_OTHER_VERSION})
         else("${IS_APPLE}" STREQUAL "")
-            set(MIN_VERSION ${GNSSSDR_APPLECLANG_MIN_VERSION})
-            set(APPLE_STR "Apple ")
-            # retrieve the compiler's version from it
-            string(REGEX MATCH "(clang-[0-9.]+)" CLANG_APPLE_VERSION ${_err})
-            string(REGEX MATCH "[0-9.]+" CLANG_VERSION ${CLANG_APPLE_VERSION})
+          set(MIN_VERSION ${GNSSSDR_APPLECLANG_MIN_VERSION})
+          set(APPLE_STR "Apple ")
+          # retrieve the compiler's version from it
+          string(REGEX MATCH "(clang-[0-9.]+)" CLANG_APPLE_VERSION ${_err})
+          string(REGEX MATCH "[0-9.]+" CLANG_VERSION ${CLANG_APPLE_VERSION})
         endif("${IS_APPLE}" STREQUAL "")
         if(${CLANG_VERSION} VERSION_LESS "${MIN_VERSION}")
-            message(WARNING "\nThe compiler selected to build GNSS-SDR (${APPLE_STR}Clang version ${CLANG_VERSION} : ${CMAKE_CXX_COMPILER}) is older than that officially supported (${MIN_VERSION} minimum). This build may or not work. We highly recommend using Apple Clang version ${APPLECLANG_MIN_VERSION} or more recent, or Clang version ${CLANG_MIN_VERSION} or more recent.")
+          message(WARNING "\nThe compiler selected to build GNSS-SDR (${APPLE_STR}Clang version ${CLANG_VERSION} : ${CMAKE_CXX_COMPILER}) is older than that officially supported (${MIN_VERSION} minimum). This build may or not work. We highly recommend using Apple Clang version ${APPLECLANG_MIN_VERSION} or more recent, or Clang version ${CLANG_MIN_VERSION} or more recent.")
         endif(${CLANG_VERSION} VERSION_LESS "${MIN_VERSION}")
     else(${_res} STREQUAL "0")
         message(WARNING "\nCannot determine the version of the compiler selected to build GNSS-SDR (${APPLE_STR}Clang : ${CMAKE_CXX_COMPILER}). This build may or not work. We highly recommend using Apple Clang version ${APPLECLANG_MIN_VERSION} or more recent, or Clang version ${CLANG_MIN_VERSION} or more recent.")
@@ -426,7 +424,7 @@ endif(NOT OS_IS_MACOSX)
 # Check for availability of SSE
 ################################################################################
 if(NOT ENABLE_GENERIC_ARCH)
-     include(TestForSSE)
+    include(TestForSSE)
 endif(NOT ENABLE_GENERIC_ARCH)
 
 
@@ -461,21 +459,21 @@ if(ENABLE_UNIT_TESTING OR ENABLE_SYSTEM_TESTING)
     if(GTEST_DIR)
         message(STATUS "Googletest root folder set at ${GTEST_DIR}")
         find_path(LIBGTEST_DEV_DIR NAMES src/gtest-all.cc PATHS ${GTEST_DIR})
-        if(LIBGTEST_DEV_DIR)
-            message (STATUS "Googletest has been found.")
-        else(LIBGTEST_DEV_DIR)
-            message (FATAL_ERROR " Googletest source code has not been found at ${GTEST_DIR}.")
-        endif(LIBGTEST_DEV_DIR)
+          if(LIBGTEST_DEV_DIR)
+              message(STATUS "Googletest has been found.")
+          else(LIBGTEST_DEV_DIR)
+              message(FATAL_ERROR " Googletest source code has not been found at ${GTEST_DIR}.")
+          endif(LIBGTEST_DEV_DIR)
         find_path(GTEST_INCLUDE_DIRS NAMES gtest/gtest.h PATHS ${GTEST_DIR}/include)
     else(GTEST_DIR)
-        find_path(LIBGTEST_DEV_DIR NAMES src/gtest-all.cc PATHS /usr/src/googletest/googletest /usr/src/gtest /usr/include/gtest /opt/local/src/gtest-1.7.0 )
+        find_path(LIBGTEST_DEV_DIR NAMES src/gtest-all.cc PATHS /usr/src/googletest/googletest /usr/src/gtest /usr/include/gtest /opt/local/src/gtest-1.7.0)
         find_path(GTEST_INCLUDE_DIRS NAMES gtest/gtest.h PATHS /usr/include /opt/local/src/gtest-1.7.0/include)
         if(LIBGTEST_DEV_DIR)
-            message (STATUS "Googletest package has been found.")
+          message(STATUS "Googletest package has been found.")
         else(LIBGTEST_DEV_DIR)
-            message (STATUS " Googletest has not been found.")
-            message (STATUS " Googletest v${GNSSSDR_GTEST_LOCAL_VERSION} will be downloaded and built automatically ")
-            message (STATUS " when doing '${CMAKE_MAKE_PROGRAM_PRETTY_NAME}'. ")
+          message(STATUS " Googletest has not been found.")
+          message(STATUS " Googletest v${GNSSSDR_GTEST_LOCAL_VERSION} will be downloaded and built automatically ")
+          message(STATUS " when doing '${CMAKE_MAKE_PROGRAM_PRETTY_NAME}'. ")
         endif(LIBGTEST_DEV_DIR)
     endif(GTEST_DIR)
 endif(ENABLE_UNIT_TESTING OR ENABLE_SYSTEM_TESTING)
@@ -496,12 +494,13 @@ set(Boost_ADDITIONAL_VERSIONS
     "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"
     "1.70.0" "1.70" "1.71.0" "1.71" "1.72.0" "1.72" "1.73.0" "1.73" "1.74.0" "1.74"
     "1.75.0" "1.75" "1.76.0" "1.76" "1.77.0" "1.77" "1.78.0" "1.78" "1.79.0" "1.79"
+    "1.80.0" "1.80" "1.81.0" "1.81" "1.82.0" "1.82" "1.83.0" "1.83" "1.84.0" "1.84"
 )
 set(Boost_USE_MULTITHREAD ON)
 set(Boost_USE_STATIC_LIBS OFF)
 find_package(Boost COMPONENTS date_time system filesystem thread serialization chrono REQUIRED)
 if(NOT Boost_FOUND)
-     message(FATAL_ERROR "Fatal error: Boost (version >=${GNSSSDR_BOOST_MIN_VERSION}) required.")
+    message(FATAL_ERROR "Fatal error: Boost (version >=${GNSSSDR_BOOST_MIN_VERSION}) required.")
 endif(NOT Boost_FOUND)
 
 
@@ -512,25 +511,25 @@ endif(NOT Boost_FOUND)
 set(GR_REQUIRED_COMPONENTS RUNTIME ANALOG BLOCKS FFT FILTER PMT)
 find_package(Gnuradio)
 if(PC_GNURADIO_RUNTIME_VERSION)
-   if(PC_GNURADIO_RUNTIME_VERSION VERSION_LESS ${GNSSSDR_GNURADIO_MIN_VERSION})
-       set(GNURADIO_RUNTIME_FOUND)
-       message(STATUS "The GNU Radio version installed in your system is too old.")
-   endif(PC_GNURADIO_RUNTIME_VERSION VERSION_LESS ${GNSSSDR_GNURADIO_MIN_VERSION})
+    if(PC_GNURADIO_RUNTIME_VERSION VERSION_LESS ${GNSSSDR_GNURADIO_MIN_VERSION})
+        set(GNURADIO_RUNTIME_FOUND)
+        message(STATUS "The GNU Radio version installed in your system is too old.")
+    endif(PC_GNURADIO_RUNTIME_VERSION VERSION_LESS ${GNSSSDR_GNURADIO_MIN_VERSION})
 endif(PC_GNURADIO_RUNTIME_VERSION)
 if(NOT GNURADIO_RUNTIME_FOUND)
-   message(STATUS "CMake cannot find GNU Radio >= ${GNSSSDR_GNURADIO_MIN_VERSION}")
-   if(OS_IS_LINUX)
-       message("Go to https://github.com/gnuradio/pybombs")
-       message("and follow the instructions to install GNU Radio in your system.")
-       message(FATAL_ERROR "GNU Radio ${GNSSSDR_GNURADIO_MIN_VERSION} or later is required to build gnss-sdr")
-   endif(OS_IS_LINUX)
-   if(OS_IS_MACOSX)
-       message("You can install it easily via Macports:")
-       message("  sudo port install gnuradio ")
-       message("Alternatively, you can use homebrew:")
-       message("  brew install gnuradio" )
-       message(FATAL_ERROR "GNU Radio ${GNSSSDR_GNURADIO_MIN_VERSION} or later is required to build gnss-sdr")
-   endif(OS_IS_MACOSX)
+    message(STATUS "CMake cannot find GNU Radio >= ${GNSSSDR_GNURADIO_MIN_VERSION}")
+    if(OS_IS_LINUX)
+      message("Go to https://github.com/gnuradio/pybombs")
+      message("and follow the instructions to install GNU Radio in your system.")
+      message(FATAL_ERROR "GNU Radio ${GNSSSDR_GNURADIO_MIN_VERSION} or later is required to build gnss-sdr")
+    endif(OS_IS_LINUX)
+    if(OS_IS_MACOSX)
+      message("You can install it easily via Macports:")
+      message("  sudo port install gnuradio ")
+      message("Alternatively, you can use homebrew:")
+      message("  brew install gnuradio")
+      message(FATAL_ERROR "GNU Radio ${GNSSSDR_GNURADIO_MIN_VERSION} or later is required to build gnss-sdr")
+    endif(OS_IS_MACOSX)
 endif(NOT GNURADIO_RUNTIME_FOUND)
 
 if(NOT GNURADIO_ANALOG_FOUND)
@@ -598,11 +597,11 @@ if(NOT VOLK_GNSSSDR_FOUND)
         message(STATUS "Mako template library not found. See http://www.makotemplates.org/ ")
         message(STATUS " You can try to install it by typing:")
         if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
-            message(STATUS " sudo yum install ${PYTHON_NAME}-mako")
+          message(STATUS " sudo yum install ${PYTHON_NAME}-mako")
         elseif(${LINUX_DISTRIBUTION} MATCHES "openSUSE")
-            message(STATUS " sudo zypper install ${PYTHON_NAME}-Mako")
+          message(STATUS " sudo zypper install ${PYTHON_NAME}-Mako")
         else(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
-            message(STATUS " sudo apt-get install ${PYTHON_NAME}-mako")
+          message(STATUS " sudo apt-get install ${PYTHON_NAME}-mako")
         endif(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
         message(FATAL_ERROR "Mako templates required to build VOLK_GNSSSDR")
     endif(NOT MAKO_FOUND)
@@ -612,11 +611,11 @@ if(NOT VOLK_GNSSSDR_FOUND)
         message(STATUS "python-six not found. See https://pythonhosted.org/six/ ")
         message(STATUS " You can try to install it by typing:")
         if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
-            message(STATUS " sudo yum install ${PYTHON_NAME}-six")
+          message(STATUS " sudo yum install ${PYTHON_NAME}-six")
         elseif(${LINUX_DISTRIBUTION} MATCHES "openSUSE")
-            message(STATUS " sudo zypper install ${PYTHON_NAME}-six")
+          message(STATUS " sudo zypper install ${PYTHON_NAME}-six")
         else(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
-            message(STATUS " sudo apt-get install ${PYTHON_NAME}-six")
+          message(STATUS " sudo apt-get install ${PYTHON_NAME}-six")
         endif(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
         message(FATAL_ERROR "six - python 2 and 3 compatibility library required to build VOLK_GNSSSDR")
     endif(NOT SIX_FOUND)
@@ -624,10 +623,10 @@ if(NOT VOLK_GNSSSDR_FOUND)
     set(READ_ENVIRO "")
     if(ENABLE_PACKAGING)
         if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
-            set(STRIP_VOLK_GNSSSDR_PROFILE "-DENABLE_STRIP=ON -DCMAKE_VERBOSE_MAKEFILE=ON")
+          set(STRIP_VOLK_GNSSSDR_PROFILE "-DENABLE_STRIP=ON -DCMAKE_VERBOSE_MAKEFILE=ON")
         endif((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
         if(NOT DEFINED ENV{PROTECT_PASSWORDS})
-            set(READ_ENVIRO ${CMAKE_COMMAND} -E environment)
+          set(READ_ENVIRO ${CMAKE_COMMAND} -E environment)
         endif(NOT DEFINED ENV{PROTECT_PASSWORDS})
     endif(ENABLE_PACKAGING)
 
@@ -637,7 +636,7 @@ if(NOT VOLK_GNSSSDR_FOUND)
     endif(PYTHON_EXECUTABLE)
     if(OS_IS_MACOSX)
         if(CMAKE_GENERATOR STREQUAL Xcode)
-            set(VOLK_GNSSSDR_BUILD_COMMAND "xcodebuild" "-configuration" "Debug" "-target")
+          set(VOLK_GNSSSDR_BUILD_COMMAND "xcodebuild" "-configuration" "Debug" "-target")
         endif(CMAKE_GENERATOR STREQUAL Xcode)
     endif(OS_IS_MACOSX)
 
@@ -647,49 +646,49 @@ if(NOT VOLK_GNSSSDR_FOUND)
         set(VOLK_GNSSSDR_COMPILER -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
     endif(CMAKE_CROSSCOMPILING)
     set(VOLK_GNSSSDR_CMAKE_ARGS ${VOLK_GNSSSDR_COMPILER}
-                                -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install
-                                -DENABLE_STATIC_LIBS=ON
-                                -DENABLE_PROFILING=${ENABLE_PROFILING}
-                                -DCMAKE_INCLUDE_PATH=${Boost_INCLUDE_DIR}
-                                -DENABLE_ORC=OFF
-                                ${STRIP_VOLK_GNSSSDR_PROFILE}
-                                ${USE_THIS_PYTHON} )
+        -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install
+        -DENABLE_STATIC_LIBS=ON
+        -DENABLE_PROFILING=${ENABLE_PROFILING}
+        -DCMAKE_INCLUDE_PATH=${Boost_INCLUDE_DIR}
+        -DENABLE_ORC=OFF
+        ${STRIP_VOLK_GNSSSDR_PROFILE}
+        ${USE_THIS_PYTHON})
     if(EXISTS $ENV{OECORE_TARGET_SYSROOT})
         set(VOLK_GNSSSDR_CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS}
-                                    -DCMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_SOURCE_DIR}/cmake/Toolchains/oe-sdk_cross.cmake
-                                    -DCROSSCOMPILE_MULTILIB=TRUE )
+            -DCMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_SOURCE_DIR}/cmake/Toolchains/oe-sdk_cross.cmake
+            -DCROSSCOMPILE_MULTILIB=TRUE)
     endif(EXISTS $ENV{OECORE_TARGET_SYSROOT})
     if(CMAKE_VERSION VERSION_LESS 3.2)
-       ExternalProject_Add(volk_gnsssdr_module
-         PREFIX ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module
-         SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr
-         BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/build
-         CMAKE_ARGS ${READ_ENVIRO} ${VOLK_GNSSSDR_CMAKE_ARGS}
-         DOWNLOAD_COMMAND ""
-         UPDATE_COMMAND ""
-         PATCH_COMMAND ""
-         BUILD_COMMAND ${READ_ENVIRO} ${VOLK_GNSSSDR_BUILD_COMMAND} volk_gnsssdr_profile
-         INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install
-         )
+      ExternalProject_Add(volk_gnsssdr_module
+        PREFIX ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module
+        SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr
+        BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/build
+        CMAKE_ARGS ${READ_ENVIRO} ${VOLK_GNSSSDR_CMAKE_ARGS}
+        DOWNLOAD_COMMAND ""
+        UPDATE_COMMAND ""
+        PATCH_COMMAND ""
+        BUILD_COMMAND ${READ_ENVIRO} ${VOLK_GNSSSDR_BUILD_COMMAND} volk_gnsssdr_profile
+        INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install
+        )
     else(CMAKE_VERSION VERSION_LESS 3.2)
-       ExternalProject_Add(volk_gnsssdr_module
-         PREFIX ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module
-         SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr
-         BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/build
-         CMAKE_ARGS ${READ_ENVIRO} ${VOLK_GNSSSDR_CMAKE_ARGS}
-         DOWNLOAD_COMMAND ""
-         UPDATE_COMMAND ""
-         PATCH_COMMAND ""
-         BUILD_COMMAND ${READ_ENVIRO} ${VOLK_GNSSSDR_BUILD_COMMAND} volk_gnsssdr_profile
-         BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}volk_gnsssdr${CMAKE_STATIC_LIBRARY_SUFFIX}
-                          ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install/bin/volk_gnsssdr_profile
-         INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install
-         )
+      ExternalProject_Add(volk_gnsssdr_module
+        PREFIX ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module
+        SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr
+        BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/build
+        CMAKE_ARGS ${READ_ENVIRO} ${VOLK_GNSSSDR_CMAKE_ARGS}
+        DOWNLOAD_COMMAND ""
+        UPDATE_COMMAND ""
+        PATCH_COMMAND ""
+        BUILD_COMMAND ${READ_ENVIRO} ${VOLK_GNSSSDR_BUILD_COMMAND} volk_gnsssdr_profile
+        BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}volk_gnsssdr${CMAKE_STATIC_LIBRARY_SUFFIX}
+            ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install/bin/volk_gnsssdr_profile
+        INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install
+        )
     endif(CMAKE_VERSION VERSION_LESS 3.2)
     find_package(ORC)
     if(NOT ORC_FOUND)
-         set(ORC_LIBRARIES "")
-         set(ORC_INCLUDE_DIRS "")
+        set(ORC_LIBRARIES "")
+        set(ORC_INCLUDE_DIRS "")
     endif(NOT ORC_FOUND)
 
     add_library(volk_gnsssdr UNKNOWN IMPORTED)
@@ -698,13 +697,13 @@ if(NOT VOLK_GNSSSDR_FOUND)
     set(VOLK_GNSSSDR_LIBRARIES volk_gnsssdr ${ORC_LIBRARIES})
 
     if(CMAKE_VERSION VERSION_LESS 3.2)
-      add_custom_command(TARGET volk_gnsssdr_module POST_BUILD
+    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
-                ${CMAKE_SOURCE_DIR}/install/volk_gnsssdr_profile)
+        ${CMAKE_SOURCE_DIR}/install/volk_gnsssdr_profile)
     else(CMAKE_VERSION VERSION_LESS 3.2)
-      add_custom_command(TARGET volk_gnsssdr_module POST_BUILD
+    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
-                ${CMAKE_SOURCE_DIR}/install/volk_gnsssdr_profile
+            ${CMAKE_SOURCE_DIR}/install/volk_gnsssdr_profile
         BYPRODUCTS ${CMAKE_SOURCE_DIR}/install/volk_gnsssdr_profile)
     endif(CMAKE_VERSION VERSION_LESS 3.2)
 
@@ -720,57 +719,57 @@ endif(NOT VOLK_GNSSSDR_FOUND)
 ################################################################################
 set(LOCAL_GFLAGS false)
 find_package(GFlags)
-if (NOT GFlags_FOUND)
-     message (STATUS " gflags library has not been found.")
-     message (STATUS " gflags v${GNSSSDR_GFLAGS_LOCAL_VERSION} will be downloaded and built automatically ")
-     message (STATUS " when doing 'make'. ")
+if(NOT GFlags_FOUND)
+    message(STATUS " gflags library has not been found.")
+    message(STATUS " gflags v${GNSSSDR_GFLAGS_LOCAL_VERSION} will be downloaded and built automatically ")
+    message(STATUS " when doing 'make'. ")
 
-     if(CMAKE_VERSION VERSION_LESS 3.2)
-          ExternalProject_Add(
-          gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}
-          PREFIX ${CMAKE_CURRENT_BINARY_DIR}/gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}
-          GIT_REPOSITORY git://github.com/gflags/gflags.git
-          GIT_TAG v${GNSSSDR_GFLAGS_LOCAL_VERSION}
-          SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags/gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}
-          BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}
-          CMAKE_ARGS -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON -DBUILD_gflags_nothreads_LIB=OFF -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-          BUILD_COMMAND ${CMAKE_MAKE_PROGRAM}
-          UPDATE_COMMAND ""
-          PATCH_COMMAND ""
-          INSTALL_COMMAND ""
-     )
-     else(CMAKE_VERSION VERSION_LESS 3.2)
-     ExternalProject_Add(
-          gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}
-          PREFIX ${CMAKE_CURRENT_BINARY_DIR}/gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}
-          GIT_REPOSITORY git://github.com/gflags/gflags.git
-          GIT_TAG v${GNSSSDR_GFLAGS_LOCAL_VERSION}
-          SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags/gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}
-          BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}
-          CMAKE_ARGS -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON -DBUILD_gflags_nothreads_LIB=OFF -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-          BUILD_COMMAND ${CMAKE_MAKE_PROGRAM}
-          BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gflags${CMAKE_STATIC_LIBRARY_SUFFIX}
-          UPDATE_COMMAND ""
-          PATCH_COMMAND ""
-          INSTALL_COMMAND ""
-     )
-     endif(CMAKE_VERSION VERSION_LESS 3.2)
+    if(CMAKE_VERSION VERSION_LESS 3.2)
+        ExternalProject_Add(
+        gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}
+        PREFIX ${CMAKE_CURRENT_BINARY_DIR}/gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}
+        GIT_REPOSITORY git://github.com/gflags/gflags.git
+        GIT_TAG v${GNSSSDR_GFLAGS_LOCAL_VERSION}
+        SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags/gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}
+        BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}
+        CMAKE_ARGS -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON -DBUILD_gflags_nothreads_LIB=OFF -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+        BUILD_COMMAND ${CMAKE_MAKE_PROGRAM}
+        UPDATE_COMMAND ""
+        PATCH_COMMAND ""
+        INSTALL_COMMAND ""
+    )
+    else(CMAKE_VERSION VERSION_LESS 3.2)
+    ExternalProject_Add(
+        gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}
+        PREFIX ${CMAKE_CURRENT_BINARY_DIR}/gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}
+        GIT_REPOSITORY git://github.com/gflags/gflags.git
+        GIT_TAG v${GNSSSDR_GFLAGS_LOCAL_VERSION}
+        SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags/gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}
+        BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}
+        CMAKE_ARGS -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON -DBUILD_gflags_nothreads_LIB=OFF -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+        BUILD_COMMAND ${CMAKE_MAKE_PROGRAM}
+        BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gflags${CMAKE_STATIC_LIBRARY_SUFFIX}
+        UPDATE_COMMAND ""
+        PATCH_COMMAND ""
+        INSTALL_COMMAND ""
+    )
+    endif(CMAKE_VERSION VERSION_LESS 3.2)
 
-     set(GFlags_INCLUDE_DIRS
-          ${CMAKE_CURRENT_BINARY_DIR}/gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}/include CACHE PATH "Local Gflags headers"
-     )
+    set(GFlags_INCLUDE_DIRS
+        ${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})
-     set(LOCAL_GFLAGS true CACHE STRING "GFlags downloaded and built automatically" FORCE)
+    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})
+    set(LOCAL_GFLAGS true CACHE STRING "GFlags downloaded and built automatically" FORCE)
 endif(NOT GFlags_FOUND)
 
 
@@ -779,34 +778,34 @@ endif(NOT GFlags_FOUND)
 # glog - https://github.com/google/glog
 ################################################################################
 if(NOT ${ENABLE_OWN_GLOG})
-     find_package(GLOG)
-     if(GLOG_INCLUDE_DIRS)
+    find_package(GLOG)
+    if(GLOG_INCLUDE_DIRS)
         set(GLOG_FOUND ON)
-     endif(GLOG_INCLUDE_DIRS)
+    endif(GLOG_INCLUDE_DIRS)
 endif(NOT ${ENABLE_OWN_GLOG})
 set(glog_RELEASE ${GNSSSDR_GLOG_LOCAL_VERSION})
-if (NOT GLOG_FOUND OR ${LOCAL_GFLAGS})
-     message (STATUS " glog library has not been found")
-     if(NOT GFlags_FOUND)
-          message(STATUS " or it is likely not linked to gflags.")
-     endif(NOT GFlags_FOUND)
-     message (STATUS " glog v${GNSSSDR_GLOG_LOCAL_VERSION} will be downloaded and built automatically ")
-     message (STATUS " when doing 'make'. ")
-     if(NOT ${LOCAL_GFLAGS})
-         add_library(gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION} UNKNOWN IMPORTED)
-         set_property(TARGET gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION} PROPERTY IMPORTED_LOCATION "${GFlags_LIBS}")
-     endif(NOT ${LOCAL_GFLAGS})
-     set(TARGET_GFLAGS gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION})
-     if(${LOCAL_GFLAGS})
-         set(GFLAGS_LIBRARIES_TO_LINK ${GFlags_SHARED_LIBS})
-         set(GFLAGS_LIBRARY_DIR_TO_LINK ${CMAKE_CURRENT_BINARY_DIR}/gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}/lib)
-     else(${LOCAL_GFLAGS})
-         set(GFLAGS_LIBRARIES_TO_LINK ${GFlags_LIBS})
-         set(GFLAGS_LIBRARY_DIR_TO_LINK ${GFlags_LIBRARY_DIRS})
-     endif(${LOCAL_GFLAGS})
+if(NOT GLOG_FOUND OR ${LOCAL_GFLAGS})
+    message(STATUS " glog library has not been found")
+    if(NOT GFlags_FOUND)
+        message(STATUS " or it is likely not linked to gflags.")
+    endif(NOT GFlags_FOUND)
+    message(STATUS " glog v${GNSSSDR_GLOG_LOCAL_VERSION} will be downloaded and built automatically ")
+    message(STATUS " when doing 'make'. ")
+    if(NOT ${LOCAL_GFLAGS})
+        add_library(gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION} UNKNOWN IMPORTED)
+        set_property(TARGET gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION} PROPERTY IMPORTED_LOCATION "${GFlags_LIBS}")
+    endif(NOT ${LOCAL_GFLAGS})
+    set(TARGET_GFLAGS gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION})
+    if(${LOCAL_GFLAGS})
+        set(GFLAGS_LIBRARIES_TO_LINK ${GFlags_SHARED_LIBS})
+        set(GFLAGS_LIBRARY_DIR_TO_LINK ${CMAKE_CURRENT_BINARY_DIR}/gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}/lib)
+    else(${LOCAL_GFLAGS})
+        set(GFLAGS_LIBRARIES_TO_LINK ${GFlags_LIBS})
+        set(GFLAGS_LIBRARY_DIR_TO_LINK ${GFlags_LIBRARY_DIRS})
+    endif(${LOCAL_GFLAGS})
 
-     if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-         file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/tmp/configure_with_gflags
+    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+        file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/tmp/configure_with_gflags
 "#!/bin/sh
 export CPPFLAGS=-I${GFlags_INCLUDE_DIRS}
 export LDFLAGS=-L${GFLAGS_LIBRARY_DIR_TO_LINK}
@@ -821,8 +820,8 @@ autoreconf -vfi
 cd ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}
 ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/configure")
 
-      else(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-             file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/tmp/configure_with_gflags
+    else(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+        file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/tmp/configure_with_gflags
 "#!/bin/sh
 export CPPFLAGS=-I${GFlags_INCLUDE_DIRS}
 export LDFLAGS=-L${GFLAGS_LIBRARY_DIR_TO_LINK}
@@ -833,97 +832,96 @@ automake --add-missing
 autoreconf -vfi
 cd ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}
 ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/configure")
+    endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 
-     endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    file(COPY ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/tmp/configure_with_gflags
+        DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}
+        FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
+                      GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 
-     file(COPY ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/tmp/configure_with_gflags
-          DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}
-          FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
-                           GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+    set(GLOG_CONFIGURE ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/configure_with_gflags)
 
-     set(GLOG_CONFIGURE ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/configure_with_gflags)
+    # Ensure that aclocal and libtool are present
+    if(OS_IS_LINUX)
+        if(EXISTS "/usr/bin/libtoolize")
+          if(EXISTS "/usr/bin/aclocal" OR EXISTS "/usr/bin/aclocal-1.16" OR EXISTS "/usr/bin/aclocal-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.13" OR EXISTS "/usr/bin/aclocal-1.11"  OR EXISTS "/usr/bin/aclocal-1.10")
+              # Everything ok, we can move on
+          else(EXISTS "/usr/bin/aclocal" OR EXISTS "/usr/bin/aclocal-1.16" OR EXISTS "/usr/bin/aclocal-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.13" OR EXISTS "/usr/bin/aclocal-1.11"  OR EXISTS "/usr/bin/aclocal-1.10")
+              message(" aclocal has not been found.")
+              message(" You can try to install it by typing:")
+              if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
+                  message(" sudo yum groupinstall 'Development Tools'")
+              elseif(${LINUX_DISTRIBUTION} MATCHES "openSUSE")
+                  message(" sudo zypper install automake")
+              else(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
+                  message(" sudo apt-get install automake")
+              endif(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
+              message(FATAL_ERROR "aclocal is required to build glog from source")
+          endif(EXISTS "/usr/bin/aclocal" OR EXISTS "/usr/bin/aclocal-1.16" OR EXISTS "/usr/bin/aclocal-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.13" OR EXISTS "/usr/bin/aclocal-1.11"  OR EXISTS "/usr/bin/aclocal-1.10")
+        else(EXISTS "/usr/bin/libtoolize")
+            message(" libtool has not been found.")
+            message(" You can try to install it by typing:")
+            if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
+              message(" sudo yum groupinstall 'Development Tools'")
+            elseif(${LINUX_DISTRIBUTION} MATCHES "openSUSE")
+              message(" sudo zypper install libtoool")
+            else(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
+              message(" sudo apt-get install libtool")
+            endif(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
+            message(FATAL_ERROR "libtool is required to build glog from source")
+        endif(EXISTS "/usr/bin/libtoolize")
+    endif(OS_IS_LINUX)
 
-     # Ensure that aclocal and libtool are present
-     if(OS_IS_LINUX)
-         if(EXISTS "/usr/bin/libtoolize")
-             if(EXISTS "/usr/bin/aclocal" OR EXISTS "/usr/bin/aclocal-1.16" OR EXISTS "/usr/bin/aclocal-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.13" OR EXISTS "/usr/bin/aclocal-1.11"  OR EXISTS "/usr/bin/aclocal-1.10")
-                 # Everything ok, we can move on
-             else(EXISTS "/usr/bin/aclocal" OR EXISTS "/usr/bin/aclocal-1.16" OR EXISTS "/usr/bin/aclocal-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.13" OR EXISTS "/usr/bin/aclocal-1.11"  OR EXISTS "/usr/bin/aclocal-1.10")
-                 message(" aclocal has not been found.")
-                 message(" You can try to install it by typing:")
-                 if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
-                      message(" sudo yum groupinstall 'Development Tools'")
-                 elseif(${LINUX_DISTRIBUTION} MATCHES "openSUSE")
-                      message(" sudo zypper install automake")
-                 else(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
-                      message(" sudo apt-get install automake")
-                 endif(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
-                 message(FATAL_ERROR "aclocal is required to build glog from source")
-             endif(EXISTS "/usr/bin/aclocal" OR EXISTS "/usr/bin/aclocal-1.16" OR EXISTS "/usr/bin/aclocal-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.13" OR EXISTS "/usr/bin/aclocal-1.11"  OR EXISTS "/usr/bin/aclocal-1.10")
-         else(EXISTS "/usr/bin/libtoolize")
-             message(" libtool has not been found.")
-             message(" You can try to install it by typing:")
-             if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
-                 message(" sudo yum groupinstall 'Development Tools'")
-             elseif(${LINUX_DISTRIBUTION} MATCHES "openSUSE")
-                 message(" sudo zypper install libtoool")
-             else(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
-                 message(" sudo apt-get install libtool")
-             endif(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
-             message(FATAL_ERROR "libtool is required to build glog from source")
-         endif(EXISTS "/usr/bin/libtoolize")
-     endif(OS_IS_LINUX)
+    if(CMAKE_VERSION VERSION_LESS 3.2)
+        ExternalProject_Add(
+            glog-${GNSSSDR_GLOG_LOCAL_VERSION}
+            DEPENDS ${TARGET_GFLAGS}
+            PREFIX ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}
+            GIT_REPOSITORY https://github.com/google/glog/
+            GIT_TAG v${GNSSSDR_GLOG_LOCAL_VERSION}
+            SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}
+            BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}
+            CONFIGURE_COMMAND ${GLOG_CONFIGURE} --prefix=<INSTALL_DIR>
+            BUILD_COMMAND "${CMAKE_MAKE_PROGRAM}"
+            UPDATE_COMMAND ""
+            PATCH_COMMAND ""
+            INSTALL_COMMAND ""
+        )
+    else(CMAKE_VERSION VERSION_LESS 3.2)
+        ExternalProject_Add(
+            glog-${GNSSSDR_GLOG_LOCAL_VERSION}
+            DEPENDS ${TARGET_GFLAGS}
+            PREFIX ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}
+            GIT_REPOSITORY https://github.com/google/glog/
+            GIT_TAG v${GNSSSDR_GLOG_LOCAL_VERSION}
+            SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}
+            BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}
+            CONFIGURE_COMMAND ${GLOG_CONFIGURE} --prefix=<INSTALL_DIR>
+            BUILD_COMMAND "${CMAKE_MAKE_PROGRAM}"
+            BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/.libs/${CMAKE_FIND_LIBRARY_PREFIXES}glog${CMAKE_STATIC_LIBRARY_SUFFIX}
+            UPDATE_COMMAND ""
+            PATCH_COMMAND ""
+            INSTALL_COMMAND ""
+        )
+    endif(CMAKE_VERSION VERSION_LESS 3.2)
 
-     if(CMAKE_VERSION VERSION_LESS 3.2)
-      ExternalProject_Add(
-         glog-${GNSSSDR_GLOG_LOCAL_VERSION}
-         DEPENDS ${TARGET_GFLAGS}
-         PREFIX ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}
-         GIT_REPOSITORY https://github.com/google/glog/
-         GIT_TAG v${GNSSSDR_GLOG_LOCAL_VERSION}
-         SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}
-         BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}
-         CONFIGURE_COMMAND ${GLOG_CONFIGURE} --prefix=<INSTALL_DIR>
-         BUILD_COMMAND "${CMAKE_MAKE_PROGRAM}"
-         UPDATE_COMMAND ""
-         PATCH_COMMAND ""
-         INSTALL_COMMAND ""
-      )
-     else(CMAKE_VERSION VERSION_LESS 3.2)
-      ExternalProject_Add(
-         glog-${GNSSSDR_GLOG_LOCAL_VERSION}
-         DEPENDS ${TARGET_GFLAGS}
-         PREFIX ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}
-         GIT_REPOSITORY https://github.com/google/glog/
-         GIT_TAG v${GNSSSDR_GLOG_LOCAL_VERSION}
-         SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}
-         BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}
-         CONFIGURE_COMMAND ${GLOG_CONFIGURE} --prefix=<INSTALL_DIR>
-         BUILD_COMMAND "${CMAKE_MAKE_PROGRAM}"
-         BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/.libs/${CMAKE_FIND_LIBRARY_PREFIXES}glog${CMAKE_STATIC_LIBRARY_SUFFIX}
-         UPDATE_COMMAND ""
-         PATCH_COMMAND ""
-         INSTALL_COMMAND ""
-      )
-     endif(CMAKE_VERSION VERSION_LESS 3.2)
-
-     # Set up variables
-     set(GLOG_INCLUDE_DIRS
-          ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/src/
-          ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/src
-     )
-     set(GLOG_LIBRARIES
-          ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/.libs/${CMAKE_FIND_LIBRARY_PREFIXES}glog${CMAKE_STATIC_LIBRARY_SUFFIX}
-     )
-     set(LOCAL_GLOG true CACHE STRING "Glog downloaded and built automatically" FORCE)
+    # Set up variables
+    set(GLOG_INCLUDE_DIRS
+        ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/src/
+        ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/src
+    )
+    set(GLOG_LIBRARIES
+        ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/.libs/${CMAKE_FIND_LIBRARY_PREFIXES}glog${CMAKE_STATIC_LIBRARY_SUFFIX}
+    )
+    set(LOCAL_GLOG true CACHE STRING "Glog downloaded and built automatically" FORCE)
 else(NOT GLOG_FOUND OR ${LOCAL_GFLAGS})
-     add_library(glog-${GNSSSDR_GLOG_LOCAL_VERSION} UNKNOWN IMPORTED)
-     set_property(TARGET glog-${GNSSSDR_GLOG_LOCAL_VERSION} PROPERTY IMPORTED_LOCATION "${GLOG_LIBRARIES}")
+    add_library(glog-${GNSSSDR_GLOG_LOCAL_VERSION} UNKNOWN IMPORTED)
+    set_property(TARGET glog-${GNSSSDR_GLOG_LOCAL_VERSION} PROPERTY IMPORTED_LOCATION "${GLOG_LIBRARIES}")
 endif(NOT GLOG_FOUND OR ${LOCAL_GFLAGS})
 
 if(NOT ENABLE_LOG)
-     message(STATUS "Logging is not enabled")
-     add_definitions(-DGOOGLE_STRIP_LOG=1)
+    message(STATUS "Logging is not enabled")
+    add_definitions(-DGOOGLE_STRIP_LOG=1)
 endif(NOT ENABLE_LOG)
 
 
@@ -978,76 +976,76 @@ if(ARMADILLO_FOUND)
 endif(ARMADILLO_FOUND)
 
 if(NOT ARMADILLO_FOUND OR ENABLE_OWN_ARMADILLO)
-     message(STATUS " Armadillo has not been found.")
-     message(STATUS " Armadillo ${GNSSSDR_ARMADILLO_LOCAL_VERSION} will be downloaded and built automatically")
-     message(STATUS " when doing '${CMAKE_MAKE_PROGRAM_PRETTY_NAME}'. ")
-     set(armadillo_BRANCH ${GNSSSDR_ARMADILLO_LOCAL_VERSION})
-     set(armadillo_RELEASE ${armadillo_BRANCH})
+    message(STATUS " Armadillo has not been found.")
+    message(STATUS " Armadillo ${GNSSSDR_ARMADILLO_LOCAL_VERSION} will be downloaded and built automatically")
+    message(STATUS " when doing '${CMAKE_MAKE_PROGRAM_PRETTY_NAME}'. ")
+    set(armadillo_BRANCH ${GNSSSDR_ARMADILLO_LOCAL_VERSION})
+    set(armadillo_RELEASE ${armadillo_BRANCH})
 
-     #############################################
-     # Check if GFORTRAN is found in the system
-     #############################################
-     if(NOT OS_IS_MACOSX)
-         find_package(GFORTRAN)
-         if(NOT GFORTRAN)
-             message(STATUS "The gfortran library has not been found.")
-             message(STATUS " You can try to install it by typing:")
-             if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
-                 message(STATUS " sudo yum install gcc-fortran")
-             elseif(${LINUX_DISTRIBUTION} MATCHES "openSUSE")
-                 message(STATUS " sudo zypper install gcc-fortran")
-             else(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
-                 message(STATUS " sudo apt-get install gfortran")
-             endif(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
-             message(FATAL_ERROR "gfortran is required to build gnss-sdr")
-         endif(NOT GFORTRAN)
-     endif(NOT OS_IS_MACOSX)
+    #############################################
+    # Check if GFORTRAN is found in the system
+    #############################################
+    if(NOT OS_IS_MACOSX)
+        find_package(GFORTRAN)
+        if(NOT GFORTRAN)
+            message(STATUS "The gfortran library has not been found.")
+            message(STATUS " You can try to install it by typing:")
+            if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
+              message(STATUS " sudo yum install gcc-fortran")
+            elseif(${LINUX_DISTRIBUTION} MATCHES "openSUSE")
+              message(STATUS " sudo zypper install gcc-fortran")
+            else(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
+              message(STATUS " sudo apt-get install gfortran")
+            endif(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
+            message(FATAL_ERROR "gfortran is required to build gnss-sdr")
+        endif(NOT GFORTRAN)
+    endif(NOT OS_IS_MACOSX)
 
-     #############################################
-     # Download and build Armadillo
-     #############################################
-     if(CMAKE_VERSION VERSION_LESS 3.2)
-      ExternalProject_Add(
-         armadillo-${armadillo_RELEASE}
-         PREFIX ${CMAKE_CURRENT_BINARY_DIR}/armadillo-${armadillo_RELEASE}
-         GIT_REPOSITORY https://gitlab.com/conradsnicta/armadillo-code.git
-         GIT_TAG ${armadillo_BRANCH}
-         SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/armadillo/armadillo-${armadillo_RELEASE}
-         BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/armadillo-${armadillo_RELEASE}
-         CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DBUILD_SHARED_LIBS=OFF -DCMAKE_CXX_FLAGS=-std=c++11
-         BUILD_COMMAND ${CMAKE_MAKE_PROGRAM}
-         UPDATE_COMMAND ""
-         INSTALL_COMMAND ""
-      )
-     else(CMAKE_VERSION VERSION_LESS 3.2)
-      ExternalProject_Add(
-         armadillo-${armadillo_RELEASE}
-         PREFIX ${CMAKE_CURRENT_BINARY_DIR}/armadillo-${armadillo_RELEASE}
-         GIT_REPOSITORY https://gitlab.com/conradsnicta/armadillo-code.git
-         GIT_TAG ${armadillo_BRANCH}
-         SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/armadillo/armadillo-${armadillo_RELEASE}
-         BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/armadillo-${armadillo_RELEASE}
-         CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DBUILD_SHARED_LIBS=OFF -DCMAKE_CXX_FLAGS=-std=c++11
-         BUILD_COMMAND ${CMAKE_MAKE_PROGRAM}
-         BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/armadillo-${armadillo_RELEASE}/${CMAKE_FIND_LIBRARY_PREFIXES}armadillo${CMAKE_STATIC_LIBRARY_SUFFIX}
-         UPDATE_COMMAND ""
-         INSTALL_COMMAND ""
-      )
-     endif(CMAKE_VERSION VERSION_LESS 3.2)
+    #############################################
+    # Download and build Armadillo
+    #############################################
+    if(CMAKE_VERSION VERSION_LESS 3.2)
+        ExternalProject_Add(
+            armadillo-${armadillo_RELEASE}
+            PREFIX ${CMAKE_CURRENT_BINARY_DIR}/armadillo-${armadillo_RELEASE}
+            GIT_REPOSITORY https://gitlab.com/conradsnicta/armadillo-code.git
+            GIT_TAG ${armadillo_BRANCH}
+            SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/armadillo/armadillo-${armadillo_RELEASE}
+            BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/armadillo-${armadillo_RELEASE}
+            CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DBUILD_SHARED_LIBS=OFF -DCMAKE_CXX_FLAGS=-std=c++11
+            BUILD_COMMAND ${CMAKE_MAKE_PROGRAM}
+            UPDATE_COMMAND ""
+            INSTALL_COMMAND ""
+        )
+    else(CMAKE_VERSION VERSION_LESS 3.2)
+        ExternalProject_Add(
+            armadillo-${armadillo_RELEASE}
+            PREFIX ${CMAKE_CURRENT_BINARY_DIR}/armadillo-${armadillo_RELEASE}
+            GIT_REPOSITORY https://gitlab.com/conradsnicta/armadillo-code.git
+            GIT_TAG ${armadillo_BRANCH}
+            SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/armadillo/armadillo-${armadillo_RELEASE}
+            BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/armadillo-${armadillo_RELEASE}
+            CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DBUILD_SHARED_LIBS=OFF -DCMAKE_CXX_FLAGS=-std=c++11
+            BUILD_COMMAND ${CMAKE_MAKE_PROGRAM}
+            BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/armadillo-${armadillo_RELEASE}/${CMAKE_FIND_LIBRARY_PREFIXES}armadillo${CMAKE_STATIC_LIBRARY_SUFFIX}
+            UPDATE_COMMAND ""
+            INSTALL_COMMAND ""
+        )
+    endif(CMAKE_VERSION VERSION_LESS 3.2)
 
-     # 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 )
-     if(NOT GFORTRAN)
-         set(GFORTRAN "")
-     endif(NOT GFORTRAN)
-     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})
+    # 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)
+    if(NOT GFORTRAN)
+        set(GFORTRAN "")
+    endif(NOT GFORTRAN)
+    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(NOT ARMADILLO_FOUND OR ENABLE_OWN_ARMADILLO)
-     set(armadillo_RELEASE ${ARMADILLO_VERSION_STRING})
-     add_library(armadillo-${armadillo_RELEASE} UNKNOWN IMPORTED)
-     set_property(TARGET armadillo-${armadillo_RELEASE} PROPERTY IMPORTED_LOCATION "${ARMADILLO_LIBRARIES}")
+    set(armadillo_RELEASE ${ARMADILLO_VERSION_STRING})
+    add_library(armadillo-${armadillo_RELEASE} UNKNOWN IMPORTED)
+    set_property(TARGET armadillo-${armadillo_RELEASE} PROPERTY IMPORTED_LOCATION "${ARMADILLO_LIBRARIES}")
 endif(NOT ARMADILLO_FOUND OR ENABLE_OWN_ARMADILLO)
 
 
@@ -1085,31 +1083,30 @@ find_library(GNUTLS_OPENSSL_LIBRARY NAMES gnutls-openssl libgnutls-openssl.so.27
                                           /usr/lib/s390x-linux-gnu
                                           /usr/lib/sparc64-linux-gnu
                                           /usr/lib/x86_64-linux-gnux32
-                                          /usr/lib/sh4-linux-gnu
-             )
+                                          /usr/lib/sh4-linux-gnu)
 
 if(NOT GNUTLS_OPENSSL_LIBRARY)
-     message(STATUS "Looking for OpenSSL instead...")
-     find_package(OpenSSL)
-     if(OPENSSL_FOUND)
+    message(STATUS "Looking for OpenSSL instead...")
+    find_package(OpenSSL)
+    if(OPENSSL_FOUND)
         set(GNUTLS_INCLUDE_DIR ${OPENSSL_INCLUDE_DIR})
         set(GNUTLS_LIBRARIES "")
         set(GNUTLS_OPENSSL_LIBRARY ${OPENSSL_SSL_LIBRARY})
-     else(OPENSSL_FOUND)
-         message(" The GnuTLS library with openssl compatibility enabled has not been found.")
-         message(" You can try to install the required libraries by typing:")
-         if(OS_IS_LINUX)
-            if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
-                message(" sudo yum install openssl-devel")
-            else(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
-                message(" sudo apt-get install libgnutls-openssl-dev")
-            endif(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
-         endif(OS_IS_LINUX)
-         if(OS_IS_MACOSX)
-            message(" sudo port install gnutls")
-         endif(OS_IS_MACOSX)
-            message(FATAL_ERROR "GnuTLS libraries with openssl compatibility are required to build gnss-sdr")
-     endif(OPENSSL_FOUND)
+    else(OPENSSL_FOUND)
+        message(" The GnuTLS library with openssl compatibility enabled has not been found.")
+        message(" You can try to install the required libraries by typing:")
+        if(OS_IS_LINUX)
+          if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
+            message(" sudo yum install openssl-devel")
+          else(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
+            message(" sudo apt-get install libgnutls-openssl-dev")
+          endif(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
+        endif(OS_IS_LINUX)
+        if(OS_IS_MACOSX)
+          message(" sudo port install gnutls")
+        endif(OS_IS_MACOSX)
+        message(FATAL_ERROR "GnuTLS libraries with openssl compatibility are required to build gnss-sdr")
+    endif(OPENSSL_FOUND)
 endif(NOT GNUTLS_OPENSSL_LIBRARY)
 
 
@@ -1120,7 +1117,7 @@ endif(NOT GNUTLS_OPENSSL_LIBRARY)
 find_package(MATIO)
 if(NOT MATIO_FOUND OR MATIO_VERSION_STRING VERSION_LESS ${GNSSSDR_MATIO_MIN_VERSION})
     if(MATIO_FOUND)
-         message(STATUS " Matio installed version (${MATIO_VERSION_STRING}) is too old (>= ${GNSSSDR_MATIO_MIN_VERSION} is required).")
+        message(STATUS " Matio installed version (${MATIO_VERSION_STRING}) is too old (>= ${GNSSSDR_MATIO_MIN_VERSION} is required).")
     endif(MATIO_FOUND)
     message(STATUS " Matio v${GNSSSDR_MATIO_LOCAL_VERSION} will be downloaded and built automatically")
     message(STATUS " when doing '${CMAKE_MAKE_PROGRAM_PRETTY_NAME}'. ")
@@ -1128,85 +1125,85 @@ if(NOT MATIO_FOUND OR MATIO_VERSION_STRING VERSION_LESS ${GNSSSDR_MATIO_MIN_VERS
     if(ZLIB_FOUND)
         get_filename_component(ZLIB_BASE_DIR ${ZLIB_INCLUDE_DIRS} DIRECTORY)
         if(OS_IS_LINUX)
-            if(NOT EXISTS "/usr/bin/libtoolize")
-                message(" libtool has not been found.")
-                message(" You can try to install it by typing:")
-                if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
-                    message(" sudo yum groupinstall 'Development Tools'")
-                elseif(${LINUX_DISTRIBUTION} MATCHES "openSUSE")
-                    message(" sudo zypper install libtoool")
-                else(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
-                    message(" sudo apt-get install libtool")
-                endif(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
-                message(FATAL_ERROR "libtool is required to build matio from source")
-            endif(NOT EXISTS "/usr/bin/libtoolize")
-            if(EXISTS "/usr/bin/aclocal" OR EXISTS "/usr/bin/aclocal-1.16" OR EXISTS "/usr/bin/aclocal-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.13" OR EXISTS "/usr/bin/aclocal-1.11"  OR EXISTS "/usr/bin/aclocal-1.10")
-                message(STATUS "Automake found.")
-            else(EXISTS "/usr/bin/aclocal" OR EXISTS "/usr/bin/aclocal-1.16" OR EXISTS "/usr/bin/aclocal-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.13" OR EXISTS "/usr/bin/aclocal-1.11"  OR EXISTS "/usr/bin/aclocal-1.10")
-                message(" aclocal has not been found.")
-                message(" You can try to install it by typing:")
-                if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
-                    message(" sudo yum groupinstall 'Development Tools'")
-                elseif(${LINUX_DISTRIBUTION} MATCHES "openSUSE")
-                    message(" sudo zypper install automake")
-                else(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
-                    message(" sudo apt-get install automake")
-                endif(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
-                message(FATAL_ERROR "aclocal is required to build matio from source")
-             endif(EXISTS "/usr/bin/aclocal" OR EXISTS "/usr/bin/aclocal-1.16" OR EXISTS "/usr/bin/aclocal-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.13" OR EXISTS "/usr/bin/aclocal-1.11"  OR EXISTS "/usr/bin/aclocal-1.10")
+          if(NOT EXISTS "/usr/bin/libtoolize")
+              message(" libtool has not been found.")
+              message(" You can try to install it by typing:")
+              if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
+                message(" sudo yum groupinstall 'Development Tools'")
+              elseif(${LINUX_DISTRIBUTION} MATCHES "openSUSE")
+                message(" sudo zypper install libtoool")
+              else(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
+                message(" sudo apt-get install libtool")
+              endif(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
+              message(FATAL_ERROR "libtool is required to build matio from source")
+          endif(NOT EXISTS "/usr/bin/libtoolize")
+          if(EXISTS "/usr/bin/aclocal" OR EXISTS "/usr/bin/aclocal-1.16" OR EXISTS "/usr/bin/aclocal-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.13" OR EXISTS "/usr/bin/aclocal-1.11"  OR EXISTS "/usr/bin/aclocal-1.10")
+              message(STATUS "Automake found.")
+          else(EXISTS "/usr/bin/aclocal" OR EXISTS "/usr/bin/aclocal-1.16" OR EXISTS "/usr/bin/aclocal-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.13" OR EXISTS "/usr/bin/aclocal-1.11"  OR EXISTS "/usr/bin/aclocal-1.10")
+              message(" aclocal has not been found.")
+              message(" You can try to install it by typing:")
+              if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
+                message(" sudo yum groupinstall 'Development Tools'")
+              elseif(${LINUX_DISTRIBUTION} MATCHES "openSUSE")
+                message(" sudo zypper install automake")
+              else(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
+                message(" sudo apt-get install automake")
+              endif(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
+              message(FATAL_ERROR "aclocal is required to build matio from source")
+          endif(EXISTS "/usr/bin/aclocal" OR EXISTS "/usr/bin/aclocal-1.16" OR EXISTS "/usr/bin/aclocal-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.13" OR EXISTS "/usr/bin/aclocal-1.11"  OR EXISTS "/usr/bin/aclocal-1.10")
         endif(OS_IS_LINUX)
         find_package(HDF5)
         if(HDF5_FOUND)
-            list(GET HDF5_LIBRARIES 0 HDF5_FIRST_DIR)
-            get_filename_component(HDF5_BASE_DIR2 ${HDF5_FIRST_DIR} DIRECTORY)
-            get_filename_component(HDF5_BASE_DIR ${HDF5_BASE_DIR2} DIRECTORY)
-            if(OS_IS_MACOSX)
-                if(EXISTS /opt/local/include/hdf5.h)
-                    set(HDF5_BASE_DIR /opt/local)
-                endif(EXISTS /opt/local/include/hdf5.h)
-                if(EXISTS /usr/local/include/hdf5.h)
-                    set(HDF5_BASE_DIR /usr/local)
-                endif(EXISTS /usr/local/include/hdf5.h)
-            endif(OS_IS_MACOSX)
-            if(CMAKE_VERSION VERSION_LESS 3.2)
-              ExternalProject_Add(
-                 matio-${GNSSSDR_MATIO_LOCAL_VERSION}
-                 PREFIX ${CMAKE_CURRENT_BINARY_DIR}/matio
-                 GIT_REPOSITORY https://github.com/tbeu/matio
-                 GIT_TAG v${GNSSSDR_MATIO_LOCAL_VERSION}
-                 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
-              )
-            else(CMAKE_VERSION VERSION_LESS 3.2)
-              ExternalProject_Add(
-                 matio-${GNSSSDR_MATIO_LOCAL_VERSION}
-                 PREFIX ${CMAKE_CURRENT_BINARY_DIR}/matio
-                 GIT_REPOSITORY https://github.com/tbeu/matio
-                 GIT_TAG v${GNSSSDR_MATIO_LOCAL_VERSION}
-                 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_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/matio/lib/${CMAKE_FIND_LIBRARY_PREFIXES}matio${CMAKE_STATIC_LIBRARY_SUFFIX}
-              )
-            endif(CMAKE_VERSION VERSION_LESS 3.2)
-            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)
+          list(GET HDF5_LIBRARIES 0 HDF5_FIRST_DIR)
+          get_filename_component(HDF5_BASE_DIR2 ${HDF5_FIRST_DIR} DIRECTORY)
+          get_filename_component(HDF5_BASE_DIR ${HDF5_BASE_DIR2} DIRECTORY)
+          if(OS_IS_MACOSX)
+              if(EXISTS /opt/local/include/hdf5.h)
+                set(HDF5_BASE_DIR /opt/local)
+              endif(EXISTS /opt/local/include/hdf5.h)
+              if(EXISTS /usr/local/include/hdf5.h)
+                set(HDF5_BASE_DIR /usr/local)
+              endif(EXISTS /usr/local/include/hdf5.h)
+          endif(OS_IS_MACOSX)
+          if(CMAKE_VERSION VERSION_LESS 3.2)
+            ExternalProject_Add(
+              matio-${GNSSSDR_MATIO_LOCAL_VERSION}
+              PREFIX ${CMAKE_CURRENT_BINARY_DIR}/matio
+              GIT_REPOSITORY https://github.com/tbeu/matio
+              GIT_TAG v${GNSSSDR_MATIO_LOCAL_VERSION}
+              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
+            )
+          else(CMAKE_VERSION VERSION_LESS 3.2)
+            ExternalProject_Add(
+              matio-${GNSSSDR_MATIO_LOCAL_VERSION}
+              PREFIX ${CMAKE_CURRENT_BINARY_DIR}/matio
+              GIT_REPOSITORY https://github.com/tbeu/matio
+              GIT_TAG v${GNSSSDR_MATIO_LOCAL_VERSION}
+              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_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/matio/lib/${CMAKE_FIND_LIBRARY_PREFIXES}matio${CMAKE_STATIC_LIBRARY_SUFFIX}
+            )
+          endif(CMAKE_VERSION VERSION_LESS 3.2)
+          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)
         else(HDF5_FOUND)
-            message(STATUS " The hdf5 library has not been found in your system.")
-            message(STATUS " Please try to install it by doing:")
-            if(OS_IS_MACOSX)
-                message(STATUS "  $ sudo port install hdf5")
-                message(STATUS " or")
-                message(STATUS "  $ brew install hdf5")
-            endif(OS_IS_MACOSX)
-            if(OS_IS_LINUX)
-                message(STATUS "  $ sudo apt-get install libhdf5-dev")
-            endif(OS_IS_LINUX)
-            message(FATAL_ERROR "*** The hdf5 library is required to build gnss-sdr")
+          message(STATUS " The hdf5 library has not been found in your system.")
+          message(STATUS " Please try to install it by doing:")
+          if(OS_IS_MACOSX)
+              message(STATUS "  $ sudo port install hdf5")
+              message(STATUS " or")
+              message(STATUS "  $ brew install hdf5")
+          endif(OS_IS_MACOSX)
+          if(OS_IS_LINUX)
+              message(STATUS "  $ sudo apt-get install libhdf5-dev")
+          endif(OS_IS_LINUX)
+          message(FATAL_ERROR "*** The hdf5 library is required to build gnss-sdr")
         endif(HDF5_FOUND)
     else(ZLIB_FOUND)
         message(FATAL_ERROR "*** The zlib library is required to build gnss-sdr")
@@ -1214,6 +1211,7 @@ if(NOT MATIO_FOUND OR MATIO_VERSION_STRING VERSION_LESS ${GNSSSDR_MATIO_MIN_VERS
 endif(NOT MATIO_FOUND OR MATIO_VERSION_STRING VERSION_LESS ${GNSSSDR_MATIO_MIN_VERSION})
 
 
+
 ################################################################################
 # PugiXML - https://pugixml.org/
 ################################################################################
@@ -1230,34 +1228,34 @@ else(PugiXML_FOUND)
     endif(EXISTS $ENV{OECORE_TARGET_SYSROOT})
     if(CMAKE_VERSION VERSION_LESS 3.2)
         ExternalProject_Add(
-            pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION}
-            PREFIX ${CMAKE_CURRENT_BINARY_DIR}/pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION}
-            GIT_REPOSITORY https://github.com/zeux/pugixml
-            GIT_TAG v${GNSSSDR_PUGIXML_LOCAL_VERSION}
-            SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/pugixml/pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION}
-            BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION}
-            CMAKE_ARGS ${PUGIXML_COMPILER} ${TOOLCHAIN_ARG}
-            UPDATE_COMMAND ""
-            PATCH_COMMAND ""
-            INSTALL_COMMAND ""
+          pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION}
+          PREFIX ${CMAKE_CURRENT_BINARY_DIR}/pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION}
+          GIT_REPOSITORY https://github.com/zeux/pugixml
+          GIT_TAG v${GNSSSDR_PUGIXML_LOCAL_VERSION}
+          SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/pugixml/pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION}
+          BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION}
+          CMAKE_ARGS ${PUGIXML_COMPILER} ${TOOLCHAIN_ARG}
+          UPDATE_COMMAND ""
+          PATCH_COMMAND ""
+          INSTALL_COMMAND ""
         )
     else(CMAKE_VERSION VERSION_LESS 3.2)
         ExternalProject_Add(
-            pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION}
-            PREFIX ${CMAKE_CURRENT_BINARY_DIR}/pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION}
-            GIT_REPOSITORY https://github.com/zeux/pugixml
-            GIT_TAG v${GNSSSDR_PUGIXML_LOCAL_VERSION}
-            SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/pugixml/pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION}
-            BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION}
-            CMAKE_ARGS ${PUGIXML_COMPILER} ${TOOLCHAIN_ARG}
-            UPDATE_COMMAND ""
-            PATCH_COMMAND ""
-            BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION}/${CMAKE_FIND_LIBRARY_PREFIXES}pugixml${CMAKE_STATIC_LIBRARY_SUFFIX}
-            INSTALL_COMMAND ""
+          pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION}
+          PREFIX ${CMAKE_CURRENT_BINARY_DIR}/pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION}
+          GIT_REPOSITORY https://github.com/zeux/pugixml
+          GIT_TAG v${GNSSSDR_PUGIXML_LOCAL_VERSION}
+          SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/pugixml/pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION}
+          BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION}
+          CMAKE_ARGS ${PUGIXML_COMPILER} ${TOOLCHAIN_ARG}
+          UPDATE_COMMAND ""
+          PATCH_COMMAND ""
+          BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION}/${CMAKE_FIND_LIBRARY_PREFIXES}pugixml${CMAKE_STATIC_LIBRARY_SUFFIX}
+          INSTALL_COMMAND ""
         )
     endif(CMAKE_VERSION VERSION_LESS 3.2)
-    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_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(PugiXML_FOUND)
 
@@ -1284,61 +1282,61 @@ endif(ENABLE_UHD)
 ################################################################################
 find_package(Doxygen)
 if(DOXYGEN_FOUND)
-     message(STATUS "Doxygen found.")
-     message(STATUS "You can build the documentation with '${CMAKE_MAKE_PROGRAM_PRETTY_NAME} doc'." )
-     message(STATUS "When done, point your browser to ${CMAKE_BINARY_DIR}/html/index.html")
-     set(HAVE_DOT ${DOXYGEN_DOT_FOUND})
-     file(TO_NATIVE_PATH ${CMAKE_SOURCE_DIR} top_srcdir)
-     file(TO_NATIVE_PATH ${CMAKE_BINARY_DIR} top_builddir)
-     find_package(LATEX)
-     if (PDFLATEX_COMPILER)
-          set(GENERATE_PDF_DOCUMENTATION "YES")
-          set(GNSSSDR_USE_MATHJAX "NO")
-     else(PDFLATEX_COMPILER)
-          set(GENERATE_PDF_DOCUMENTATION "NO")
-          set(GNSSSDR_USE_MATHJAX "YES")
-     endif(PDFLATEX_COMPILER)
-     configure_file(${CMAKE_SOURCE_DIR}/docs/doxygen/Doxyfile.in
-          ${CMAKE_BINARY_DIR}/docs/doxygen/Doxyfile
-          @ONLY
-     )
-     add_custom_target(doc
-          ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/docs/doxygen/Doxyfile
-          WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-          COMMENT "Generating API documentation with Doxygen." VERBATIM
-     )
-     if(LATEX_COMPILER)
-          message(STATUS "'${CMAKE_MAKE_PROGRAM_PRETTY_NAME} pdfmanual' will generate a manual at ${CMAKE_BINARY_DIR}/docs/GNSS-SDR_manual.pdf")
-          add_custom_target(pdfmanual
-               COMMAND ${CMAKE_MAKE_PROGRAM}
-               COMMAND ${CMAKE_COMMAND} -E copy refman.pdf ${CMAKE_BINARY_DIR}/docs/GNSS-SDR_manual.pdf
-               COMMAND ${CMAKE_MAKE_PROGRAM} clean
-               DEPENDS doc
-               WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/docs/latex
-               COMMENT "Generating PDF manual with Doxygen." VERBATIM
-          )
-     endif(LATEX_COMPILER)
-     message(STATUS "'${CMAKE_MAKE_PROGRAM_PRETTY_NAME} doc-clean' will clean the documentation.")
-     add_custom_target(doc-clean
-          COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/docs/html
-          COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/docs/latex
-          COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_BINARY_DIR}/docs/GNSS-SDR_manual.pdf
-          COMMENT "Cleaning documentation." VERBATIM
-     )
+    message(STATUS "Doxygen found.")
+    message(STATUS "You can build the documentation with '${CMAKE_MAKE_PROGRAM_PRETTY_NAME} doc'.")
+    message(STATUS "When done, point your browser to ${CMAKE_BINARY_DIR}/html/index.html")
+    set(HAVE_DOT ${DOXYGEN_DOT_FOUND})
+    file(TO_NATIVE_PATH ${CMAKE_SOURCE_DIR} top_srcdir)
+    file(TO_NATIVE_PATH ${CMAKE_BINARY_DIR} top_builddir)
+    find_package(LATEX)
+    if(PDFLATEX_COMPILER)
+        set(GENERATE_PDF_DOCUMENTATION "YES")
+        set(GNSSSDR_USE_MATHJAX "NO")
+    else(PDFLATEX_COMPILER)
+        set(GENERATE_PDF_DOCUMENTATION "NO")
+        set(GNSSSDR_USE_MATHJAX "YES")
+    endif(PDFLATEX_COMPILER)
+    configure_file(${CMAKE_SOURCE_DIR}/docs/doxygen/Doxyfile.in
+        ${CMAKE_BINARY_DIR}/docs/doxygen/Doxyfile
+        @ONLY
+    )
+    add_custom_target(doc
+        ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/docs/doxygen/Doxyfile
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+        COMMENT "Generating API documentation with Doxygen." VERBATIM
+    )
+    if(LATEX_COMPILER)
+        message(STATUS "'${CMAKE_MAKE_PROGRAM_PRETTY_NAME} pdfmanual' will generate a manual at ${CMAKE_BINARY_DIR}/docs/GNSS-SDR_manual.pdf")
+        add_custom_target(pdfmanual
+            COMMAND ${CMAKE_MAKE_PROGRAM}
+            COMMAND ${CMAKE_COMMAND} -E copy refman.pdf ${CMAKE_BINARY_DIR}/docs/GNSS-SDR_manual.pdf
+            COMMAND ${CMAKE_MAKE_PROGRAM} clean
+            DEPENDS doc
+            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/docs/latex
+            COMMENT "Generating PDF manual with Doxygen." VERBATIM
+        )
+    endif(LATEX_COMPILER)
+    message(STATUS "'${CMAKE_MAKE_PROGRAM_PRETTY_NAME} doc-clean' will clean the documentation.")
+    add_custom_target(doc-clean
+        COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/docs/html
+        COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/docs/latex
+        COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_BINARY_DIR}/docs/GNSS-SDR_manual.pdf
+        COMMENT "Cleaning documentation." VERBATIM
+    )
 else(DOXYGEN_FOUND)
-     message(STATUS " Doxygen has not been found in your system.")
-     message(STATUS " You can get nice code documentation by using it!")
-     message(STATUS " Get it from http://www.stack.nl/~dimitri/doxygen/index.html")
-     if(OS_IS_LINUX)
-         if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
-             message(STATUS " or simply by doing 'sudo yum install doxygen-latex'.")
-         else(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
-             message(STATUS " or simply by doing 'sudo apt-get install doxygen-latex'.")
-         endif(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
-     endif(OS_IS_LINUX)
-     if(OS_IS_MACOSX)
-         message(STATUS " or simply by doing 'sudo port install doxygen +latex'.")
-     endif(OS_IS_MACOSX)
+    message(STATUS " Doxygen has not been found in your system.")
+    message(STATUS " You can get nice code documentation by using it!")
+    message(STATUS " Get it from http://www.stack.nl/~dimitri/doxygen/index.html")
+    if(OS_IS_LINUX)
+        if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
+            message(STATUS " or simply by doing 'sudo yum install doxygen-latex'.")
+        else(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
+            message(STATUS " or simply by doing 'sudo apt-get install doxygen-latex'.")
+        endif(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
+    endif(OS_IS_LINUX)
+    if(OS_IS_MACOSX)
+        message(STATUS " or simply by doing 'sudo port install doxygen +latex'.")
+    endif(OS_IS_MACOSX)
 endif(DOXYGEN_FOUND)
 
 
@@ -1355,8 +1353,8 @@ if(ENABLE_OPENCL)
         set(OPENCL_FOUND FALSE)
     else(DISABLE_OPENCL)
         if(OPENCL_FOUND)
-            message(STATUS "OpenCL has been found and will be used by some processing blocks")
-            message(STATUS "You can disable OpenCL use by doing 'cmake -DENABLE_OPENCL=OFF ../' ")
+          message(STATUS "OpenCL has been found and will be used by some processing blocks")
+          message(STATUS "You can disable OpenCL use by doing 'cmake -DENABLE_OPENCL=OFF ../' ")
         endif(OPENCL_FOUND)
     endif(DISABLE_OPENCL)
     if(ENABLE_GENERIC_ARCH)
@@ -1376,28 +1374,28 @@ endif(ENABLE_OPENCL)
 # CUDA (OPTIONAL)
 ###############################################################################
 if($ENV{CUDA_GPU_ACCEL})
-    message(STATUS "CUDA_GPU_ACCEL environment variable found." )
+    message(STATUS "CUDA_GPU_ACCEL environment variable found.")
     set(ENABLE_CUDA ON)
 endif($ENV{CUDA_GPU_ACCEL})
 
 if(ENABLE_CUDA)
     FIND_PACKAGE(CUDA REQUIRED)
-    message(STATUS "NVIDIA CUDA GPU Acceleration will be enabled." )
-    message(STATUS "You can disable it with 'cmake -DENABLE_CUDA=OFF ../'" )
+    message(STATUS "NVIDIA CUDA GPU Acceleration will be enabled.")
+    message(STATUS "You can disable it with 'cmake -DENABLE_CUDA=OFF ../'")
 else(ENABLE_CUDA)
-    message(STATUS "NVIDIA CUDA GPU Acceleration will be not enabled." )
-    message(STATUS "Enable it with 'cmake -DENABLE_CUDA=ON ../' to add support for GPU-based acceleration using CUDA." )
+    message(STATUS "NVIDIA CUDA GPU Acceleration will be not enabled.")
+    message(STATUS "Enable it with 'cmake -DENABLE_CUDA=ON ../' to add support for GPU-based acceleration using CUDA.")
 endif(ENABLE_CUDA)
 
 ###############################################################################
 # 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 ../'" )
+    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(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 ../'" )
+    message(STATUS "High-optimized custom UDP ip packet source will be enabled.")
+    message(STATUS "You can disable it with 'cmake -DENABLE_RAW_UDP=OFF ../'")
 endif(ENABLE_RAW_UDP)
 
 
@@ -1405,11 +1403,11 @@ endif(ENABLE_RAW_UDP)
 # FPGA (OPTIONAL)
 ###############################################################################
 if(ENABLE_FPGA)
-    message(STATUS "FPGA Acceleration will be enabled." )
-    message(STATUS "You can disable it with 'cmake -DENABLE_FPGA=OFF ../'" )
+    message(STATUS "FPGA Acceleration will be enabled.")
+    message(STATUS "You can disable it with 'cmake -DENABLE_FPGA=OFF ../'")
 else(ENABLE_FPGA)
-    message(STATUS "Fpga Acceleration will be not enabled." )
-    message(STATUS "Enable it with 'cmake -DENABLE_FPGA=ON ../' to add support for GPU-based acceleration using the FPGA." )
+    message(STATUS "Fpga Acceleration will be not enabled.")
+    message(STATUS "Enable it with 'cmake -DENABLE_FPGA=ON ../' to add support for GPU-based acceleration using the FPGA.")
 endif(ENABLE_FPGA)
 
 
@@ -1418,22 +1416,22 @@ endif(ENABLE_FPGA)
 # Setup of optional drivers
 ################################################################################
 if($ENV{GN3S_DRIVER})
-    message(STATUS "GN3S_DRIVER environment variable found." )
+    message(STATUS "GN3S_DRIVER environment variable found.")
     set(ENABLE_GN3S ON)
 endif($ENV{GN3S_DRIVER})
 if(GN3S_DRIVER)
     set(ENABLE_GN3S ON)
 endif(GN3S_DRIVER)
 if(ENABLE_GN3S)
-     message(STATUS "The GN3S driver will be compiled.")
-     message(STATUS "You can disable it with 'cmake -DENABLE_GN3S=OFF ../'" )
+    message(STATUS "The GN3S driver will be compiled.")
+    message(STATUS "You can disable it with 'cmake -DENABLE_GN3S=OFF ../'")
 else(ENABLE_GN3S)
-     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." )
+    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(ENABLE_GN3S)
 
 if($ENV{RAW_ARRAY_DRIVER})
-    message(STATUS "RAW_ARRAY_DRIVER environment variable found." )
+    message(STATUS "RAW_ARRAY_DRIVER environment variable found.")
     set(ENABLE_ARRAY ON)
 endif($ENV{RAW_ARRAY_DRIVER})
 
@@ -1442,39 +1440,39 @@ if(RAW_ARRAY_DRIVER)
 endif(RAW_ARRAY_DRIVER)
 
 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 ../'" )
+    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(ENABLE_ARRAY)
-    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." )
+    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(ENABLE_ARRAY)
 
 if($ENV{RTLSDR_DRIVER})
-    message(STATUS "RTLSDR_DRIVER environment variable found." )
+    message(STATUS "RTLSDR_DRIVER environment variable found.")
     set(ENABLE_OSMOSDR ON)
 endif($ENV{RTLSDR_DRIVER})
 
 if(ENABLE_OSMOSDR)
     find_package(GrOsmoSDR)
     if(GROSMOSDR_FOUND)
-        message(STATUS "The driver for OsmoSDR and other front-ends (HackRF, bladeRF, Realtek's RTL2832U-based dongles, etc.) will be compiled." )
-        message(STATUS "You can disable it with 'cmake -DENABLE_OSMOSDR=OFF ../'" )
+        message(STATUS "The driver for OsmoSDR and other front-ends (HackRF, bladeRF, Realtek's RTL2832U-based dongles, etc.) will be compiled.")
+        message(STATUS "You can disable it with 'cmake -DENABLE_OSMOSDR=OFF ../'")
     else(GROSMOSDR_FOUND)
         if(ENABLE_PACKAGING)
-           message(WARNING "gr-osmosdr has not been found. Source blocks depending on it will NOT be built.")
+          message(WARNING "gr-osmosdr has not been found. Source blocks depending on it will NOT be built.")
         else(ENABLE_PACKAGING)
-           message(FATAL_ERROR "gr-osmosdr required to build gnss-sdr with the optional OSMOSDR driver")
+          message(FATAL_ERROR "gr-osmosdr required to build gnss-sdr with the optional OSMOSDR driver")
         endif(ENABLE_PACKAGING)
     endif(GROSMOSDR_FOUND)
 else(ENABLE_OSMOSDR)
-    message(STATUS "The (optional) driver for OsmoSDR and related front-ends is not enabled." )
-    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.)" )
+    message(STATUS "The (optional) driver for OsmoSDR and related front-ends is not enabled.")
+    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(ENABLE_OSMOSDR)
 
 if($ENV{FLEXIBAND_DRIVER})
-    message(STATUS "FLEXIBAND_DRIVER environment variable found." )
+    message(STATUS "FLEXIBAND_DRIVER environment variable found.")
     set(ENABLE_FLEXIBAND ON)
 endif($ENV{FLEXIBAND_DRIVER})
 
@@ -1483,11 +1481,11 @@ if(FLEXIBAND_DRIVER)
 endif(FLEXIBAND_DRIVER)
 
 if(ENABLE_FLEXIBAND)
-    message(STATUS "The Teleorbit Flexiband front-end source will be compiled." )
-    message(STATUS "You can disable it with 'cmake -DENABLE_FLEXIBAND=OFF ../'" )
+    message(STATUS "The Teleorbit Flexiband front-end source will be compiled.")
+    message(STATUS "You can disable it with 'cmake -DENABLE_FLEXIBAND=OFF ../'")
 else(ENABLE_FLEXIBAND)
-    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." )
+    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(ENABLE_FLEXIBAND)
 
 
@@ -1497,24 +1495,24 @@ endif(ENABLE_FLEXIBAND)
 ################################################################################
 if(ENABLE_GPERFTOOLS)
     find_package(Gperftools)
-    if ( NOT GPERFTOOLS_FOUND )
+    if(NOT GPERFTOOLS_FOUND)
         message(STATUS "Although ENABLE_GPERFTOOLS has been set to ON, GPerftools has not been found.")
         message(STATUS "Binaries will be compiled without 'tcmalloc' and 'profiler' libraries.")
         message(STATUS "You can install GPerftools from https://github.com/gperftools/gperftools")
-    else( NOT GPERFTOOLS_FOUND )
-        message(STATUS "GPerftools libraries found." )
+    else(NOT GPERFTOOLS_FOUND)
+        message(STATUS "GPerftools libraries found.")
         message(STATUS "Binaries will be compiled with 'tcmalloc' and 'profiler' libraries.")
-    endif( NOT GPERFTOOLS_FOUND )
+    endif(NOT GPERFTOOLS_FOUND)
 endif(ENABLE_GPERFTOOLS)
 if(ENABLE_GPERFTOOLS)
     # Set GPerftools related flags if it is available
     # See https://github.com/gperftools/gperftools/blob/master/README
     if(GPERFTOOLS_FOUND)
         if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
-            set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free")
+          set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free")
         endif((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
         if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-            set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -fno-builtin")
+          set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -fno-builtin")
         endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     endif(GPERFTOOLS_FOUND)
 endif(ENABLE_GPERFTOOLS)
@@ -1525,11 +1523,9 @@ endif(ENABLE_GPERFTOOLS)
 # GNU gprof (OPTIONAL) - https://sourceware.org/binutils/docs/gprof/
 ########################################################################
 if(ENABLE_GPROF)
-    #if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-        set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -pg")
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg")
-        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pg")
-    #endif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -pg")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pg")
 endif(ENABLE_GPROF)
 
 
@@ -1559,23 +1555,23 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     if(OS_IS_MACOSX)
         # See https://trac.macports.org/wiki/XcodeVersionInfo for Apple Clang version equivalences
         if(CLANG_VERSION VERSION_LESS "600")
-            set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++11")
+          set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++11")
         else(CLANG_VERSION VERSION_LESS "600")
-            # if(CLANG_VERSION VERSION_LESS "900")
-                set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++14")
-            # else(CLANG_VERSION VERSION_LESS "900")
-                # set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++17")
-            # endif(CLANG_VERSION VERSION_LESS "900")
+          # if(CLANG_VERSION VERSION_LESS "900")
+          set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++14")
+          # else(CLANG_VERSION VERSION_LESS "900")
+          # set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++17")
+          # endif(CLANG_VERSION VERSION_LESS "900")
         endif(CLANG_VERSION VERSION_LESS "600")
     else(OS_IS_MACOSX)
         if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "3.5.0")
-            set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++11")
+          set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++11")
         else(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "3.5.0")
-            # if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0.0")
-                set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++14")
-            # else(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0.0")
-                # set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++17")
-            # endif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0.0")
+          # if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0.0")
+          set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++14")
+          # else(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0.0")
+          # set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++17")
+          # endif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0.0")
         endif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "3.5.0")
     endif(OS_IS_MACOSX)
 
@@ -1593,30 +1589,29 @@ endif(NOT ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT (CMAKE_CXX_COMPILER_ID
 
 # Processor-architecture related flags
 # See https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html
-if (NOT ARCH_COMPILER_FLAGS)
+if(NOT ARCH_COMPILER_FLAGS)
     if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
-        if(OS_IS_MACOSX)
-            set(ARCH_COMPILER_FLAGS "-march=corei7 -mfpmath=sse")
-        else(OS_IS_MACOSX)
-            if(NOT ${ENABLE_GENERIC_ARCH})
-                if(IS_ARM) # ARM-specific options (https://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html)
-                    if(NOT CMAKE_CROSSCOMPILING)
-                        if(ARM_VERSION STREQUAL "arm")
-                            # Unknown arm version - try our best to detect
-                            set(ARCH_COMPILER_FLAGS "-mcpu=native")
-                        else(ARM_VERSION STREQUAL "arm")
-                            set(ARCH_COMPILER_FLAGS "-march=${ARM_VERSION}")
-	                    endif(ARM_VERSION STREQUAL "arm")
-	                endif(NOT CMAKE_CROSSCOMPILING)
-                else(IS_ARM)
-                    set(ARCH_COMPILER_FLAGS "-march=native -mfpmath=sse")
-	            endif(IS_ARM)
-            endif(NOT ${ENABLE_GENERIC_ARCH})
-        endif(OS_IS_MACOSX)
+      if(OS_IS_MACOSX)
+          set(ARCH_COMPILER_FLAGS "-march=corei7 -mfpmath=sse")
+      else(OS_IS_MACOSX)
+          if(NOT ${ENABLE_GENERIC_ARCH})
+              if(IS_ARM) # ARM-specific options (https://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html)
+                  if(NOT CMAKE_CROSSCOMPILING)
+                    if(ARM_VERSION STREQUAL "arm")
+                        # Unknown arm version - try our best to detect
+                        set(ARCH_COMPILER_FLAGS "-mcpu=native")
+                    else(ARM_VERSION STREQUAL "arm")
+                        set(ARCH_COMPILER_FLAGS "-march=${ARM_VERSION}")
+                    endif(ARM_VERSION STREQUAL "arm")
+                  endif(NOT CMAKE_CROSSCOMPILING)
+              else(IS_ARM)
+                  set(ARCH_COMPILER_FLAGS "-march=native -mfpmath=sse")
+              endif(IS_ARM)
+          endif(NOT ${ENABLE_GENERIC_ARCH})
+      endif(OS_IS_MACOSX)
     endif((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
-endif (NOT ARCH_COMPILER_FLAGS)
+endif(NOT ARCH_COMPILER_FLAGS)
 set(MY_CXX_FLAGS "${MY_CXX_FLAGS} ${ARCH_COMPILER_FLAGS}")
-
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MY_CXX_FLAGS}")
 
 if((CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
diff --git a/cmake/Modules/FindGFlags.cmake b/cmake/Modules/FindGFlags.cmake
index a0ca5ac79..d8279ba00 100644
--- a/cmake/Modules/FindGFlags.cmake
+++ b/cmake/Modules/FindGFlags.cmake
@@ -99,4 +99,3 @@ ELSE(GFlags_ROOT_DIR)
      MESSAGE(STATUS "Cannot find gflags")
      SET(GFlags_FOUND false)
 ENDIF(GFlags_ROOT_DIR)
-
diff --git a/cmake/Modules/FindGLOG.cmake b/cmake/Modules/FindGLOG.cmake
index 7c50d8805..112f2c39d 100644
--- a/cmake/Modules/FindGLOG.cmake
+++ b/cmake/Modules/FindGLOG.cmake
@@ -41,7 +41,7 @@ endif(MSVC)
 macro(_FIND_GLOG_LIBRARIES _var)
      find_library(${_var}
           NAMES  ${ARGN}
-          PATHS ${LIB_PATHS} 
+          PATHS ${LIB_PATHS}
                 /usr/local/lib
                 /usr/lib/x86_64-linux-gnu
                 /usr/lib/i386-linux-gnu
diff --git a/cmake/Modules/FindGPSTK.cmake b/cmake/Modules/FindGPSTK.cmake
index 137a34b5b..810bda0d8 100644
--- a/cmake/Modules/FindGPSTK.cmake
+++ b/cmake/Modules/FindGPSTK.cmake
@@ -35,7 +35,7 @@ FIND_LIBRARY(GPSTK_LIBRARY NAMES ${GPSTK_NAMES}
                    /usr/local/lib
                    /opt/local/lib )
 
-# handle the QUIETLY and REQUIRED arguments and set GPSTK_FOUND to TRUE if 
+# 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)
diff --git a/cmake/Modules/FindGnssSimulator.cmake b/cmake/Modules/FindGnssSimulator.cmake
index 56bccc709..88e6c2d27 100644
--- a/cmake/Modules/FindGnssSimulator.cmake
+++ b/cmake/Modules/FindGnssSimulator.cmake
@@ -25,4 +25,4 @@ find_program(SW_GENERATOR_BIN gnss_sim
 
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNSS-SIMULATOR  DEFAULT_MSG  SW_GENERATOR_BIN)
-MARK_AS_ADVANCED(SW_GENERATOR_BIN)
\ No newline at end of file
+MARK_AS_ADVANCED(SW_GENERATOR_BIN)
diff --git a/cmake/Modules/FindGperftools.cmake b/cmake/Modules/FindGperftools.cmake
index 6e4d955b7..2dc57430e 100644
--- a/cmake/Modules/FindGperftools.cmake
+++ b/cmake/Modules/FindGperftools.cmake
@@ -66,4 +66,4 @@ mark_as_advanced(
   GPERFTOOLS_PROFILER
   GPERFTOOLS_TCMALLOC_AND_PROFILER
   GPERFTOOLS_LIBRARIES
-  GPERFTOOLS_INCLUDE_DIR)
\ No newline at end of file
+  GPERFTOOLS_INCLUDE_DIR)
diff --git a/cmake/Modules/FindGrDbfcttc.cmake b/cmake/Modules/FindGrDbfcttc.cmake
index 0245514d8..9f4da77f8 100644
--- a/cmake/Modules/FindGrDbfcttc.cmake
+++ b/cmake/Modules/FindGrDbfcttc.cmake
@@ -28,7 +28,7 @@ FIND_PATH(
     HINTS $ENV{GR_DBFCTTC_DIR}/include
           ${PC_GR_DBFCTTC_INCLUDEDIR}
     PATHS ${CMAKE_INSTALL_PREFIX}/include
-          /usr/include 
+          /usr/include
           /usr/local/include
 )
 
diff --git a/cmake/Modules/FindGrOsmoSDR.cmake b/cmake/Modules/FindGrOsmoSDR.cmake
index 254fecef1..ae637846a 100644
--- a/cmake/Modules/FindGrOsmoSDR.cmake
+++ b/cmake/Modules/FindGrOsmoSDR.cmake
@@ -36,7 +36,7 @@
 
 if(NOT GROSMOSDR_FOUND)
   pkg_check_modules (GROSMOSDR_PKG gnuradio-osmosdr)
-  find_path(GROSMOSDR_INCLUDE_DIR 
+  find_path(GROSMOSDR_INCLUDE_DIR
     NAMES osmosdr/source.h
 	  osmosdr/api.h
     PATHS
@@ -45,7 +45,7 @@ if(NOT GROSMOSDR_FOUND)
     /usr/local/include
   )
 
- find_library(GROSMOSDR_LIBRARIES 
+ find_library(GROSMOSDR_LIBRARIES
     NAMES gnuradio-osmosdr
     PATHS
     ${GROSMOSDR_PKG_LIBRARY_DIRS}
diff --git a/cmake/Modules/FindLibOsmoSDR.cmake b/cmake/Modules/FindLibOsmoSDR.cmake
index fc7a28b06..d0dff5360 100644
--- a/cmake/Modules/FindLibOsmoSDR.cmake
+++ b/cmake/Modules/FindLibOsmoSDR.cmake
@@ -25,7 +25,7 @@
 # Variables defined by this module:
 #
 # LIBOSMOSDR_FOUND System has libosmosdr libs/headers
-# LIBOSMOSDR_LIBRARIES The libosmosdr libraries 
+# LIBOSMOSDR_LIBRARIES The libosmosdr libraries
 # LIBOSMOSDR_INCLUDE_DIR The location of libosmosdr headers
 
 
diff --git a/cmake/Modules/FindLog4cpp.cmake b/cmake/Modules/FindLog4cpp.cmake
index 3b1e7560e..96ea923f6 100644
--- a/cmake/Modules/FindLog4cpp.cmake
+++ b/cmake/Modules/FindLog4cpp.cmake
@@ -92,4 +92,4 @@ else ()
     message(STATUS "Looked for LOG4CPP libraries named ${LOG4CPPS_NAMES}.")
     message(FATAL_ERROR "Could NOT find LOG4CPP library")
   endif ()
-endif ()
\ No newline at end of file
+endif ()
diff --git a/cmake/Modules/FindMATIO.cmake b/cmake/Modules/FindMATIO.cmake
index 2bac55ede..e27ed1f86 100644
--- a/cmake/Modules/FindMATIO.cmake
+++ b/cmake/Modules/FindMATIO.cmake
@@ -25,26 +25,26 @@
 #  MATIO_LIBRARIES	- MATIO libraries.
 #  MATIO_INCLUDE_DIRS - where to find matio.h, etc..
 #  MATIO_VERSION_STRING - version number as a string (e.g.: "1.3.4")
-# 
+#
 #=============================================================================
 # Copyright 2015 Avtech Scientific <http://avtechscientific.com>
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
-# 
+#
 # * Redistributions of source code must retain the above copyright
 #   notice, this list of conditions and the following disclaimer.
-# 
+#
 # * Redistributions in binary form must reproduce the above copyright
 #   notice, this list of conditions and the following disclaimer in the
 #   documentation and/or other materials provided with the distribution.
-# 
+#
 # * Neither the names of Kitware, Inc., the Insight Software Consortium,
 #   nor the names of their contributors may be used to endorse or promote
 #   products derived from this software without specific prior written
 #   permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -103,7 +103,7 @@ endif ()
 
 mark_as_advanced(MATIO_INCLUDE_DIR MATIO_LIBRARY)
 
-# handle the QUIETLY and REQUIRED arguments and set MATIO_FOUND to TRUE if 
+# handle the QUIETLY and REQUIRED arguments and set MATIO_FOUND to TRUE if
 # all listed variables are TRUE
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(MATIO REQUIRED_VARS MATIO_LIBRARY MATIO_INCLUDE_DIR VERSION_VAR MATIO_VERSION_STRING)
@@ -114,4 +114,4 @@ if(MATIO_FOUND)
 else(MATIO_FOUND)
   set(MATIO_LIBRARIES)
   set(MATIO_INCLUDE_DIRS)
-endif(MATIO_FOUND)
\ No newline at end of file
+endif(MATIO_FOUND)
diff --git a/cmake/Modules/FindORC.cmake b/cmake/Modules/FindORC.cmake
index 2751494ba..24249b08c 100644
--- a/cmake/Modules/FindORC.cmake
+++ b/cmake/Modules/FindORC.cmake
@@ -63,4 +63,4 @@ SET(ORC_LIBRARY_DIRS ${ORC_LIBRARY_DIR})
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(ORC "orc files" ORC_LIBRARY ORC_INCLUDE_DIR ORCC_EXECUTABLE)
 
-mark_as_advanced(ORC_INCLUDE_DIR ORC_LIBRARY ORCC_EXECUTABLE)
\ No newline at end of file
+mark_as_advanced(ORC_INCLUDE_DIR ORC_LIBRARY ORCC_EXECUTABLE)
diff --git a/cmake/Modules/FindOpenBLAS.cmake b/cmake/Modules/FindOpenBLAS.cmake
index 133de9b63..d9ce2a333 100644
--- a/cmake/Modules/FindOpenBLAS.cmake
+++ b/cmake/Modules/FindOpenBLAS.cmake
@@ -17,21 +17,21 @@
 
 # - Try to find OpenBLAS library (not headers!)
 #
-# The following environment variable is optionally searched 
+# The following environment variable is optionally searched
 # OPENBLAS_HOME: Base directory where all OpenBlas components are found
 
-SET(OPEN_BLAS_SEARCH_PATHS  /lib/ 
-                            /lib64/  
-                            /usr/lib 
-                            /usr/lib64 
-                            /usr/local/lib 
-                            /usr/local/lib64 
-                            /opt/OpenBLAS/lib 
-                            /opt/local/lib 
-                            /usr/lib/openblas-base 
-                            $ENV{OPENBLAS_HOME}/lib 
+SET(OPEN_BLAS_SEARCH_PATHS  /lib/
+                            /lib64/
+                            /usr/lib
+                            /usr/lib64
+                            /usr/local/lib
+                            /usr/local/lib64
+                            /opt/OpenBLAS/lib
+                            /opt/local/lib
+                            /usr/lib/openblas-base
+                            $ENV{OPENBLAS_HOME}/lib
                             )
-                            
+
 FIND_LIBRARY(OPENBLAS NAMES openblas PATHS ${OPEN_BLAS_SEARCH_PATHS})
 
 IF (OPENBLAS)
diff --git a/cmake/Modules/FindPCAP.cmake b/cmake/Modules/FindPCAP.cmake
index 3be89420e..679d8ef08 100644
--- a/cmake/Modules/FindPCAP.cmake
+++ b/cmake/Modules/FindPCAP.cmake
@@ -37,16 +37,16 @@
 # Find the PCAP includes and library
 # http://www.tcpdump.org/
 #
-# The environment variable PCAPDIR allows to specficy where to find 
+# The environment variable PCAPDIR allows to specficy where to find
 # libpcap in non standard location.
-#  
+#
 #  PCAP_INCLUDE_DIRS - where to find pcap.h, etc.
 #  PCAP_LIBRARIES   - List of libraries when using pcap.
 #  PCAP_FOUND       - True if pcap found.
 
 
 IF(EXISTS $ENV{PCAPDIR})
-  FIND_PATH(PCAP_INCLUDE_DIR 
+  FIND_PATH(PCAP_INCLUDE_DIR
     NAMES
     pcap/pcap.h
     pcap.h
@@ -54,28 +54,28 @@ IF(EXISTS $ENV{PCAPDIR})
       $ENV{PCAPDIR}
     NO_DEFAULT_PATH
   )
-  
+
   FIND_LIBRARY(PCAP_LIBRARY
-    NAMES 
+    NAMES
       pcap
     PATHS
       $ENV{PCAPDIR}
     NO_DEFAULT_PATH
   )
-  
+
 
 ELSE(EXISTS $ENV{PCAPDIR})
-  FIND_PATH(PCAP_INCLUDE_DIR 
+  FIND_PATH(PCAP_INCLUDE_DIR
     NAMES
     pcap/pcap.h
     pcap.h
   )
-  
+
   FIND_LIBRARY(PCAP_LIBRARY
-    NAMES 
+    NAMES
       pcap
   )
-  
+
 ENDIF(EXISTS $ENV{PCAPDIR})
 
 SET(PCAP_INCLUDE_DIRS ${PCAP_INCLUDE_DIR})
diff --git a/cmake/Modules/FindPugiXML.cmake b/cmake/Modules/FindPugiXML.cmake
index e1e8df872..a2b546179 100644
--- a/cmake/Modules/FindPugiXML.cmake
+++ b/cmake/Modules/FindPugiXML.cmake
@@ -66,4 +66,4 @@ else (PUGIXML_FOUND)
     message (STATUS "PugiXML not found.")
 endif(PUGIXML_FOUND)
 
-mark_as_advanced (PUGIXML_LIBRARY PUGIXML_INCLUDE_DIR)
\ No newline at end of file
+mark_as_advanced (PUGIXML_LIBRARY PUGIXML_INCLUDE_DIR)
diff --git a/cmake/Modules/FindVolkGnssSdr.cmake b/cmake/Modules/FindVolkGnssSdr.cmake
index 6225f38a0..ecc12685a 100644
--- a/cmake/Modules/FindVolkGnssSdr.cmake
+++ b/cmake/Modules/FindVolkGnssSdr.cmake
@@ -46,4 +46,4 @@ FIND_LIBRARY(
 
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(VOLK_GNSSSDR DEFAULT_MSG VOLK_GNSSSDR_LIBRARIES VOLK_GNSSSDR_INCLUDE_DIRS)
-MARK_AS_ADVANCED(VOLK_GNSSSDR_LIBRARIES VOLK_GNSSSDR_INCLUDE_DIRS)
\ No newline at end of file
+MARK_AS_ADVANCED(VOLK_GNSSSDR_LIBRARIES VOLK_GNSSSDR_INCLUDE_DIRS)
diff --git a/cmake/Modules/TestForARM.cmake b/cmake/Modules/TestForARM.cmake
index 9a5445287..254c5bc41 100644
--- a/cmake/Modules/TestForARM.cmake
+++ b/cmake/Modules/TestForARM.cmake
@@ -16,7 +16,7 @@
 # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
 
 ##############################################################################
-# check if the compiler defines the architecture as ARM  and set the 
+# check if the compiler defines the architecture as ARM  and set the
 # version, if found.
 #
 # - Anthony Arnold
@@ -89,9 +89,9 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     else (ARM_VERSION STREQUAL "")
       message(STATUS "ARM version ${ARM_VERSION} detected")
     endif (ARM_VERSION STREQUAL "")
-    
+
   else (NOT ARM_FOUND STREQUAL "")
-    message(STATUS "System is not ARM")  
+    message(STATUS "System is not ARM")
   endif(NOT ARM_FOUND STREQUAL "")
 
 else (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
diff --git a/src/algorithms/PVT/libs/CMakeLists.txt b/src/algorithms/PVT/libs/CMakeLists.txt
index 6807e9602..ed69cabab 100644
--- a/src/algorithms/PVT/libs/CMakeLists.txt
+++ b/src/algorithms/PVT/libs/CMakeLists.txt
@@ -18,28 +18,28 @@
 
 add_definitions( -DGNSS_SDR_VERSION="${VERSION}" )
 
-set(PVT_LIB_SOURCES 
+set(PVT_LIB_SOURCES
      pvt_solution.cc
      ls_pvt.cc
      hybrid_ls_pvt.cc
      kml_printer.cc
      gpx_printer.cc
      rinex_printer.cc
-     nmea_printer.cc  
+     nmea_printer.cc
      rtcm_printer.cc
      geojson_printer.cc
      rtklib_solver.cc
      pvt_conf.cc
 )
 
-set(PVT_LIB_HEADERS 
+set(PVT_LIB_HEADERS
      pvt_solution.h
      ls_pvt.h
      hybrid_ls_pvt.h
      kml_printer.h
      gpx_printer.h
      rinex_printer.h
-     nmea_printer.h  
+     nmea_printer.h
      rtcm_printer.h
      geojson_printer.h
      rtklib_solver.h
@@ -75,11 +75,12 @@ else(MATIO_FOUND)
 endif(MATIO_FOUND)
 
 target_link_libraries(
-    pvt_lib 
+    pvt_lib
     rtklib_lib
     gnss_sdr_flags
-    ${Boost_LIBRARIES} 
-    ${GLOG_LIBRARIES} 
+    gnss_sp_libs
+    ${Boost_LIBRARIES}
+    ${GLOG_LIBRARIES}
     ${ARMADILLO_LIBRARIES}
     ${BLAS}
     ${LAPACK}
diff --git a/src/algorithms/acquisition/CMakeLists.txt b/src/algorithms/acquisition/CMakeLists.txt
index 5cf06e3e8..96259341c 100644
--- a/src/algorithms/acquisition/CMakeLists.txt
+++ b/src/algorithms/acquisition/CMakeLists.txt
@@ -19,4 +19,3 @@
 add_subdirectory(adapters)
 add_subdirectory(gnuradio_blocks)
 add_subdirectory(libs)
-
diff --git a/src/algorithms/acquisition/adapters/CMakeLists.txt b/src/algorithms/acquisition/adapters/CMakeLists.txt
index b44f7d6f2..b27cb9cb3 100644
--- a/src/algorithms/acquisition/adapters/CMakeLists.txt
+++ b/src/algorithms/acquisition/adapters/CMakeLists.txt
@@ -57,19 +57,19 @@ set(ACQ_ADAPTER_HEADERS
 
 
 if(ENABLE_FPGA)
-    set(ACQ_ADAPTER_SOURCES ${ACQ_ADAPTER_SOURCES} gps_l1_ca_pcps_acquisition_fpga.cc 
+    set(ACQ_ADAPTER_SOURCES ${ACQ_ADAPTER_SOURCES} gps_l1_ca_pcps_acquisition_fpga.cc
                                                    gps_l2_m_pcps_acquisition_fpga.cc
                                                    galileo_e1_pcps_ambiguous_acquisition_fpga.cc
                                                    galileo_e5a_pcps_acquisition_fpga.cc
                                                    gps_l5i_pcps_acquisition_fpga.cc)
 
-    set(ACQ_ADAPTER_HEADERS ${ACQ_ADAPTER_HEADERS} gps_l1_ca_pcps_acquisition_fpga.h 
+    set(ACQ_ADAPTER_HEADERS ${ACQ_ADAPTER_HEADERS} gps_l1_ca_pcps_acquisition_fpga.h
                                                    gps_l2_m_pcps_acquisition_fpga.h
                                                    galileo_e1_pcps_ambiguous_acquisition_fpga.h
                                                    galileo_e5a_pcps_acquisition_fpga.h
-                                                   gps_l5i_pcps_acquisition_fpga.h)                                                   
+                                                   gps_l5i_pcps_acquisition_fpga.h)
 endif(ENABLE_FPGA)
-    
+
 if(OPENCL_FOUND)
     set(ACQ_ADAPTER_SOURCES ${ACQ_ADAPTER_SOURCES} gps_l1_ca_pcps_opencl_acquisition.cc)
     set(ACQ_ADAPTER_HEADERS ${ACQ_ADAPTER_HEADERS} gps_l1_ca_pcps_opencl_acquisition.h)
diff --git a/src/algorithms/channel/CMakeLists.txt b/src/algorithms/channel/CMakeLists.txt
index 077b74808..cd5604218 100644
--- a/src/algorithms/channel/CMakeLists.txt
+++ b/src/algorithms/channel/CMakeLists.txt
@@ -17,4 +17,4 @@
 #
 
 add_subdirectory(adapters)
-add_subdirectory(libs)
\ No newline at end of file
+add_subdirectory(libs)
diff --git a/src/algorithms/channel/libs/CMakeLists.txt b/src/algorithms/channel/libs/CMakeLists.txt
index 308e97833..7965cea70 100644
--- a/src/algorithms/channel/libs/CMakeLists.txt
+++ b/src/algorithms/channel/libs/CMakeLists.txt
@@ -16,15 +16,15 @@
 # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
 #
 
-set(CHANNEL_FSM_SOURCES 
-    channel_fsm.cc 
+set(CHANNEL_FSM_SOURCES
+    channel_fsm.cc
     channel_msg_receiver_cc.cc
     )
-    
-set(CHANNEL_FSM_HEADERS 
-    channel_fsm.h 
+
+set(CHANNEL_FSM_HEADERS
+    channel_fsm.h
     channel_msg_receiver_cc.h
-    )    
+    )
 
 include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
@@ -46,4 +46,3 @@ source_group(Headers FILES ${CHANNEL_FSM_HEADERS})
 add_dependencies(channel_fsm glog-${glog_RELEASE})
 
 target_link_libraries(channel_fsm gnss_rx)
-
diff --git a/src/algorithms/conditioner/CMakeLists.txt b/src/algorithms/conditioner/CMakeLists.txt
index de941b536..166f27d36 100644
--- a/src/algorithms/conditioner/CMakeLists.txt
+++ b/src/algorithms/conditioner/CMakeLists.txt
@@ -17,4 +17,3 @@
 #
 
 add_subdirectory(adapters)
-#add_subdirectory(gnuradio_blocks)
\ No newline at end of file
diff --git a/src/algorithms/conditioner/adapters/CMakeLists.txt b/src/algorithms/conditioner/adapters/CMakeLists.txt
index fea88dd0a..def069263 100644
--- a/src/algorithms/conditioner/adapters/CMakeLists.txt
+++ b/src/algorithms/conditioner/adapters/CMakeLists.txt
@@ -17,12 +17,12 @@
 #
 
 
-set(COND_ADAPTER_SOURCES 
+set(COND_ADAPTER_SOURCES
 	signal_conditioner.cc
 	array_signal_conditioner.cc
 )
 
-set(COND_ADAPTER_HEADERS 
+set(COND_ADAPTER_HEADERS
 	signal_conditioner.h
 	array_signal_conditioner.h
 )
@@ -44,4 +44,4 @@ 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})
\ No newline at end of file
+add_dependencies(conditioner_adapters glog-${glog_RELEASE})
diff --git a/src/algorithms/data_type_adapter/CMakeLists.txt b/src/algorithms/data_type_adapter/CMakeLists.txt
index 6037ad61f..1c15cc0ca 100644
--- a/src/algorithms/data_type_adapter/CMakeLists.txt
+++ b/src/algorithms/data_type_adapter/CMakeLists.txt
@@ -19,4 +19,3 @@
 
 add_subdirectory(adapters)
 add_subdirectory(gnuradio_blocks)
-
diff --git a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt
index 26eb01b83..419e1a271 100644
--- a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt
+++ b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt
@@ -17,23 +17,23 @@
 #
 
 
-set(DATATYPE_ADAPTER_SOURCES 
+set(DATATYPE_ADAPTER_SOURCES
     byte_to_short.cc
     ibyte_to_cbyte.cc
     ibyte_to_complex.cc
     ibyte_to_cshort.cc
     ishort_to_cshort.cc
-	ishort_to_complex.cc 
+	ishort_to_complex.cc
 )
-	 
-set(DATATYPE_ADAPTER_HEADERS 
+
+set(DATATYPE_ADAPTER_HEADERS
     byte_to_short.h
     ibyte_to_cbyte.h
     ibyte_to_complex.h
     ibyte_to_cshort.h
     ishort_to_cshort.h
-	ishort_to_complex.h 
-)	 
+	ishort_to_complex.h
+)
 
 include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt b/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt
index 1bb51014b..2253ce5f8 100644
--- a/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt
@@ -17,13 +17,13 @@
 #
 
 
-set(DATA_TYPE_GR_BLOCKS_SOURCES 
+set(DATA_TYPE_GR_BLOCKS_SOURCES
      interleaved_byte_to_complex_byte.cc
      interleaved_short_to_complex_short.cc
      interleaved_byte_to_complex_short.cc
 )
 
-set(DATA_TYPE_GR_BLOCKS_HEADERS 
+set(DATA_TYPE_GR_BLOCKS_HEADERS
      interleaved_byte_to_complex_byte.h
      interleaved_short_to_complex_short.h
      interleaved_byte_to_complex_short.h
diff --git a/src/algorithms/input_filter/CMakeLists.txt b/src/algorithms/input_filter/CMakeLists.txt
index 64cb2a571..1841d3dfc 100644
--- a/src/algorithms/input_filter/CMakeLists.txt
+++ b/src/algorithms/input_filter/CMakeLists.txt
@@ -17,4 +17,4 @@
 #
 
 add_subdirectory(adapters)
-add_subdirectory(gnuradio_blocks)
\ No newline at end of file
+add_subdirectory(gnuradio_blocks)
diff --git a/src/algorithms/input_filter/adapters/CMakeLists.txt b/src/algorithms/input_filter/adapters/CMakeLists.txt
index a2520bf39..959c1ba88 100644
--- a/src/algorithms/input_filter/adapters/CMakeLists.txt
+++ b/src/algorithms/input_filter/adapters/CMakeLists.txt
@@ -16,7 +16,7 @@
 # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
 #
 
-set(INPUT_FILTER_ADAPTER_SOURCES 
+set(INPUT_FILTER_ADAPTER_SOURCES
      fir_filter.cc
      freq_xlating_fir_filter.cc
      beamformer_filter.cc
@@ -25,7 +25,7 @@ set(INPUT_FILTER_ADAPTER_SOURCES
      notch_filter_lite.cc
 )
 
-set(INPUT_FILTER_ADAPTER_HEADERS 
+set(INPUT_FILTER_ADAPTER_HEADERS
      fir_filter.h
      freq_xlating_fir_filter.h
      beamformer_filter.h
diff --git a/src/algorithms/observables/CMakeLists.txt b/src/algorithms/observables/CMakeLists.txt
index 64cb2a571..1841d3dfc 100644
--- a/src/algorithms/observables/CMakeLists.txt
+++ b/src/algorithms/observables/CMakeLists.txt
@@ -17,4 +17,4 @@
 #
 
 add_subdirectory(adapters)
-add_subdirectory(gnuradio_blocks)
\ No newline at end of file
+add_subdirectory(gnuradio_blocks)
diff --git a/src/algorithms/resampler/CMakeLists.txt b/src/algorithms/resampler/CMakeLists.txt
index 64cb2a571..1841d3dfc 100644
--- a/src/algorithms/resampler/CMakeLists.txt
+++ b/src/algorithms/resampler/CMakeLists.txt
@@ -17,4 +17,4 @@
 #
 
 add_subdirectory(adapters)
-add_subdirectory(gnuradio_blocks)
\ No newline at end of file
+add_subdirectory(gnuradio_blocks)
diff --git a/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt b/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt
index 81c9e3deb..26233f3fd 100644
--- a/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt
@@ -17,13 +17,13 @@
 #
 
 
-set(RESAMPLER_GR_BLOCKS_SOURCES 
+set(RESAMPLER_GR_BLOCKS_SOURCES
      direct_resampler_conditioner_cc.cc
      direct_resampler_conditioner_cs.cc
      direct_resampler_conditioner_cb.cc
 )
 
-set(RESAMPLER_GR_BLOCKS_HEADERS 
+set(RESAMPLER_GR_BLOCKS_HEADERS
      direct_resampler_conditioner_cc.h
      direct_resampler_conditioner_cs.h
      direct_resampler_conditioner_cb.h
@@ -42,4 +42,4 @@ list(SORT RESAMPLER_GR_BLOCKS_SOURCES)
 
 add_library(resampler_gr_blocks ${RESAMPLER_GR_BLOCKS_SOURCES} ${RESAMPLER_GR_BLOCKS_HEADERS})
 source_group(Headers FILES ${RESAMPLER_GR_BLOCKS_HEADERS})
-add_dependencies(resampler_gr_blocks glog-${glog_RELEASE})
\ No newline at end of file
+add_dependencies(resampler_gr_blocks glog-${glog_RELEASE})
diff --git a/src/algorithms/signal_generator/adapters/CMakeLists.txt b/src/algorithms/signal_generator/adapters/CMakeLists.txt
index 6562a410c..c248171d9 100644
--- a/src/algorithms/signal_generator/adapters/CMakeLists.txt
+++ b/src/algorithms/signal_generator/adapters/CMakeLists.txt
@@ -33,9 +33,9 @@ include_directories(
 
 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} 
+target_link_libraries(signal_generator_adapters gnss_sp_libs
+                                                signal_generator_blocks
+                                                ${GNURADIO_RUNTIME_LIBRARIES}
+                                                ${GNURADIO_BLOCKS_LIBRARIES}
                                                 ${GNURADIO_FILTER_LIBRARIES}
 )
diff --git a/src/algorithms/signal_source/adapters/CMakeLists.txt b/src/algorithms/signal_source/adapters/CMakeLists.txt
index 7d37b139f..6fc6b11ed 100644
--- a/src/algorithms/signal_source/adapters/CMakeLists.txt
+++ b/src/algorithms/signal_source/adapters/CMakeLists.txt
@@ -202,7 +202,7 @@ if(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.3)
          two_bit_packed_file_signal_source.cc )
      set(SIGNAL_SOURCE_ADAPTER_HEADERS ${SIGNAL_SOURCE_ADAPTER_HEADERS}
          two_bit_cpx_file_signal_source.h
-         two_bit_packed_file_signal_source.h )         
+         two_bit_packed_file_signal_source.h )
 endif(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.3)
 
 include_directories(
diff --git a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
index 5c16fac07..9f9c174c7 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
@@ -70,9 +70,9 @@ list(SORT SIGNAL_SOURCE_GR_BLOCKS_SOURCES)
 
 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} 
+target_link_libraries(signal_source_gr_blocks
+    signal_source_lib
+    ${GNURADIO_RUNTIME_LIBRARIES}
     ${Boost_LIBRARIES}
     ${OPT_LIBRARIES}
 )
diff --git a/src/algorithms/signal_source/libs/CMakeLists.txt b/src/algorithms/signal_source/libs/CMakeLists.txt
index a7e5c8495..ef15705fe 100644
--- a/src/algorithms/signal_source/libs/CMakeLists.txt
+++ b/src/algorithms/signal_source/libs/CMakeLists.txt
@@ -70,7 +70,7 @@ set(SIGNAL_SOURCE_LIB_SOURCES
      rtl_tcp_dongle_info.cc
      ${OPT_SIGNAL_SOURCE_LIB_SOURCES}
 )
- 
+
 set(SIGNAL_SOURCE_LIB_HEADERS
      rtl_tcp_commands.h
      rtl_tcp_dongle_info.h
diff --git a/src/algorithms/telemetry_decoder/CMakeLists.txt b/src/algorithms/telemetry_decoder/CMakeLists.txt
index ea74d8ec3..96259341c 100644
--- a/src/algorithms/telemetry_decoder/CMakeLists.txt
+++ b/src/algorithms/telemetry_decoder/CMakeLists.txt
@@ -18,4 +18,4 @@
 
 add_subdirectory(adapters)
 add_subdirectory(gnuradio_blocks)
-add_subdirectory(libs)
\ No newline at end of file
+add_subdirectory(libs)
diff --git a/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt b/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt
index db68a7cce..7c4e4b53a 100644
--- a/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt
+++ b/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt
@@ -20,23 +20,23 @@
 set(TELEMETRY_DECODER_ADAPTER_SOURCES
     gps_l1_ca_telemetry_decoder.cc
     gps_l2c_telemetry_decoder.cc
-    gps_l5_telemetry_decoder.cc 
+    gps_l5_telemetry_decoder.cc
     galileo_e1b_telemetry_decoder.cc
     sbas_l1_telemetry_decoder.cc
     galileo_e5a_telemetry_decoder.cc
     glonass_l1_ca_telemetry_decoder.cc
-    glonass_l2_ca_telemetry_decoder.cc 
+    glonass_l2_ca_telemetry_decoder.cc
 )
 
 set(TELEMETRY_DECODER_ADAPTER_HEADERS
     gps_l1_ca_telemetry_decoder.h
     gps_l2c_telemetry_decoder.h
-    gps_l5_telemetry_decoder.h 
+    gps_l5_telemetry_decoder.h
     galileo_e1b_telemetry_decoder.h
     sbas_l1_telemetry_decoder.h
     galileo_e5a_telemetry_decoder.h
     glonass_l1_ca_telemetry_decoder.h
-    glonass_l2_ca_telemetry_decoder.h 
+    glonass_l2_ca_telemetry_decoder.h
 )
 
 include_directories(
diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt b/src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt
index 8dba92115..ad356be81 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt
@@ -16,19 +16,19 @@
 # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
 #
 
-set(TELEMETRY_DECODER_LIBSWIFTCNAV_SOURCES 
+set(TELEMETRY_DECODER_LIBSWIFTCNAV_SOURCES
      cnav_msg.c
      bits.c
      edc.c
-     viterbi27.c   
+     viterbi27.c
 )
 
-set(TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS 
+set(TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS
      cnav_msg.h
      bits.h
      edc.h
-     swift_common.h  
-     fec.h 
+     swift_common.h
+     fec.h
 )
 
 include_directories(
diff --git a/src/algorithms/tracking/adapters/CMakeLists.txt b/src/algorithms/tracking/adapters/CMakeLists.txt
index e8d12d844..5ac4ec00b 100644
--- a/src/algorithms/tracking/adapters/CMakeLists.txt
+++ b/src/algorithms/tracking/adapters/CMakeLists.txt
@@ -23,19 +23,19 @@ if(ENABLE_CUDA)
 endif(ENABLE_CUDA)
 
 if(ENABLE_FPGA)
-     set(OPT_TRACKING_ADAPTERS_SOURCES ${OPT_TRACKING_ADAPTERS_SOURCES} 
+     set(OPT_TRACKING_ADAPTERS_SOURCES ${OPT_TRACKING_ADAPTERS_SOURCES}
                                        gps_l1_ca_dll_pll_tracking_fpga.cc
                                        gps_l2_m_dll_pll_tracking_fpga.cc
                                        galileo_e1_dll_pll_veml_tracking_fpga.cc
                                        galileo_e5a_dll_pll_tracking_fpga.cc
                                        gps_l5_dll_pll_tracking_fpga.cc)
 
-     set(OPT_TRACKING_ADAPTERS_HEADERS ${OPT_TRACKING_ADAPTERS_HEADERS} 
+     set(OPT_TRACKING_ADAPTERS_HEADERS ${OPT_TRACKING_ADAPTERS_HEADERS}
                                        gps_l1_ca_dll_pll_tracking_fpga.h
                                        gps_l2_m_dll_pll_tracking_fpga.h
                                        galileo_e1_dll_pll_veml_tracking_fpga.h
                                        galileo_e5a_dll_pll_tracking_fpga.h
-                                       gps_l5_dll_pll_tracking_fpga.h)                       
+                                       gps_l5_dll_pll_tracking_fpga.h)
 endif(ENABLE_FPGA)
 
 set(TRACKING_ADAPTER_SOURCES
diff --git a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
index d31676a64..9ac1a4e26 100644
--- a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
@@ -36,7 +36,7 @@ set(TRACKING_GR_BLOCKS_SOURCES
      glonass_l1_ca_dll_pll_tracking_cc.cc
      glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
      glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc
-     gps_l1_ca_kf_tracking_cc.cc  
+     gps_l1_ca_kf_tracking_cc.cc
      glonass_l2_ca_dll_pll_tracking_cc.cc
      glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
      glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc
@@ -52,7 +52,7 @@ set(TRACKING_GR_BLOCKS_HEADERS
      glonass_l1_ca_dll_pll_tracking_cc.h
      glonass_l1_ca_dll_pll_c_aid_tracking_cc.h
      glonass_l1_ca_dll_pll_c_aid_tracking_sc.h
-     gps_l1_ca_kf_tracking_cc.h  
+     gps_l1_ca_kf_tracking_cc.h
      glonass_l2_ca_dll_pll_tracking_cc.h
      glonass_l2_ca_dll_pll_c_aid_tracking_cc.h
      glonass_l2_ca_dll_pll_c_aid_tracking_sc.h
diff --git a/src/core/libs/CMakeLists.txt b/src/core/libs/CMakeLists.txt
index 45c7477ab..0c6bbd4c2 100644
--- a/src/core/libs/CMakeLists.txt
+++ b/src/core/libs/CMakeLists.txt
@@ -22,20 +22,20 @@ if(OPENSSL_FOUND)
     add_definitions( -DUSE_OPENSSL_FALLBACK=1 )
 endif(OPENSSL_FOUND)
 
-set(CORE_LIBS_SOURCES 
+set(CORE_LIBS_SOURCES
     ini.cc
     INIReader.cc
     string_converter.cc
     gnss_sdr_supl_client.cc
 )
 
-set(CORE_LIBS_HEADERS 
+set(CORE_LIBS_HEADERS
     ini.h
     INIReader.h
     string_converter.h
     gnss_sdr_supl_client.h
 )
-	
+
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_SOURCE_DIR}/src/core/system_parameters
diff --git a/src/core/libs/supl/CMakeLists.txt b/src/core/libs/supl/CMakeLists.txt
index 6d0edd576..4faecafda 100644
--- a/src/core/libs/supl/CMakeLists.txt
+++ b/src/core/libs/supl/CMakeLists.txt
@@ -39,13 +39,11 @@ include_directories(
 
 if(CMAKE_C_COMPILER_ID MATCHES "Clang")
     if(CMAKE_BUILD_TYPE MATCHES "Release")
-        set(MY_C_FLAGS "${MY_C_FLAGS} -Wno-parentheses-equality")         
+        set(MY_C_FLAGS "${MY_C_FLAGS} -Wno-parentheses-equality")
     endif(CMAKE_BUILD_TYPE MATCHES "Release")
-endif(CMAKE_C_COMPILER_ID MATCHES "Clang")	
+endif(CMAKE_C_COMPILER_ID MATCHES "Clang")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_C_FLAGS}")
 
 add_library (supl_library STATIC ${ASN_RRLP_SOURCES} ${ASN_SUPL_SOURCES} ${SUPL_SOURCES})
-target_link_libraries (supl_library ${GNUTLS_LIBRARIES} ${GNUTLS_OPENSSL_LIBRARY} gnss_system_parameters) 
+target_link_libraries (supl_library ${GNUTLS_LIBRARIES} ${GNUTLS_OPENSSL_LIBRARY} gnss_system_parameters)
 set_target_properties(supl_library PROPERTIES LINKER_LANGUAGE C)
-
-
diff --git a/src/core/monitor/CMakeLists.txt b/src/core/monitor/CMakeLists.txt
index ccbdd9f44..8bba7c587 100644
--- a/src/core/monitor/CMakeLists.txt
+++ b/src/core/monitor/CMakeLists.txt
@@ -17,12 +17,12 @@
 #
 
 
-set(CORE_MONITOR_LIBS_SOURCES 
+set(CORE_MONITOR_LIBS_SOURCES
 	gnss_synchro_monitor.cc
 	gnss_synchro_udp_sink.cc
 )
 
-set(CORE_MONITOR_LIBS_HEADERS 
+set(CORE_MONITOR_LIBS_HEADERS
 	gnss_synchro_monitor.h
 	gnss_synchro_udp_sink.h
 )
@@ -42,5 +42,5 @@ list(SORT CORE_MONITOR_LIBS_SOURCES)
 
 add_library(core_monitor_lib ${CORE_MONITOR_LIBS_SOURCES} ${CORE_MONITOR_LIBS_HEADERS})
 source_group(Headers FILES ${CORE_MONITOR_LIBS_HEADERS})
-target_link_libraries(core_monitor_lib ${Boost_LIBRARIES}) 
+target_link_libraries(core_monitor_lib ${Boost_LIBRARIES})
 add_dependencies(core_monitor_lib glog-${glog_RELEASE})
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 3978f1b71..98c69c627 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -24,7 +24,7 @@ add_subdirectory(system-tests/libs)
 # Google Test - https://github.com/google/googletest
 ################################################################################
 if(EXISTS $ENV{GTEST_DIR})
-   set(GTEST_DIR_LOCAL $ENV{GTEST_DIR})
+    set(GTEST_DIR_LOCAL $ENV{GTEST_DIR})
 endif(EXISTS $ENV{GTEST_DIR})
 if(GTEST_DIR)
     set(GTEST_DIR_LOCAL ${GTEST_DIR})
@@ -47,69 +47,69 @@ if(EXISTS $ENV{OECORE_TARGET_SYSROOT})
 endif(EXISTS $ENV{OECORE_TARGET_SYSROOT})
 
 if(NOT ${GTEST_DIR_LOCAL})
-     # if GTEST_DIR is not defined, we download and build it
-     if(CMAKE_VERSION VERSION_LESS 3.2)
+    # if GTEST_DIR is not defined, we download and build it
+    if(CMAKE_VERSION VERSION_LESS 3.2)
       ExternalProject_Add(
-         gtest-${GNSSSDR_GTEST_LOCAL_VERSION}
-         GIT_REPOSITORY https://github.com/google/googletest
-         GIT_TAG release-${GNSSSDR_GTEST_LOCAL_VERSION}
-         SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gtest/gtest-${GNSSSDR_GTEST_LOCAL_VERSION}
-         BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${GNSSSDR_GTEST_LOCAL_VERSION}
-         CMAKE_ARGS ${GTEST_COMPILER} -DINSTALL_GTEST=OFF -DBUILD_GMOCK=OFF ${TOOLCHAIN_ARG}
-         UPDATE_COMMAND ""
-         PATCH_COMMAND ""
-         INSTALL_COMMAND ""
+        gtest-${GNSSSDR_GTEST_LOCAL_VERSION}
+        GIT_REPOSITORY https://github.com/google/googletest
+        GIT_TAG release-${GNSSSDR_GTEST_LOCAL_VERSION}
+        SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gtest/gtest-${GNSSSDR_GTEST_LOCAL_VERSION}
+        BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${GNSSSDR_GTEST_LOCAL_VERSION}
+        CMAKE_ARGS ${GTEST_COMPILER} -DINSTALL_GTEST=OFF -DBUILD_GMOCK=OFF ${TOOLCHAIN_ARG}
+        UPDATE_COMMAND ""
+        PATCH_COMMAND ""
+        INSTALL_COMMAND ""
       )
-     else(CMAKE_VERSION VERSION_LESS 3.2)
+    else(CMAKE_VERSION VERSION_LESS 3.2)
       ExternalProject_Add(
-         gtest-${GNSSSDR_GTEST_LOCAL_VERSION}
-         GIT_REPOSITORY https://github.com/google/googletest
-         GIT_TAG release-${GNSSSDR_GTEST_LOCAL_VERSION}
-         SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gtest/gtest-${GNSSSDR_GTEST_LOCAL_VERSION}
-         BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${GNSSSDR_GTEST_LOCAL_VERSION}
-         CMAKE_ARGS ${GTEST_COMPILER} -DINSTALL_GTEST=OFF -DBUILD_GMOCK=OFF ${TOOLCHAIN_ARG}
-         UPDATE_COMMAND ""
-         PATCH_COMMAND ""
-         BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${GNSSSDR_GTEST_LOCAL_VERSION}/googletest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}
-                          ${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${GNSSSDR_GTEST_LOCAL_VERSION}/googletest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}
-         INSTALL_COMMAND ""
+        gtest-${GNSSSDR_GTEST_LOCAL_VERSION}
+        GIT_REPOSITORY https://github.com/google/googletest
+        GIT_TAG release-${GNSSSDR_GTEST_LOCAL_VERSION}
+        SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gtest/gtest-${GNSSSDR_GTEST_LOCAL_VERSION}
+        BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${GNSSSDR_GTEST_LOCAL_VERSION}
+        CMAKE_ARGS ${GTEST_COMPILER} -DINSTALL_GTEST=OFF -DBUILD_GMOCK=OFF ${TOOLCHAIN_ARG}
+        UPDATE_COMMAND ""
+        PATCH_COMMAND ""
+        BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${GNSSSDR_GTEST_LOCAL_VERSION}/googletest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}
+            ${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${GNSSSDR_GTEST_LOCAL_VERSION}/googletest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}
+        INSTALL_COMMAND ""
       )
-     endif(CMAKE_VERSION VERSION_LESS 3.2)
+    endif(CMAKE_VERSION VERSION_LESS 3.2)
 
-     # Set up variables
-     # Set recently downloaded and build Googletest root folder
-     set(GTEST_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gtest/gtest-${GNSSSDR_GTEST_LOCAL_VERSION}/googletest")
-     # Source code
-     ExternalProject_Get_Property(gtest-${GNSSSDR_GTEST_LOCAL_VERSION} source_dir)
-     set(GTEST_INCLUDE_DIR ${source_dir}/googletest/include)
-     set(GTEST_INCLUDE_DIRECTORIES ${GTEST_DIR}/include ${GTEST_DIR} ${GTEST_DIR}/src)
-     # Library
-     ExternalProject_Get_Property(gtest-${GNSSSDR_GTEST_LOCAL_VERSION} binary_dir)
-     if(OS_IS_MACOSX)
-         if(CMAKE_GENERATOR STREQUAL Xcode)
-             set(binary_dir "${binary_dir}/Debug")
-         endif(CMAKE_GENERATOR STREQUAL Xcode)
-     endif(OS_IS_MACOSX)
-     set(GTEST_LIBRARY_PATH "${binary_dir}/googletest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest${CMAKE_STATIC_LIBRARY_SUFFIX};${binary_dir}/googletest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}")
-     set(GTEST_LIBRARY gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
-     set(GTEST_LIBRARIES
-          ${binary_dir}/googletest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}
-          ${binary_dir}/googletest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}
-          ${THREAD_LIBRARIES} )
-     set(GTEST_LIB_DIR "${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${GNSSSDR_GTEST_LOCAL_VERSION}/googletest")
+    # Set up variables
+    # Set recently downloaded and build Googletest root folder
+    set(GTEST_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gtest/gtest-${GNSSSDR_GTEST_LOCAL_VERSION}/googletest")
+    # Source code
+    ExternalProject_Get_Property(gtest-${GNSSSDR_GTEST_LOCAL_VERSION} source_dir)
+    set(GTEST_INCLUDE_DIR ${source_dir}/googletest/include)
+    set(GTEST_INCLUDE_DIRECTORIES ${GTEST_DIR}/include ${GTEST_DIR} ${GTEST_DIR}/src)
+    # Library
+    ExternalProject_Get_Property(gtest-${GNSSSDR_GTEST_LOCAL_VERSION} binary_dir)
+    if(OS_IS_MACOSX)
+        if(CMAKE_GENERATOR STREQUAL Xcode)
+            set(binary_dir "${binary_dir}/Debug")
+        endif(CMAKE_GENERATOR STREQUAL Xcode)
+    endif(OS_IS_MACOSX)
+    set(GTEST_LIBRARY_PATH "${binary_dir}/googletest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest${CMAKE_STATIC_LIBRARY_SUFFIX};${binary_dir}/googletest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}")
+    set(GTEST_LIBRARY gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
+    set(GTEST_LIBRARIES
+        ${binary_dir}/googletest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}
+        ${binary_dir}/googletest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}
+        ${THREAD_LIBRARIES})
+    set(GTEST_LIB_DIR "${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${GNSSSDR_GTEST_LOCAL_VERSION}/googletest")
 else(NOT ${GTEST_DIR_LOCAL})
-     if(GTEST_INCLUDE_DIRS)
-          set(GTEST_INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIRS} ${LIBGTEST_DEV_DIR})
-          add_library(gtest ${LIBGTEST_DEV_DIR}/src/gtest-all.cc ${LIBGTEST_DEV_DIR}/src/gtest_main.cc)
-          set(GTEST_LIBRARIES gtest)
-     else(GTEST_INCLUDE_DIRS)
-          # If the variable GTEST_DIR is defined, we use the existing Googletest
-          set(GTEST_DIR $ENV{GTEST_DIR})
-          set(GTEST_INCLUDE_DIRECTORIES ${GTEST_DIR}/include ${GTEST_DIR} ${GTEST_DIR}/src)
-          add_library(gtest ${GTEST_DIR}/src/gtest-all.cc ${GTEST_DIR}/src/gtest_main.cc)
-          set(GTEST_LIBRARIES gtest)
-     endif(GTEST_INCLUDE_DIRS)
-     target_link_libraries(gtest ${THREAD_LIBRARIES})
+    if(GTEST_INCLUDE_DIRS)
+        set(GTEST_INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIRS} ${LIBGTEST_DEV_DIR})
+        add_library(gtest ${LIBGTEST_DEV_DIR}/src/gtest-all.cc ${LIBGTEST_DEV_DIR}/src/gtest_main.cc)
+        set(GTEST_LIBRARIES gtest)
+    else(GTEST_INCLUDE_DIRS)
+        # If the variable GTEST_DIR is defined, we use the existing Googletest
+        set(GTEST_DIR $ENV{GTEST_DIR})
+        set(GTEST_INCLUDE_DIRECTORIES ${GTEST_DIR}/include ${GTEST_DIR} ${GTEST_DIR}/src)
+        add_library(gtest ${GTEST_DIR}/src/gtest-all.cc ${GTEST_DIR}/src/gtest_main.cc)
+        set(GTEST_LIBRARIES gtest)
+    endif(GTEST_INCLUDE_DIRS)
+    target_link_libraries(gtest ${THREAD_LIBRARIES})
 endif(NOT ${GTEST_DIR_LOCAL})
 
 
@@ -134,20 +134,20 @@ if(ENABLE_GPERFTOOLS)
 endif(ENABLE_GPERFTOOLS)
 
 if(Boost_VERSION LESS 105000)
-     add_definitions(-DOLD_BOOST=1)
+    add_definitions(-DOLD_BOOST=1)
 endif(Boost_VERSION LESS 105000)
 
-if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4" )
-     add_definitions( -DGR_GREATER_38=1 )
-endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4" )
+if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
+    add_definitions( -DGR_GREATER_38=1)
+endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
 
 if(OPENSSL_FOUND)
-    add_definitions( -DUSE_OPENSSL_FALLBACK=1 )
+    add_definitions(-DUSE_OPENSSL_FALLBACK=1)
 endif(OPENSSL_FOUND)
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     if(OS_IS_MACOSX)
-       set(CLANG_FLAGS "-stdlib=libc++ -lc++")
+        set(CLANG_FLAGS "-stdlib=libc++ -lc++")
     endif(OS_IS_MACOSX)
 endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 
@@ -168,9 +168,9 @@ if(GNUPLOT_FOUND)
     add_definitions(-DGNUPLOT_EXECUTABLE="${GNUPLOT_EXECUTABLE}")
 endif(GNUPLOT_FOUND)
 
-if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.15" )
-    add_definitions( -DGR_GREATER_38=1 )
-endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.15" )
+if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.15")
+    add_definitions(-DGR_GREATER_38=1)
+endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.15")
 
 if(ENABLE_UNIT_TESTING_MINIMAL)
     add_definitions(-DUNIT_TESTING_MINIMAL=1)
@@ -182,203 +182,187 @@ endif(ENABLE_UNIT_TESTING_MINIMAL)
 ################################################################################
 option(ENABLE_GNSS_SIM_INSTALL "Enable the installation of gnss_sim on the fly" ON)
 if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA)
-   if(ENABLE_FPGA)
+    if(ENABLE_FPGA)
       set(CROSS_INSTALL_DIR "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
       if(EXISTS $ENV{OECORE_TARGET_SYSROOT})
           set(CROSS_INSTALL_DIR "${CROSS_INSTALL_DIR} -DBOOST_ROOT=$ENV{OECORE_TARGET_SYSROOT}/usr")
       endif(EXISTS $ENV{OECORE_TARGET_SYSROOT})
-   else(ENABLE_FPGA)
+    else(ENABLE_FPGA)
       set(CROSS_INSTALL_DIR "")
-   endif(ENABLE_FPGA)
-   find_package(GnssSimulator QUIET)
-   if(GNSS-SIMULATOR_FOUND OR NOT ENABLE_GNSS_SIM_INSTALL)
+    endif(ENABLE_FPGA)
+    find_package(GnssSimulator QUIET)
+    if(GNSS-SIMULATOR_FOUND OR NOT ENABLE_GNSS_SIM_INSTALL)
       add_definitions(-DSW_GENERATOR_BIN="${SW_GENERATOR_BIN}")
       add_definitions(-DDEFAULT_RINEX_NAV="${CMAKE_INSTALL_PREFIX}/share/gnss-sim/brdc3540.14n")
       add_definitions(-DDEFAULT_POSITION_FILE="${CMAKE_INSTALL_PREFIX}/share/gnss-sim/circle.csv")
-   else(GNSS-SIMULATOR_FOUND OR NOT ENABLE_GNSS_SIM_INSTALL)
+    else(GNSS-SIMULATOR_FOUND OR NOT ENABLE_GNSS_SIM_INSTALL)
       ExternalProject_Add(
-         gnss-sim
-         GIT_REPOSITORY https://bitbucket.org/jarribas/gnss-simulator
-         GIT_TAG ${GNSSSDR_GNSS_SIM_LOCAL_VERSION}
-         SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gnss-sim
-         BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../gnss-sim
-         CMAKE_ARGS ${GTEST_COMPILER} ${TOOLCHAIN_ARG} ${CROSS_INSTALL_DIR}
-         UPDATE_COMMAND ""
-         PATCH_COMMAND ""
-         INSTALL_COMMAND ""
+          gnss-sim
+          GIT_REPOSITORY https://bitbucket.org/jarribas/gnss-simulator
+          GIT_TAG ${GNSSSDR_GNSS_SIM_LOCAL_VERSION}
+          SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gnss-sim
+          BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../gnss-sim
+          CMAKE_ARGS ${GTEST_COMPILER} ${TOOLCHAIN_ARG} ${CROSS_INSTALL_DIR}
+          UPDATE_COMMAND ""
+          PATCH_COMMAND ""
+          INSTALL_COMMAND ""
       )
       if(ENABLE_INSTALL_TESTS)
-         install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/../../gnss-sim/gnss_sim DESTINATION bin)
-         install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../../thirdparty/gnss-sim/brdc3540.14n DESTINATION share/gnss-sim)
-         install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../../thirdparty/gnss-sim/circle.csv DESTINATION share/gnss-sim)
-         set(SW_GENERATOR_BIN ${CMAKE_INSTALL_PREFIX}/bin/gnss_sim)
-         add_definitions(-DSW_GENERATOR_BIN="${SW_GENERATOR_BIN}")
-         add_definitions(-DDEFAULT_RINEX_NAV="${CMAKE_INSTALL_PREFIX}/share/gnss-sim/brdc3540.14n")
-         add_definitions(-DDEFAULT_POSITION_FILE="${CMAKE_INSTALL_PREFIX}/share/gnss-sim/circle.csv")
+          install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/../../gnss-sim/gnss_sim DESTINATION bin)
+          install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../../thirdparty/gnss-sim/brdc3540.14n DESTINATION share/gnss-sim)
+          install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../../thirdparty/gnss-sim/circle.csv DESTINATION share/gnss-sim)
+          set(SW_GENERATOR_BIN ${CMAKE_INSTALL_PREFIX}/bin/gnss_sim)
+          add_definitions(-DSW_GENERATOR_BIN="${SW_GENERATOR_BIN}")
+          add_definitions(-DDEFAULT_RINEX_NAV="${CMAKE_INSTALL_PREFIX}/share/gnss-sim/brdc3540.14n")
+          add_definitions(-DDEFAULT_POSITION_FILE="${CMAKE_INSTALL_PREFIX}/share/gnss-sim/circle.csv")
       else(ENABLE_INSTALL_TESTS)
-         set(SW_GENERATOR_BIN ${CMAKE_CURRENT_BINARY_DIR}/../../gnss-sim/gnss_sim)
-         add_definitions(-DSW_GENERATOR_BIN="${SW_GENERATOR_BIN}")
-         add_definitions(-DDEFAULT_RINEX_NAV="${CMAKE_CURRENT_BINARY_DIR}/../../../thirdparty/gnss-sim/brdc3540.14n")
-         add_definitions(-DDEFAULT_POSITION_FILE="${CMAKE_CURRENT_BINARY_DIR}/../../../thirdparty/gnss-sim/circle.csv")
+          set(SW_GENERATOR_BIN ${CMAKE_CURRENT_BINARY_DIR}/../../gnss-sim/gnss_sim)
+          add_definitions(-DSW_GENERATOR_BIN="${SW_GENERATOR_BIN}")
+          add_definitions(-DDEFAULT_RINEX_NAV="${CMAKE_CURRENT_BINARY_DIR}/../../../thirdparty/gnss-sim/brdc3540.14n")
+          add_definitions(-DDEFAULT_POSITION_FILE="${CMAKE_CURRENT_BINARY_DIR}/../../../thirdparty/gnss-sim/circle.csv")
       endif(ENABLE_INSTALL_TESTS)
-   endif(GNSS-SIMULATOR_FOUND OR NOT ENABLE_GNSS_SIM_INSTALL)
+    endif(GNSS-SIMULATOR_FOUND OR NOT ENABLE_GNSS_SIM_INSTALL)
 
-   ################################################################################
-   # Local installation of GPSTk http://www.gpstk.org/
-   ################################################################################
-   find_package(GPSTK)
-   if(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK)
+    ################################################################################
+    # Local installation of GPSTk http://www.gpstk.org/
+    ################################################################################
+    find_package(GPSTK)
+    if(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK)
       message(STATUS "GPSTk v${GNSSSDR_GPSTK_LOCAL_VERSION} will be automatically downloaded and built when doing 'make'.")
-         if ("${TOOLCHAIN_ARG}" STREQUAL "")
-            set(TOOLCHAIN_ARG "-DCMAKE_CXX_FLAGS=\"-Wno-deprecated\"")
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated")     
-         endif("${TOOLCHAIN_ARG}" STREQUAL "")
- #     if(NOT ENABLE_FPGA)
-          if(CMAKE_VERSION VERSION_LESS 3.2)
-           ExternalProject_Add(
-             gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}
-             GIT_REPOSITORY https://github.com/SGL-UT/GPSTk
-             GIT_TAG v${GNSSSDR_GPSTK_LOCAL_VERSION}
-             SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}
-             BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}
-             CMAKE_ARGS ${GTEST_COMPILER} ${TOOLCHAIN_ARG} -DCMAKE_INSTALL_PREFIX=${CMAKE_SOURCE_DIR}/thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install -DBUILD_EXT=OFF -DBUILD_PYTHON=OFF
-             UPDATE_COMMAND ""
-             PATCH_COMMAND ""
-           )
-          else(CMAKE_VERSION VERSION_LESS 3.2)
-           ExternalProject_Add(
-             gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}
-             GIT_REPOSITORY https://github.com/SGL-UT/GPSTk
-             GIT_TAG v${GNSSSDR_GPSTK_LOCAL_VERSION}
-             SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}
-             BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}
-             CMAKE_ARGS ${GTEST_COMPILER} ${TOOLCHAIN_ARG} -DCMAKE_INSTALL_PREFIX=${CMAKE_SOURCE_DIR}/thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install -DBUILD_EXT=OFF -DBUILD_PYTHON=OFF
-             BUILD_BYPRODUCTS ${CMAKE_SOURCE_DIR}/thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gpstk${CMAKE_SHARED_LIBRARY_SUFFIX}
-             UPDATE_COMMAND ""
-             PATCH_COMMAND ""
-           )
-          endif(CMAKE_VERSION VERSION_LESS 3.2)
-
-          set(GPSTK_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/include CACHE PATH "Local GPSTK headers")
-          add_library(gpstk UNKNOWN IMPORTED)
-          set_property(TARGET gpstk PROPERTY IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gpstk${CMAKE_SHARED_LIBRARY_SUFFIX})
-          add_dependencies(gpstk gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION})
-          set(GPSTK_BINDIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/bin/ )
-          add_definitions(-DGPSTK_BINDIR="${GPSTK_BINDIR}")
-          set(gpstk_libs gpstk)
-          set(OWN_GPSTK True)
-#      else(NOT ENABLE_FPGA)
-#          message(STATUS "GPSTk has not been found, try to install it on target.")
-#          message(STATUS "Some extra tests requiring GPSTk will not be built.")
-#      endif(NOT ENABLE_FPGA)
-   else(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK)
-       set(gpstk_libs ${GPSTK_LIBRARIES})
-       set(GPSTK_INCLUDE_DIRS ${GPSTK_INCLUDE_DIR})
-       set(GPSTK_BINDIR ${GPSTK_LIBRARY}/../bin/ )
-       add_definitions(-DGPSTK_BINDIR="${GPSTK_BINDIR}")
-   endif(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK)
+      if ("${TOOLCHAIN_ARG}" STREQUAL "")
+          set(TOOLCHAIN_ARG "-DCMAKE_CXX_FLAGS=\"-Wno-deprecated\"")
+          set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated")
+      endif("${TOOLCHAIN_ARG}" STREQUAL "")
+      include(GNUInstallDirs)
+      if(CMAKE_VERSION VERSION_LESS 3.2)
+          ExternalProject_Add(
+            gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}
+            GIT_REPOSITORY https://github.com/SGL-UT/GPSTk
+            GIT_TAG v${GNSSSDR_GPSTK_LOCAL_VERSION}
+            SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}
+            BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}
+            CMAKE_ARGS ${GTEST_COMPILER} ${TOOLCHAIN_ARG} -DCMAKE_INSTALL_PREFIX=${CMAKE_SOURCE_DIR}/thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install -DBUILD_EXT=OFF -DBUILD_PYTHON=OFF
+            UPDATE_COMMAND ""
+            PATCH_COMMAND ""
+          )
+      else(CMAKE_VERSION VERSION_LESS 3.2)
+          ExternalProject_Add(
+            gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}
+            GIT_REPOSITORY https://github.com/SGL-UT/GPSTk
+            GIT_TAG v${GNSSSDR_GPSTK_LOCAL_VERSION}
+            SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}
+            BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}
+            CMAKE_ARGS ${GTEST_COMPILER} ${TOOLCHAIN_ARG} -DCMAKE_INSTALL_PREFIX=${CMAKE_SOURCE_DIR}/thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install -DBUILD_EXT=OFF -DBUILD_PYTHON=OFF
+            BUILD_BYPRODUCTS ${CMAKE_SOURCE_DIR}/thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}gpstk${CMAKE_SHARED_LIBRARY_SUFFIX}
+            UPDATE_COMMAND ""
+            PATCH_COMMAND ""
+          )
+      endif(CMAKE_VERSION VERSION_LESS 3.2)
+      set(GPSTK_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/include CACHE PATH "Local GPSTK headers")
+      set(GPSTK_LIBRARY ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}gpstk${CMAKE_SHARED_LIBRARY_SUFFIX})
+      set(GPSTK_BINDIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/bin/)
+      add_definitions(-DGPSTK_BINDIR="${GPSTK_BINDIR}")
+      set(OWN_GPSTK True)
+    else(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK)
+      set(GPSTK_INCLUDE_DIRS ${GPSTK_INCLUDE_DIR})
+      set(GPSTK_BINDIR ${GPSTK_LIBRARY}/../bin/)
+      add_definitions(-DGPSTK_BINDIR="${GPSTK_BINDIR}")
+    endif(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK)
 endif(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA)
 
 
 if (ENABLE_UNIT_TESTING_EXTRA)
-	set(GNSS_SDR_TEST_OPTIONAL_LIBS ${GNSS_SDR_TEST_OPTIONAL_LIBS} ${gpstk_libs})
-	set(GNSS_SDR_TEST_OPTIONAL_HEADERS ${GNSS_SDR_TEST_OPTIONAL_HEADERS} ${GPSTK_INCLUDE_DIRS} ${GPSTK_INCLUDE_DIRS}/gpstk)
+    set(GNSS_SDR_TEST_OPTIONAL_LIBS ${GNSS_SDR_TEST_OPTIONAL_LIBS} ${GPSTK_LIBRARY})
+    set(GNSS_SDR_TEST_OPTIONAL_HEADERS ${GNSS_SDR_TEST_OPTIONAL_HEADERS} ${GPSTK_INCLUDE_DIRS} ${GPSTK_INCLUDE_DIRS}/gpstk)
 endif (ENABLE_UNIT_TESTING_EXTRA)
 
 if(ENABLE_UNIT_TESTING_EXTRA)
-   add_definitions(-DEXTRA_TESTS)
-   if(NOT EXISTS ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples/gps_l2c_m_prn7_5msps.dat)
+    add_definitions(-DEXTRA_TESTS)
+    if(NOT EXISTS ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples/gps_l2c_m_prn7_5msps.dat)
       message(STATUS "Downloading some data files for testing...")
       file(DOWNLOAD https://sourceforge.net/projects/gnss-sdr/files/data/gps_l2c_m_prn7_5msps.dat ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/signal_samples/gps_l2c_m_prn7_5msps.dat
-           SHOW_PROGRESS
-           EXPECTED_HASH MD5=a6fcbefe155137945d3c33c5ef7bd0f9 )
-   endif(NOT EXISTS ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples/gps_l2c_m_prn7_5msps.dat)
-   if(NOT EXISTS ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples/Glonass_L1_CA_SIM_Fs_62Msps_4ms.dat)
+            SHOW_PROGRESS
+            EXPECTED_HASH MD5=a6fcbefe155137945d3c33c5ef7bd0f9)
+    endif(NOT EXISTS ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples/gps_l2c_m_prn7_5msps.dat)
+    if(NOT EXISTS ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples/Glonass_L1_CA_SIM_Fs_62Msps_4ms.dat)
       message(STATUS "Downloading some data files for testing...")
       file(DOWNLOAD https://sourceforge.net/projects/gnss-sdr/files/data/Glonass_L1_CA_SIM_Fs_62Msps_4ms.dat ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/signal_samples/Glonass_L1_CA_SIM_Fs_62Msps_4ms.dat
-           SHOW_PROGRESS
-           EXPECTED_HASH MD5=ffb72fc63c116be58d5e5ccb1daaed3a )
-   endif(NOT EXISTS ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples/Glonass_L1_CA_SIM_Fs_62Msps_4ms.dat)
-   # if(NOT EXISTS ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples/NT1065_GLONASS_L2_20160831_fs6625e6_if0e3_4ms.bin)
-   #   message(STATUS "Downloading some data files for testing...")
-   #   file(DOWNLOAD https://sourceforge.net/projects/gnss-sdr/files/data/NT1065_GLONASS_L2_20160831_fs6625e6_if0e3_4ms.bin ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/signal_samples/NT1065_GLONASS_L2_20160831_fs6625e6_if0e3_4ms.bin
-   #        SHOW_PROGRESS
-   #        EXPECTED_HASH MD5=d7055fc1dc931872b547a148af50a09b )
-   # endif(NOT EXISTS ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples/NT1065_GLONASS_L2_20160831_fs6625e6_if0e3_4ms.bin)
-   if(ENABLE_INSTALL_TESTS)
+            SHOW_PROGRESS
+            EXPECTED_HASH MD5=ffb72fc63c116be58d5e5ccb1daaed3a)
+    endif(NOT EXISTS ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples/Glonass_L1_CA_SIM_Fs_62Msps_4ms.dat)
+    if(ENABLE_INSTALL_TESTS)
       install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/signal_samples/gps_l2c_m_prn7_5msps.dat DESTINATION share/gnss-sdr/signal_samples)
       install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/signal_samples/Glonass_L1_CA_SIM_Fs_62Msps_4ms.dat DESTINATION share/gnss-sdr/signal_samples)
-      # install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/signal_samples/NT1065_GLONASS_L2_20160831_fs6625e6_if0e3_4ms.bin DESTINATION share/gnss-sdr/signal_samples)
-   endif(ENABLE_INSTALL_TESTS)
+    endif(ENABLE_INSTALL_TESTS)
 endif(ENABLE_UNIT_TESTING_EXTRA)
 
 if(ENABLE_INSTALL_TESTS)
-   install(FILES ${CMAKE_SOURCE_DIR}/src/tests/signal_samples/GSoC_CTTC_capture_2012_07_26_4Msps_4ms.dat DESTINATION share/gnss-sdr/signal_samples)
-   install(FILES ${CMAKE_SOURCE_DIR}/src/tests/signal_samples/Galileo_E1_ID_1_Fs_4Msps_8ms.dat DESTINATION share/gnss-sdr/signal_samples)
-   install(FILES ${CMAKE_SOURCE_DIR}/src/tests/signal_samples/GPS_L1_CA_ID_1_Fs_4Msps_2ms.dat DESTINATION share/gnss-sdr/signal_samples)
-   install(FILES ${CMAKE_SOURCE_DIR}/src/tests/signal_samples/NT1065_GLONASS_L1_20160831_fs6625e6_if0e3_4ms.bin DESTINATION share/gnss-sdr/signal_samples)
-   install(FILES ${CMAKE_SOURCE_DIR}/src/tests/data/rtklib_test/obs_test1.xml DESTINATION share/gnss-sdr/data/rtklib_test)
-   install(FILES ${CMAKE_SOURCE_DIR}/src/tests/data/rtklib_test/eph_GPS_L1CA_test1.xml DESTINATION share/gnss-sdr/data/rtklib_test)
-   add_definitions(-DTEST_PATH="${CMAKE_INSTALL_PREFIX}/share/gnss-sdr/")
+    install(FILES ${CMAKE_SOURCE_DIR}/src/tests/signal_samples/GSoC_CTTC_capture_2012_07_26_4Msps_4ms.dat DESTINATION share/gnss-sdr/signal_samples)
+    install(FILES ${CMAKE_SOURCE_DIR}/src/tests/signal_samples/Galileo_E1_ID_1_Fs_4Msps_8ms.dat DESTINATION share/gnss-sdr/signal_samples)
+    install(FILES ${CMAKE_SOURCE_DIR}/src/tests/signal_samples/GPS_L1_CA_ID_1_Fs_4Msps_2ms.dat DESTINATION share/gnss-sdr/signal_samples)
+    install(FILES ${CMAKE_SOURCE_DIR}/src/tests/signal_samples/NT1065_GLONASS_L1_20160831_fs6625e6_if0e3_4ms.bin DESTINATION share/gnss-sdr/signal_samples)
+    install(FILES ${CMAKE_SOURCE_DIR}/src/tests/data/rtklib_test/obs_test1.xml DESTINATION share/gnss-sdr/data/rtklib_test)
+    install(FILES ${CMAKE_SOURCE_DIR}/src/tests/data/rtklib_test/eph_GPS_L1CA_test1.xml DESTINATION share/gnss-sdr/data/rtklib_test)
+    add_definitions(-DTEST_PATH="${CMAKE_INSTALL_PREFIX}/share/gnss-sdr/")
 else(ENABLE_INSTALL_TESTS)
-   file(COPY ${CMAKE_SOURCE_DIR}/src/tests/signal_samples/GSoC_CTTC_capture_2012_07_26_4Msps_4ms.dat DESTINATION ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples)
-   file(COPY ${CMAKE_SOURCE_DIR}/src/tests/signal_samples/Galileo_E1_ID_1_Fs_4Msps_8ms.dat DESTINATION ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples)
-   file(COPY ${CMAKE_SOURCE_DIR}/src/tests/signal_samples/GPS_L1_CA_ID_1_Fs_4Msps_2ms.dat DESTINATION ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples)
-   file(COPY ${CMAKE_SOURCE_DIR}/src/tests/signal_samples/NT1065_GLONASS_L1_20160831_fs6625e6_if0e3_4ms.bin DESTINATION ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples)
-   file(COPY ${CMAKE_SOURCE_DIR}/src/tests/data/rtklib_test/obs_test1.xml DESTINATION ${CMAKE_SOURCE_DIR}/thirdparty/data/rtklib_test)
-   file(COPY ${CMAKE_SOURCE_DIR}/src/tests/data/rtklib_test/eph_GPS_L1CA_test1.xml DESTINATION ${CMAKE_SOURCE_DIR}/thirdparty/data/rtklib_test)
-   add_definitions(-DTEST_PATH="${CMAKE_SOURCE_DIR}/thirdparty/")
+    file(COPY ${CMAKE_SOURCE_DIR}/src/tests/signal_samples/GSoC_CTTC_capture_2012_07_26_4Msps_4ms.dat DESTINATION ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples)
+    file(COPY ${CMAKE_SOURCE_DIR}/src/tests/signal_samples/Galileo_E1_ID_1_Fs_4Msps_8ms.dat DESTINATION ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples)
+    file(COPY ${CMAKE_SOURCE_DIR}/src/tests/signal_samples/GPS_L1_CA_ID_1_Fs_4Msps_2ms.dat DESTINATION ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples)
+    file(COPY ${CMAKE_SOURCE_DIR}/src/tests/signal_samples/NT1065_GLONASS_L1_20160831_fs6625e6_if0e3_4ms.bin DESTINATION ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples)
+    file(COPY ${CMAKE_SOURCE_DIR}/src/tests/data/rtklib_test/obs_test1.xml DESTINATION ${CMAKE_SOURCE_DIR}/thirdparty/data/rtklib_test)
+    file(COPY ${CMAKE_SOURCE_DIR}/src/tests/data/rtklib_test/eph_GPS_L1CA_test1.xml DESTINATION ${CMAKE_SOURCE_DIR}/thirdparty/data/rtklib_test)
+    add_definitions(-DTEST_PATH="${CMAKE_SOURCE_DIR}/thirdparty/")
 endif(ENABLE_INSTALL_TESTS)
 
 set(LIST_INCLUDE_DIRS
-     ${GTEST_INCLUDE_DIRECTORIES}
-     ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-     ${CMAKE_SOURCE_DIR}/src/core/interfaces
-     ${CMAKE_SOURCE_DIR}/src/core/receiver
-     ${CMAKE_SOURCE_DIR}/src/core/libs
-     ${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
-     ${CMAKE_SOURCE_DIR}/src/core/monitor
-     ${CMAKE_SOURCE_DIR}/src/algorithms/libs
-     ${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib
-     ${CMAKE_SOURCE_DIR}/src/algorithms/data_type_adapter/adapters
-     ${CMAKE_SOURCE_DIR}/src/algorithms/data_type_adapter/gnuradio_blocks
-     ${CMAKE_SOURCE_DIR}/src/algorithms/resampler/adapters
-     ${CMAKE_SOURCE_DIR}/src/algorithms/resampler/gnuradio_blocks
-     ${CMAKE_SOURCE_DIR}/src/algorithms/channel/adapters
-     ${CMAKE_SOURCE_DIR}/src/algorithms/channel/libs
-     ${CMAKE_SOURCE_DIR}/src/algorithms/tracking/libs
-     ${CMAKE_SOURCE_DIR}/src/algorithms/tracking/adapters
-     ${CMAKE_SOURCE_DIR}/src/algorithms/tracking/gnuradio_blocks
-     ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/adapters
-     ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/gnuradio_blocks
-     ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/libs
-     ${CMAKE_SOURCE_DIR}/src/algorithms/observables/adapters
-     ${CMAKE_SOURCE_DIR}/src/algorithms/observables/gnuradio_blocks
-     ${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/adapters
-     ${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/gnuradio_blocks
-     ${CMAKE_SOURCE_DIR}/src/algorithms/signal_generator/adapters
-     ${CMAKE_SOURCE_DIR}/src/algorithms/signal_generator/gnuradio_blocks
-     ${CMAKE_SOURCE_DIR}/src/algorithms/input_filter/adapters
-     ${CMAKE_SOURCE_DIR}/src/algorithms/input_filter/gnuradio_blocks
-     ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/libs
-     ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/adapters
-     ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/gnuradio_blocks
-     ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs
-     ${CMAKE_SOURCE_DIR}/src/tests/unit-tests/signal-processing-blocks/libs
-     ${CMAKE_SOURCE_DIR}/src/tests/system-tests/libs
-     ${CMAKE_SOURCE_DIR}/src/tests/common-files
-     ${GLOG_INCLUDE_DIRS}
-     ${GFlags_INCLUDE_DIRS}
-     ${Boost_INCLUDE_DIRS}
-     ${GNURADIO_RUNTIME_INCLUDE_DIRS}
-     ${ARMADILLO_INCLUDE_DIRS}
-     ${VOLK_INCLUDE_DIRS}
-     ${VOLK_GNSSSDR_INCLUDE_DIRS}
-     ${MATIO_INCLUDE_DIRS}
-     ${PUGIXML_INCLUDE_DIR}
-     ${GNSS_SDR_TEST_OPTIONAL_HEADERS}
+    ${GTEST_INCLUDE_DIRECTORIES}
+    ${CMAKE_SOURCE_DIR}/src/core/system_parameters
+    ${CMAKE_SOURCE_DIR}/src/core/interfaces
+    ${CMAKE_SOURCE_DIR}/src/core/receiver
+    ${CMAKE_SOURCE_DIR}/src/core/libs
+    ${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
+    ${CMAKE_SOURCE_DIR}/src/core/monitor
+    ${CMAKE_SOURCE_DIR}/src/algorithms/libs
+    ${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib
+    ${CMAKE_SOURCE_DIR}/src/algorithms/data_type_adapter/adapters
+    ${CMAKE_SOURCE_DIR}/src/algorithms/data_type_adapter/gnuradio_blocks
+    ${CMAKE_SOURCE_DIR}/src/algorithms/resampler/adapters
+    ${CMAKE_SOURCE_DIR}/src/algorithms/resampler/gnuradio_blocks
+    ${CMAKE_SOURCE_DIR}/src/algorithms/channel/adapters
+    ${CMAKE_SOURCE_DIR}/src/algorithms/channel/libs
+    ${CMAKE_SOURCE_DIR}/src/algorithms/tracking/libs
+    ${CMAKE_SOURCE_DIR}/src/algorithms/tracking/adapters
+    ${CMAKE_SOURCE_DIR}/src/algorithms/tracking/gnuradio_blocks
+    ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/adapters
+    ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/gnuradio_blocks
+    ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/libs
+    ${CMAKE_SOURCE_DIR}/src/algorithms/observables/adapters
+    ${CMAKE_SOURCE_DIR}/src/algorithms/observables/gnuradio_blocks
+    ${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/adapters
+    ${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/gnuradio_blocks
+    ${CMAKE_SOURCE_DIR}/src/algorithms/signal_generator/adapters
+    ${CMAKE_SOURCE_DIR}/src/algorithms/signal_generator/gnuradio_blocks
+    ${CMAKE_SOURCE_DIR}/src/algorithms/input_filter/adapters
+    ${CMAKE_SOURCE_DIR}/src/algorithms/input_filter/gnuradio_blocks
+    ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/libs
+    ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/adapters
+    ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/gnuradio_blocks
+    ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs
+    ${CMAKE_SOURCE_DIR}/src/tests/unit-tests/signal-processing-blocks/libs
+    ${CMAKE_SOURCE_DIR}/src/tests/system-tests/libs
+    ${CMAKE_SOURCE_DIR}/src/tests/common-files
+    ${GLOG_INCLUDE_DIRS}
+    ${GFlags_INCLUDE_DIRS}
+    ${Boost_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
+    ${ARMADILLO_INCLUDE_DIRS}
+    ${VOLK_INCLUDE_DIRS}
+    ${VOLK_GNSSSDR_INCLUDE_DIRS}
+    ${MATIO_INCLUDE_DIRS}
+    ${PUGIXML_INCLUDE_DIR}
+    ${GNSS_SDR_TEST_OPTIONAL_HEADERS}
 )
 
 include_directories(${LIST_INCLUDE_DIRS})
@@ -424,34 +408,34 @@ if(ENABLE_UNIT_TESTING)
         install(TARGETS run_tests RUNTIME DESTINATION bin COMPONENT "run_tests")
     else(ENABLE_INSTALL_TESTS)
         add_custom_command(TARGET run_tests POST_BUILD
-                           COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:run_tests>
-                           ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:run_tests>)
+            COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:run_tests>
+            ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:run_tests>)
     endif(ENABLE_INSTALL_TESTS)
 endif(ENABLE_UNIT_TESTING)
 
 if(ENABLE_FPGA)
     add_executable(gps_l1_ca_dll_pll_tracking_test_fpga
-                   ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
-                   ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc )
+            ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
+            ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc)
     target_link_libraries(gps_l1_ca_dll_pll_tracking_test_fpga
-                             ${Boost_LIBRARIES}
-                             ${GFlags_LIBS}
-                             ${GLOG_LIBRARIES}
-                             ${GTEST_LIBRARIES}
-                             ${GNURADIO_RUNTIME_LIBRARIES}
-                             ${GNURADIO_BLOCKS_LIBRARIES}
-                             ${ARMADILLO_LIBRARIES}
-                             ${VOLK_LIBRARIES}
-                             ${MATIO_LIBRARIES}
-                             channel_fsm
-                             gnss_sp_libs
-                             gnss_rx
-                             gnss_system_parameters
-                             signal_processing_testing_lib
-                             )
+            ${Boost_LIBRARIES}
+            ${GFlags_LIBS}
+            ${GLOG_LIBRARIES}
+            ${GTEST_LIBRARIES}
+            ${GNURADIO_RUNTIME_LIBRARIES}
+            ${GNURADIO_BLOCKS_LIBRARIES}
+            ${ARMADILLO_LIBRARIES}
+            ${VOLK_LIBRARIES}
+            ${MATIO_LIBRARIES}
+            channel_fsm
+            gnss_sp_libs
+            gnss_rx
+            gnss_system_parameters
+            signal_processing_testing_lib
+            )
     install(TARGETS gps_l1_ca_dll_pll_tracking_test_fpga
             RUNTIME DESTINATION bin
-            COMPONENT "fpga-test" )
+            COMPONENT "fpga-test")
 endif(ENABLE_FPGA)
 
 
@@ -470,13 +454,13 @@ function(add_system_test executable)
     add_executable(${executable} ${SYSTEM_TEST_SOURCES})
 
     if(NOT ${GTEST_DIR_LOCAL})
-        add_dependencies(${executable} gtest-${GNSSSDR_GTEST_LOCAL_VERSION} )
+        add_dependencies(${executable} gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
     else(NOT ${GTEST_DIR_LOCAL})
         add_dependencies(${executable} gtest)
     endif(NOT ${GTEST_DIR_LOCAL})
 
     include_directories(${OPT_INCLUDES_})
-    target_link_libraries(${executable} ${OPT_LIBS_} )
+    target_link_libraries(${executable} ${OPT_LIBS_})
 
     if(ENABLE_INSTALL_TESTS)
         if(EXISTS ${CMAKE_SOURCE_DIR}/install/${executable})
@@ -485,8 +469,8 @@ function(add_system_test executable)
         install(TARGETS ${executable} RUNTIME DESTINATION bin COMPONENT "${executable}_test")
     else(ENABLE_INSTALL_TESTS)
         add_custom_command(TARGET ${executable} POST_BUILD
-                           COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${executable}>
-                           ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:${executable}> )
+            COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${executable}>
+            ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:${executable}>)
     endif(ENABLE_INSTALL_TESTS)
 endfunction(add_system_test)
 
@@ -508,7 +492,7 @@ if(ENABLE_SYSTEM_TESTING)
                   ${GNURADIO_RUNTIME_LIBRARIES} ${GTEST_LIBRARIES}
                   ${GNURADIO_BLOCKS_LIBRARIES} ${GNURADIO_FILTER_LIBRARIES}
                   ${GNURADIO_ANALOG_LIBRARIES} gnss_sp_libs
-                  gnss_rx gnss_system_parameters )
+                  gnss_rx gnss_system_parameters)
 
     add_system_test(ttff)
 
@@ -526,7 +510,7 @@ if(ENABLE_SYSTEM_TESTING)
         #if(GPSTK_FOUND OR OWN_GPSTK)
             ## OBS_SYSTEM_TEST and OBS_GPS_L1_SYSTEM_TEST
         #    set(OPT_LIBS_ ${GFlags_LIBS} ${GLOG_LIBRARIES} ${GTEST_LIBRARIES}
-        #                  gnss_sp_libs gnss_rx ${gpstk_libs} )
+        #                  gnss_sp_libs gnss_rx ${GPSTK_LIBRARY})
         #    set(OPT_INCLUDES_ ${GPSTK_INCLUDE_DIRS} ${GPSTK_INCLUDE_DIRS}/gpstk)
         #    add_system_test(obs_gps_l1_system_test)
         #    add_system_test(obs_system_test)
@@ -534,13 +518,13 @@ if(ENABLE_SYSTEM_TESTING)
     else(ENABLE_SYSTEM_TESTING_EXTRA)
         # Avoid working with old executables if they were switched ON and then OFF
         if(EXISTS ${CMAKE_SOURCE_DIR}/install/position_test)
-           file(REMOVE ${CMAKE_SOURCE_DIR}/install/position_test)
+            file(REMOVE ${CMAKE_SOURCE_DIR}/install/position_test)
         endif(EXISTS ${CMAKE_SOURCE_DIR}/install/position_test)
     endif(ENABLE_SYSTEM_TESTING_EXTRA)
 else(ENABLE_SYSTEM_TESTING)
     # Avoid working with old executables if they were switched ON and then OFF
     if(EXISTS ${CMAKE_SOURCE_DIR}/install/ttff)
-       file(REMOVE ${CMAKE_SOURCE_DIR}/install/ttff)
+        file(REMOVE ${CMAKE_SOURCE_DIR}/install/ttff)
     endif(EXISTS ${CMAKE_SOURCE_DIR}/install/ttff)
     if(EXISTS ${CMAKE_SOURCE_DIR}/install/position_test)
         file(REMOVE ${CMAKE_SOURCE_DIR}/install/position_test)
@@ -555,17 +539,17 @@ set(CMAKE_CTEST_COMMAND ctest -V)
 add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
 
 add_executable(flowgraph_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/gnss_flowgraph_test.cc )
+    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/gnss_flowgraph_test.cc)
 
 target_link_libraries(flowgraph_test ${Boost_LIBRARIES}
-                                     ${GFlags_LIBS}
-                                     ${GLOG_LIBRARIES}
-                                     ${GNURADIO_RUNTIME_LIBRARIES}
-                                     ${GTEST_LIBRARIES}
-                                     gnss_sp_libs
-                                     gnss_rx
-                                     gnss_system_parameters
-                                     ${VOLK_GNSSSDR_LIBRARIES} )
+    ${GFlags_LIBS}
+    ${GLOG_LIBRARIES}
+    ${GNURADIO_RUNTIME_LIBRARIES}
+    ${GTEST_LIBRARIES}
+    gnss_sp_libs
+    gnss_rx
+    gnss_system_parameters
+    ${VOLK_GNSSSDR_LIBRARIES})
 add_test(flowgraph_test flowgraph_test)
 if(NOT ${GTEST_DIR_LOCAL})
     add_dependencies(flowgraph_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
@@ -577,26 +561,26 @@ set_property(TEST flowgraph_test PROPERTY TIMEOUT 30)
 #########################################################
 
 add_executable(gnss_block_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
-                               ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/sources/file_signal_source_test.cc
-                               ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc
-                               ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/pulse_blanking_filter_test.cc
-                               ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/notch_filter_test.cc
-                               ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/notch_filter_lite_test.cc
-                               ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/adapter/pass_through_test.cc
-                               ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/adapter/adapter_test.cc
-                               ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/gnss_block_factory_test.cc )
+    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/sources/file_signal_source_test.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/pulse_blanking_filter_test.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/notch_filter_test.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/notch_filter_lite_test.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/adapter/pass_through_test.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/adapter/adapter_test.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/gnss_block_factory_test.cc)
 target_link_libraries(gnss_block_test ${Boost_LIBRARIES}
-                                      ${GFlags_LIBS}
-                                      ${GLOG_LIBRARIES}
-                                      ${GTEST_LIBRARIES}
-                                      ${GNURADIO_RUNTIME_LIBRARIES}
-                                      ${GNURADIO_BLOCKS_LIBRARIES}
-                                      ${GNURADIO_FILTER_LIBRARIES}
-                                      ${GNURADIO_ANALOG_LIBRARIES}
-                                      gnss_sp_libs
-                                      gnss_rx
-                                      gnss_system_parameters
-                                      ${VOLK_GNSSSDR_LIBRARIES} )
+    ${GFlags_LIBS}
+    ${GLOG_LIBRARIES}
+    ${GTEST_LIBRARIES}
+    ${GNURADIO_RUNTIME_LIBRARIES}
+    ${GNURADIO_BLOCKS_LIBRARIES}
+    ${GNURADIO_FILTER_LIBRARIES}
+    ${GNURADIO_ANALOG_LIBRARIES}
+    gnss_sp_libs
+    gnss_rx
+    gnss_system_parameters
+    ${VOLK_GNSSSDR_LIBRARIES})
 add_test(gnss_block_test gnss_block_test)
 if(NOT ${GTEST_DIR_LOCAL})
     add_dependencies(gnss_block_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
@@ -608,19 +592,19 @@ set_property(TEST gnss_block_test PROPERTY TIMEOUT 60)
 #########################################################
 
 add_executable(gnuradio_block_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/sources/unpack_2bit_samples_test.cc )
+    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/sources/unpack_2bit_samples_test.cc)
 target_link_libraries(gnuradio_block_test ${Boost_LIBRARIES}
-                                          ${GFlags_LIBS}
-                                          ${GLOG_LIBRARIES}
-                                          ${GTEST_LIBRARIES}
-                                          ${GNURADIO_RUNTIME_LIBRARIES}
-                                          ${GNURADIO_BLOCKS_LIBRARIES}
-                                          ${GNURADIO_FILTER_LIBRARIES}
-                                          ${GNURADIO_ANALOG_LIBRARIES}
-                                          gnss_sp_libs
-                                          gnss_rx
-                                          gnss_system_parameters
-                                          ${VOLK_GNSSSDR_LIBRARIES} )
+    ${GFlags_LIBS}
+    ${GLOG_LIBRARIES}
+    ${GTEST_LIBRARIES}
+    ${GNURADIO_RUNTIME_LIBRARIES}
+    ${GNURADIO_BLOCKS_LIBRARIES}
+    ${GNURADIO_FILTER_LIBRARIES}
+    ${GNURADIO_ANALOG_LIBRARIES}
+    gnss_sp_libs
+    gnss_rx
+    gnss_system_parameters
+    ${VOLK_GNSSSDR_LIBRARIES})
 add_test(gnuradio_block_test gnuradio_block_test)
 if(NOT ${GTEST_DIR_LOCAL})
     add_dependencies(gnuradio_block_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
@@ -632,14 +616,14 @@ set_property(TEST gnuradio_block_test PROPERTY TIMEOUT 30)
 #########################################################
 
 add_executable(matio_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
-                          ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/arithmetic/matio_test.cc )
+    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/arithmetic/matio_test.cc)
 
 target_link_libraries(matio_test ${Boost_LIBRARIES}
-                                 ${GFlags_LIBS}
-                                 ${GLOG_LIBRARIES}
-                                 ${GTEST_LIBRARIES}
-                                 ${MATIO_LIBRARIES}
-                                 gnss_system_parameters )
+    ${GFlags_LIBS}
+    ${GLOG_LIBRARIES}
+    ${GTEST_LIBRARIES}
+    ${MATIO_LIBRARIES}
+    gnss_system_parameters)
 add_test(matio_test matio_test)
 if(NOT ${GTEST_DIR_LOCAL})
     if(MATIO_FOUND)
@@ -648,7 +632,7 @@ if(NOT ${GTEST_DIR_LOCAL})
         add_dependencies(matio_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION} matio-${GNSSSDR_MATIO_LOCAL_VERSION})
     endif(MATIO_FOUND)
 else(NOT ${GTEST_DIR_LOCAL})
-   if(MATIO_FOUND)
+    if(MATIO_FOUND)
         add_dependencies(matio_test gtest)
     else(MATIO_FOUND)
         add_dependencies(matio_test gtest matio-${GNSSSDR_MATIO_LOCAL_VERSION})
@@ -659,22 +643,22 @@ set_property(TEST matio_test PROPERTY TIMEOUT 30)
 #########################################################
 
 add_executable(acq_test
-      ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
-      ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc )
+    ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc)
 target_link_libraries(acq_test ${Boost_LIBRARIES}
-                               ${GFlags_LIBS}
-                               ${GLOG_LIBRARIES}
-                               ${GTEST_LIBRARIES}
-                               ${GNURADIO_RUNTIME_LIBRARIES}
-                               ${GNURADIO_BLOCKS_LIBRARIES}
-                               ${GNURADIO_FILTER_LIBRARIES}
-                               ${GNURADIO_ANALOG_LIBRARIES}
-                               gnss_sp_libs
-                               gnss_rx
-                               gnss_system_parameters
-                               signal_generator_blocks
-                               signal_processing_testing_lib
-                               ${VOLK_GNSSSDR_LIBRARIES} )
+    ${GFlags_LIBS}
+    ${GLOG_LIBRARIES}
+    ${GTEST_LIBRARIES}
+    ${GNURADIO_RUNTIME_LIBRARIES}
+    ${GNURADIO_BLOCKS_LIBRARIES}
+    ${GNURADIO_FILTER_LIBRARIES}
+    ${GNURADIO_ANALOG_LIBRARIES}
+    gnss_sp_libs
+    gnss_rx
+    gnss_system_parameters
+    signal_generator_blocks
+    signal_processing_testing_lib
+    ${VOLK_GNSSSDR_LIBRARIES})
 add_test(acq_test acq_test)
 if(NOT ${GTEST_DIR_LOCAL})
     add_dependencies(acq_test acq_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
@@ -686,24 +670,24 @@ set_property(TEST acq_test PROPERTY TIMEOUT 30)
 #########################################################
 
 add_executable(trk_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
-                        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc
-                        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/tracking_loop_filter_test.cc
-                        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_real_codes_test.cc
-                        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/bayesian_estimation_test.cc )
+    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/tracking_loop_filter_test.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_real_codes_test.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/bayesian_estimation_test.cc)
 
 target_link_libraries(trk_test ${Boost_LIBRARIES}
-                               ${GFlags_LIBS}
-                               ${GLOG_LIBRARIES}
-                               ${GTEST_LIBRARIES}
-                               ${GNURADIO_RUNTIME_LIBRARIES}
-                               ${GNURADIO_BLOCKS_LIBRARIES}
-                               ${GNURADIO_FILTER_LIBRARIES}
-                               ${GNURADIO_ANALOG_LIBRARIES}
-                               gnss_sp_libs
-                               gnss_rx
-                               gnss_system_parameters
-                               signal_generator_blocks
-                               ${VOLK_GNSSSDR_LIBRARIES} )
+    ${GFlags_LIBS}
+    ${GLOG_LIBRARIES}
+    ${GTEST_LIBRARIES}
+    ${GNURADIO_RUNTIME_LIBRARIES}
+    ${GNURADIO_BLOCKS_LIBRARIES}
+    ${GNURADIO_FILTER_LIBRARIES}
+    ${GNURADIO_ANALOG_LIBRARIES}
+    gnss_sp_libs
+    gnss_rx
+    gnss_system_parameters
+    signal_generator_blocks
+    ${VOLK_GNSSSDR_LIBRARIES})
 add_test(trk_test trk_test)
 if(NOT ${GTEST_DIR_LOCAL})
     add_dependencies(trk_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
@@ -717,14 +701,14 @@ set_property(TEST trk_test PROPERTY TIMEOUT 30)
 
 if(NOT ENABLE_PACKAGING)
     add_executable(control_thread_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
-                                       ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/control_message_factory_test.cc
-                                       ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/control_thread_test.cc )
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/control_message_factory_test.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/control_thread_test.cc)
 
     target_link_libraries(control_thread_test ${Boost_LIBRARIES}
-                                              ${GFlags_LIBS}
-                                              ${GLOG_LIBRARIES}
-                                              ${GTEST_LIBRARIES}
-                                              gnss_rx )
+        ${GFlags_LIBS}
+        ${GLOG_LIBRARIES}
+        ${GTEST_LIBRARIES}
+        gnss_rx)
 
     add_test(control_thread_test control_thread_test)
     if(NOT ${GTEST_DIR_LOCAL})
@@ -739,8 +723,8 @@ endif(NOT ENABLE_PACKAGING)
 
 if(ENABLE_PACKAGING)
     add_dependencies(check flowgraph_test gnss_block_test
-                           gnuradio_block_test acq_test trk_test matio_test)
+        gnuradio_block_test acq_test trk_test matio_test)
 else(ENABLE_PACKAGING)
     add_dependencies(check control_thread_test flowgraph_test gnss_block_test
-                           gnuradio_block_test acq_test trk_test matio_test)
+        gnuradio_block_test acq_test trk_test matio_test)
 endif(ENABLE_PACKAGING)
diff --git a/src/utils/front-end-cal/CMakeLists.txt b/src/utils/front-end-cal/CMakeLists.txt
index a9d1d455a..252131884 100644
--- a/src/utils/front-end-cal/CMakeLists.txt
+++ b/src/utils/front-end-cal/CMakeLists.txt
@@ -67,7 +67,7 @@ target_link_libraries(front_end_cal_lib ${MAC_LIBRARIES}
                                         gnss_rx
                                         channel_fsm
 )
-    
+
 add_dependencies(front_end_cal_lib glog-${glog_RELEASE} armadillo-${armadillo_RELEASE})
 
 add_definitions( -DGNSS_SDR_VERSION="${VERSION}" )
@@ -96,7 +96,7 @@ target_link_libraries(front-end-cal    ${MAC_LIBRARIES}
                                        front_end_cal_lib
 )
 
-                               
+
 install(TARGETS front-end-cal
         RUNTIME DESTINATION bin
         COMPONENT "front-end-cal"
diff --git a/src/utils/rinex2assist/CMakeLists.txt b/src/utils/rinex2assist/CMakeLists.txt
index b7db9e90f..0fb8db8d1 100644
--- a/src/utils/rinex2assist/CMakeLists.txt
+++ b/src/utils/rinex2assist/CMakeLists.txt
@@ -18,7 +18,8 @@
 
 find_package(GPSTK QUIET)
 if(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK)
-    set(GPSTK_LIBRARY ${CMAKE_CURRENT_SOURCE_DIR}/../../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gpstk${CMAKE_SHARED_LIBRARY_SUFFIX} )
+    include(GNUInstallDirs)
+    set(GPSTK_LIBRARY ${CMAKE_CURRENT_SOURCE_DIR}/../../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}gpstk${CMAKE_SHARED_LIBRARY_SUFFIX} )
     set(GPSTK_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/include )
 endif(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK)