diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7366593ad..fceeb244b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@
 ########################################################################
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
     message(WARNING "In-tree build is bad practice. Try 'cd build && cmake ../' ")
-endif(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+endif()
 
 cmake_minimum_required(VERSION 2.8)
 project(gnss-sdr CXX C)
@@ -31,11 +31,11 @@ file(RELATIVE_PATH RELATIVE_CMAKE_CALL ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRE
 if(NOT CMAKE_PREFIX_PATH)
     if(DEFINED ENV{PYBOMBS_PREFIX})
         set(CMAKE_PREFIX_PATH $ENV{PYBOMBS_PREFIX})
-    endif(DEFINED ENV{PYBOMBS_PREFIX})
+    endif()
     if(DEFINED ENV{SNAP})
         set(CMAKE_PREFIX_PATH $ENV{SNAP})
-    endif(DEFINED ENV{SNAP})
-endif(NOT CMAKE_PREFIX_PATH)
+    endif()
+endif()
 
 
 
@@ -72,7 +72,7 @@ option(ENABLE_OWN_ARMADILLO "Download and build Armadillo locally" OFF)
 option(ENABLE_LOG "Enable logging" ON)
 if(ENABLE_PACKAGING)
     set(ENABLE_GENERIC_ARCH ON)
-endif(ENABLE_PACKAGING)
+endif()
 
 # Testing
 option(ENABLE_UNIT_TESTING "Build unit tests" ON)
@@ -82,12 +82,12 @@ option(ENABLE_SYSTEM_TESTING "Build system tests" OFF)
 option(ENABLE_SYSTEM_TESTING_EXTRA "Download external tools and build extra system tests" OFF)
 if(ENABLE_SYSTEM_TESTING_EXTRA)
     set(ENABLE_SYSTEM_TESTING ON)
-endif(ENABLE_SYSTEM_TESTING_EXTRA)
+endif()
 option(ENABLE_OWN_GPSTK "Force to download, build and link GPSTk for system tests, even if it is already installed" OFF)
 option(ENABLE_INSTALL_TESTS "Install QA code system-wide" OFF)
 if(ENABLE_FPGA)
     set(ENABLE_INSTALL_TESTS ON)
-endif(ENABLE_FPGA)
+endif()
 
 
 
@@ -110,15 +110,15 @@ if(NOT ${THIS_IS_A_RELEASE})
       OUTPUT_VARIABLE GIT_COMMIT_HASH
       OUTPUT_STRIP_TRAILING_WHITESPACE
     )
-endif(NOT ${THIS_IS_A_RELEASE})
+endif()
 
 set(VERSION_INFO_MAJOR_VERSION 0)
-set(VERSION_INFO_API_COMPAT    0)
+set(VERSION_INFO_API_COMPAT 0)
 if(${THIS_IS_A_RELEASE})
     set(VERSION_INFO_MINOR_VERSION 9)
-else(${THIS_IS_A_RELEASE})
+else()
     set(VERSION_INFO_MINOR_VERSION 9.git-${GIT_BRANCH}-${GIT_COMMIT_HASH})
-endif(${THIS_IS_A_RELEASE})
+endif()
 
 set(VERSION ${VERSION_INFO_MAJOR_VERSION}.${VERSION_INFO_API_COMPAT}.${VERSION_INFO_MINOR_VERSION})
 
@@ -129,9 +129,9 @@ 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 )
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
     set(ARCH_64BITS TRUE)
-endif( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+endif()
 
 set(OS_IS_MACOSX "")
 set(OS_IS_LINUX "")
@@ -142,85 +142,85 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     set(OS_IS_LINUX TRUE)
     if(ARCH_64BITS)
         set(ARCH_ "(64 bits)")
-    else(ARCH_64BITS)
+    else()
         set(ARCH_ "(32 bits)")
-    endif(ARCH_64BITS)
+    endif()
     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
+            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
+            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")
+    endif()
     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)
+            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()
+    endif()
     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)
+            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()
+        endif()
+    endif()
     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)
+            set(LINUX_DISTRIBUTION "Red Hat")
+            file(READ /etc/redhat-release LINUX_VER)
+        endif()
+    endif()
     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)
+            set(LINUX_DISTRIBUTION "Debian")
+            file(READ /etc/debian_version LINUX_VER)
+        endif()
+    endif()
     if(NOT LINUX_DISTRIBUTION)
         set(LINUX_DISTRIBUTION "Generic")
         set(LINUX_VER "Unknown")
-    endif(NOT LINUX_DISTRIBUTION)
+    endif()
     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")
+endif()
 if(NOT LINUX_DISTRIBUTION)
     set(LINUX_DISTRIBUTION "Unknown")
-endif(NOT LINUX_DISTRIBUTION)
+endif()
 
 # Detect macOS / Mac OS X Version
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@@ -233,48 +233,48 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
         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")
+    endif()
     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")
+    endif()
     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")
+    endif()
     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")
+    endif()
     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")
+    endif()
     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")
+    endif()
     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")
+    endif()
     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")
+    endif()
     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")
+    endif()
+endif()
 
 # Define extra build types and select Release by default to get optimization flags
 include(GnsssdrBuildTypes)
@@ -293,31 +293,31 @@ 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)
+    else()
         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)
+    endif()
+else()
     message(STATUS "Build type set to ${CMAKE_BUILD_TYPE}.")
-endif(NOT CMAKE_BUILD_TYPE)
-GNSSSDR_CHECK_BUILD_TYPE(${CMAKE_BUILD_TYPE})
+endif()
+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)
-endif(UNIX)
+endif()
 
 # Determine if we are using make or ninja
 if(CMAKE_MAKE_PROGRAM MATCHES "make")
     set(CMAKE_MAKE_PROGRAM_PRETTY_NAME "make")
-endif(CMAKE_MAKE_PROGRAM MATCHES "make")
+endif()
 if(CMAKE_MAKE_PROGRAM MATCHES "ninja")
     set(CMAKE_MAKE_PROGRAM_PRETTY_NAME "ninja")
-endif(CMAKE_MAKE_PROGRAM MATCHES "ninja")
+endif()
 if(NOT CMAKE_MAKE_PROGRAM_PRETTY_NAME)
     set(CMAKE_MAKE_PROGRAM_PRETTY_NAME "${CMAKE_MAKE_PROGRAM}")
-endif(NOT CMAKE_MAKE_PROGRAM_PRETTY_NAME)
+endif()
 
 
 
@@ -352,7 +352,7 @@ set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.9")
 
 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")
+endif()
 
 
 
@@ -362,7 +362,7 @@ endif(CMAKE_VERSION VERSION_LESS "3.0.2")
 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}.")
     message(FATAL_ERROR "Fatal error: CMake >= ${GNSSSDR_CMAKE_MIN_VERSION} required.")
-endif(CMAKE_VERSION VERSION_LESS ${GNSSSDR_CMAKE_MIN_VERSION})
+endif()
 
 
 
@@ -373,8 +373,8 @@ 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})
-endif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    endif()
+endif()
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     execute_process(COMMAND
@@ -385,25 +385,25 @@ 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})
-        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})
-        endif("${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})
+        else()
+            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()
         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.")
-        endif(${CLANG_VERSION} VERSION_LESS "${MIN_VERSION}")
-    else(${_res} STREQUAL "0")
+            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()
+    else()
         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.")
-    endif(${_res} STREQUAL "0")
-endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    endif()
+endif()
 
 
 
@@ -413,10 +413,10 @@ endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 if(NOT OS_IS_MACOSX)
     if(CMAKE_CROSSCOMPILING)
         set(IS_ARM TRUE)
-    else(CMAKE_CROSSCOMPILING)
+    else()
         include(TestForARM)
-    endif(CMAKE_CROSSCOMPILING)
-endif(NOT OS_IS_MACOSX)
+    endif()
+endif()
 
 
 
@@ -425,7 +425,7 @@ endif(NOT OS_IS_MACOSX)
 ################################################################################
 if(NOT ENABLE_GENERIC_ARCH)
     include(TestForSSE)
-endif(NOT ENABLE_GENERIC_ARCH)
+endif()
 
 
 
@@ -435,16 +435,16 @@ endif(NOT ENABLE_GENERIC_ARCH)
 if(CMAKE_VERSION VERSION_LESS 3.1)
     find_package(Threads REQUIRED)
     set(THREAD_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
-else(CMAKE_VERSION VERSION_LESS 3.1)
+else()
     set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
     if(CMAKE_CROSSCOMPILING)
         set(THREADS_PREFER_PTHREAD_FLAG FALSE)
-    else(CMAKE_CROSSCOMPILING)
+    else()
         set(THREADS_PREFER_PTHREAD_FLAG TRUE)
-    endif(CMAKE_CROSSCOMPILING)
+    endif()
     find_package(Threads REQUIRED)
     set(THREAD_LIBRARIES Threads::Threads)
-endif(CMAKE_VERSION VERSION_LESS 3.1)
+endif()
 
 
 
@@ -455,28 +455,28 @@ enable_testing()
 if(ENABLE_UNIT_TESTING OR ENABLE_SYSTEM_TESTING)
     if(EXISTS $ENV{GTEST_DIR})
         set(GTEST_DIR $ENV{GTEST_DIR})
-    endif(EXISTS $ENV{GTEST_DIR})
+    endif()
     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()
+            message(FATAL_ERROR " Googletest source code has not been found at ${GTEST_DIR}.")
+        endif()
         find_path(GTEST_INCLUDE_DIRS NAMES gtest/gtest.h PATHS ${GTEST_DIR}/include)
-    else(GTEST_DIR)
+    else()
         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.")
-        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}'. ")
-        endif(LIBGTEST_DEV_DIR)
-    endif(GTEST_DIR)
-endif(ENABLE_UNIT_TESTING OR ENABLE_SYSTEM_TESTING)
+            message(STATUS "Googletest package has been found.")
+        else()
+            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()
+    endif()
+endif()
 
 
 
@@ -485,7 +485,7 @@ endif(ENABLE_UNIT_TESTING OR ENABLE_SYSTEM_TESTING)
 ################################################################################
 if(UNIX AND EXISTS "/usr/lib64")
     list(APPEND BOOST_LIBRARYDIR "/usr/lib64") # Fedora 64-bit fix
-endif(UNIX AND EXISTS "/usr/lib64")
+endif()
 set(Boost_ADDITIONAL_VERSIONS
     "1.45.0" "1.45" "1.46.0" "1.46"                 "1.48.0" "1.48" "1.49.0" "1.49"
     "1.50.0" "1.50" "1.51.0" "1.51"                 "1.53.0" "1.53" "1.54.0" "1.54"
@@ -501,7 +501,7 @@ 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.")
-endif(NOT Boost_FOUND)
+endif()
 
 
 
@@ -514,23 +514,23 @@ 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})
-endif(PC_GNURADIO_RUNTIME_VERSION)
+    endif()
+endif()
 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)
+        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()
     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)
+        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()
+endif()
 
 if(NOT GNURADIO_ANALOG_FOUND)
     message(FATAL_ERROR "*** The gnuradio-analog library v${GNSSSDR_GNURADIO_MIN_VERSION} or later is required to build gnss-sdr")
@@ -574,7 +574,6 @@ endif()
 # volk_gnsssdr module - GNSS-SDR's own VOLK library
 ################################################################################
 find_package(VOLKGNSSSDR)
-
 if(NOT VOLKGNSSSDR_FOUND)
     message(STATUS " volk_gnsssdr will be built along with gnss-sdr when doing '${CMAKE_MAKE_PROGRAM_PRETTY_NAME}'")
     ###############################
@@ -584,13 +583,13 @@ if(NOT VOLKGNSSSDR_FOUND)
 
     if(NOT PYTHON_MIN_VER_FOUND)
         message(FATAL_ERROR "Python ${GNSSSDR_PYTHON_MIN_VERSION} or greater required to build VOLK_GNSSSDR")
-    endif(NOT PYTHON_MIN_VER_FOUND)
+    endif()
 
     if(${PYTHON3})
         set(PYTHON_NAME "python3")
-    else(${PYTHON3})
+    else()
         set(PYTHON_NAME "python")
-    endif(${PYTHON3})
+    endif()
 
     #  Mako
     if(NOT MAKO_FOUND)
@@ -600,11 +599,11 @@ if(NOT VOLKGNSSSDR_FOUND)
           message(STATUS " sudo yum install ${PYTHON_NAME}-mako")
         elseif(${LINUX_DISTRIBUTION} MATCHES "openSUSE")
           message(STATUS " sudo zypper install ${PYTHON_NAME}-Mako")
-        else(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
+        else()
           message(STATUS " sudo apt-get install ${PYTHON_NAME}-mako")
-        endif(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
+        endif()
         message(FATAL_ERROR "Mako templates required to build VOLK_GNSSSDR")
-    endif(NOT MAKO_FOUND)
+    endif()
 
     # Six
     if(NOT SIX_FOUND)
@@ -614,37 +613,37 @@ if(NOT VOLKGNSSSDR_FOUND)
           message(STATUS " sudo yum install ${PYTHON_NAME}-six")
         elseif(${LINUX_DISTRIBUTION} MATCHES "openSUSE")
           message(STATUS " sudo zypper install ${PYTHON_NAME}-six")
-        else(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
+        else()
           message(STATUS " sudo apt-get install ${PYTHON_NAME}-six")
-        endif(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
+        endif()
         message(FATAL_ERROR "six - python 2 and 3 compatibility library required to build VOLK_GNSSSDR")
-    endif(NOT SIX_FOUND)
+    endif()
 
     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")
-        endif((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
+            set(STRIP_VOLK_GNSSSDR_PROFILE "-DENABLE_STRIP=ON -DCMAKE_VERBOSE_MAKEFILE=ON")
+        endif()
         if(NOT DEFINED ENV{PROTECT_PASSWORDS})
-          set(READ_ENVIRO ${CMAKE_COMMAND} -E environment)
-        endif(NOT DEFINED ENV{PROTECT_PASSWORDS})
-    endif(ENABLE_PACKAGING)
+            set(READ_ENVIRO ${CMAKE_COMMAND} -E environment)
+        endif()
+    endif()
 
     set(VOLK_GNSSSDR_BUILD_COMMAND "${CMAKE_MAKE_PROGRAM}")
     if(PYTHON_EXECUTABLE)
         set(USE_THIS_PYTHON "-DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}")
-    endif(PYTHON_EXECUTABLE)
+    endif()
     if(OS_IS_MACOSX)
         if(CMAKE_GENERATOR STREQUAL Xcode)
-          set(VOLK_GNSSSDR_BUILD_COMMAND "xcodebuild" "-configuration" "Debug" "-target")
-        endif(CMAKE_GENERATOR STREQUAL Xcode)
-    endif(OS_IS_MACOSX)
+            set(VOLK_GNSSSDR_BUILD_COMMAND "xcodebuild" "-configuration" "Debug" "-target")
+        endif()
+    endif()
 
     if(CMAKE_CROSSCOMPILING)
         set(VOLK_GNSSSDR_COMPILER "")
-    else(CMAKE_CROSSCOMPILING)
+    else()
         set(VOLK_GNSSSDR_COMPILER -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
-    endif(CMAKE_CROSSCOMPILING)
+    endif()
     set(VOLK_GNSSSDR_CMAKE_ARGS ${VOLK_GNSSSDR_COMPILER}
         -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install
         -DENABLE_STATIC_LIBS=ON
@@ -657,39 +656,39 @@ if(NOT VOLKGNSSSDR_FOUND)
         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)
-    endif(EXISTS $ENV{OECORE_TARGET_SYSROOT})
+    endif()
     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
+    else()
+        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)
+    endif()
     find_package(ORC)
     if(NOT ORC_FOUND)
         set(ORC_LIBRARIES "")
         set(ORC_INCLUDE_DIRS "")
-    endif(NOT ORC_FOUND)
+    endif()
 
     add_library(volk_gnsssdr UNKNOWN IMPORTED)
     set_property(TARGET volk_gnsssdr PROPERTY IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install/lib/libvolk_gnsssdr${CMAKE_STATIC_LIBRARY_SUFFIX})
@@ -697,20 +696,20 @@ if(NOT VOLKGNSSSDR_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
-        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install/bin/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
-        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install/bin/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)
+        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)
+    else()
+        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
+            BYPRODUCTS ${CMAKE_SOURCE_DIR}/install/volk_gnsssdr_profile)
+    endif()
 
     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-config-info
-        ${CMAKE_SOURCE_DIR}/install/volk_gnsssdr-config-info)
-endif(NOT VOLKGNSSSDR_FOUND)
+            ${CMAKE_SOURCE_DIR}/install/volk_gnsssdr-config-info)
+endif()
 
 
 
@@ -725,35 +724,33 @@ if(NOT GFLAGS_FOUND)
     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)
+        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()
+        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()
 
     set(GFlags_INCLUDE_DIRS
         ${CMAKE_CURRENT_BINARY_DIR}/gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}/include CACHE PATH "Local Gflags headers"
@@ -770,7 +767,7 @@ if(NOT GFLAGS_FOUND)
     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)
+endif()
 
 
 
@@ -781,28 +778,28 @@ if(NOT ${ENABLE_OWN_GLOG})
     find_package(GLOG)
     if(GLOG_INCLUDE_DIRS)
         set(GLOG_FOUND ON)
-    endif(GLOG_INCLUDE_DIRS)
-endif(NOT ${ENABLE_OWN_GLOG})
+    endif()
+endif()
 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)
+    endif()
     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})
+    endif()
     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})
+    else()
         set(GFLAGS_LIBRARIES_TO_LINK ${GFlags_LIBS})
         set(GFLAGS_LIBRARY_DIR_TO_LINK ${GFlags_LIBRARY_DIRS})
-    endif(${LOCAL_GFLAGS})
+    endif()
 
     if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/tmp/configure_with_gflags
@@ -820,7 +817,7 @@ 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")
+    else()
         file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/tmp/configure_with_gflags
 "#!/bin/sh
 export CPPFLAGS=-I${GFlags_INCLUDE_DIRS}
@@ -832,49 +829,48 @@ 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()
 
     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)
+            GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 
     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")
+            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()
+                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()
+                    message(" sudo apt-get install automake")
+                endif()
+                message(FATAL_ERROR "aclocal is required to build glog from source")
+            endif()
+        else()
             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'")
+                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(" sudo zypper install libtoool")
+            else()
+                message(" sudo apt-get install libtool")
+            endif()
             message(FATAL_ERROR "libtool is required to build glog from source")
-        endif(EXISTS "/usr/bin/libtoolize")
-    endif(OS_IS_LINUX)
+        endif()
+    endif()
 
     if(CMAKE_VERSION VERSION_LESS 3.2)
-        ExternalProject_Add(
-            glog-${GNSSSDR_GLOG_LOCAL_VERSION}
+        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/
@@ -887,9 +883,8 @@ ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/c
             PATCH_COMMAND ""
             INSTALL_COMMAND ""
         )
-    else(CMAKE_VERSION VERSION_LESS 3.2)
-        ExternalProject_Add(
-            glog-${GNSSSDR_GLOG_LOCAL_VERSION}
+    else()
+        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/
@@ -903,7 +898,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/c
             PATCH_COMMAND ""
             INSTALL_COMMAND ""
         )
-    endif(CMAKE_VERSION VERSION_LESS 3.2)
+    endif()
 
     # Set up variables
     set(GLOG_INCLUDE_DIRS
@@ -914,15 +909,15 @@ ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/c
         ${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})
+else()
     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})
+endif()
 
 if(NOT ENABLE_LOG)
     message(STATUS "Logging is not enabled")
     add_definitions(-DGOOGLE_STRIP_LOG=1)
-endif(NOT ENABLE_LOG)
+endif()
 
 
 
@@ -936,11 +931,11 @@ if(NOT BLAS)
     message(" You can try to install it by typing:")
     if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
         message(" sudo yum install blas-devel")
-    else(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
+    else()
         message(" sudo apt-get install libblas-dev")
-    endif(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
+    endif()
     message(FATAL_ERROR "BLAS is required to build gnss-sdr")
-endif(NOT BLAS)
+endif()
 
 
 
@@ -956,11 +951,11 @@ if(NOT LAPACK)
         message(" sudo yum install lapack-devel")
     elseif(${LINUX_DISTRIBUTION} MATCHES "openSUSE")
         message(" sudo zypper install lapack-devel")
-    else(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
+    else()
         message(" sudo apt-get install liblapack-dev")
-    endif(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
+    endif()
     message(FATAL_ERROR "LAPACK is required to build gnss-sdr")
-endif(NOT LAPACK)
+endif()
 
 
 
@@ -972,8 +967,8 @@ if(ARMADILLO_FOUND)
     if(${ARMADILLO_VERSION_STRING} VERSION_LESS ${GNSSSDR_ARMADILLO_MIN_VERSION})
         set(ARMADILLO_FOUND false)
         set(ENABLE_OWN_ARMADILLO true)
-    endif(${ARMADILLO_VERSION_STRING} VERSION_LESS ${GNSSSDR_ARMADILLO_MIN_VERSION})
-endif(ARMADILLO_FOUND)
+    endif()
+endif()
 
 if(NOT ARMADILLO_FOUND OR ENABLE_OWN_ARMADILLO)
     message(STATUS " Armadillo has not been found.")
@@ -991,22 +986,21 @@ if(NOT ARMADILLO_FOUND OR ENABLE_OWN_ARMADILLO)
             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")
+                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(STATUS " sudo zypper install gcc-fortran")
+            else()
+                message(STATUS " sudo apt-get install gfortran")
+            endif()
             message(FATAL_ERROR "gfortran is required to build gnss-sdr")
-        endif(NOT GFORTRAN)
-    endif(NOT OS_IS_MACOSX)
+        endif()
+    endif()
 
     #############################################
     # Download and build Armadillo
     #############################################
     if(CMAKE_VERSION VERSION_LESS 3.2)
-        ExternalProject_Add(
-            armadillo-${armadillo_RELEASE}
+        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}
@@ -1017,9 +1011,8 @@ if(NOT ARMADILLO_FOUND OR ENABLE_OWN_ARMADILLO)
             UPDATE_COMMAND ""
             INSTALL_COMMAND ""
         )
-    else(CMAKE_VERSION VERSION_LESS 3.2)
-        ExternalProject_Add(
-            armadillo-${armadillo_RELEASE}
+    else()
+        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}
@@ -1031,22 +1024,22 @@ if(NOT ARMADILLO_FOUND OR ENABLE_OWN_ARMADILLO)
             UPDATE_COMMAND ""
             INSTALL_COMMAND ""
         )
-    endif(CMAKE_VERSION VERSION_LESS 3.2)
+    endif()
 
     # 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)
+    endif()
     set(ARMADILLO_LIBRARIES ${BLAS} ${LAPACK} ${GFORTRAN} ${binary_dir}/${CMAKE_FIND_LIBRARY_PREFIXES}armadillo${CMAKE_STATIC_LIBRARY_SUFFIX})
     set(LOCAL_ARMADILLO true CACHE STRING "Armadillo downloaded and built automatically" FORCE)
     set(ARMADILLO_VERSION_STRING ${armadillo_RELEASE})
-else(NOT ARMADILLO_FOUND OR ENABLE_OWN_ARMADILLO)
+else()
     set(armadillo_RELEASE ${ARMADILLO_VERSION_STRING})
     add_library(armadillo-${armadillo_RELEASE} UNKNOWN IMPORTED)
     set_property(TARGET armadillo-${armadillo_RELEASE} PROPERTY IMPORTED_LOCATION "${ARMADILLO_LIBRARIES}")
-endif(NOT ARMADILLO_FOUND OR ENABLE_OWN_ARMADILLO)
+endif()
 
 
 
@@ -1055,35 +1048,36 @@ endif(NOT ARMADILLO_FOUND OR ENABLE_OWN_ARMADILLO)
 ################################################################################
 find_package(GnuTLS)
 find_library(GNUTLS_OPENSSL_LIBRARY NAMES gnutls-openssl libgnutls-openssl.so.27
-                                    HINTS /usr/lib
-                                          /usr/lib64
-                                          /usr/local/lib
-                                          /usr/local/lib64
-                                          /opt/local/lib
-                                          /usr/lib/x86_64-linux-gnu
-                                          /usr/lib/aarch64-linux-gnu
-                                          /usr/lib/arm-linux-gnueabihf
-                                          /usr/lib/arm-linux-gnueabi
-                                          /usr/lib/i386-linux-gnu
-                                          /usr/lib/alpha-linux-gnu
-                                          /usr/lib/hppa-linux-gnu
-                                          /usr/lib/i386-gnu
-                                          /usr/lib/i686-gnu
-                                          /usr/lib/i686-linux-gnu
-                                          /usr/lib/x86_64-kfreebsd-gnu
-                                          /usr/lib/i686-kfreebsd-gnu
-                                          /usr/lib/m68k-linux-gnu
-                                          /usr/lib/mips-linux-gnu
-                                          /usr/lib/mips64el-linux-gnuabi64
-                                          /usr/lib/mipsel-linux-gnu
-                                          /usr/lib/powerpc-linux-gnu
-                                          /usr/lib/powerpc-linux-gnuspe
-                                          /usr/lib/powerpc64-linux-gnu
-                                          /usr/lib/powerpc64le-linux-gnu
-                                          /usr/lib/s390x-linux-gnu
-                                          /usr/lib/sparc64-linux-gnu
-                                          /usr/lib/x86_64-linux-gnux32
-                                          /usr/lib/sh4-linux-gnu)
+    HINTS /usr/lib
+        /usr/lib64
+        /usr/local/lib
+        /usr/local/lib64
+        /opt/local/lib
+        /usr/lib/x86_64-linux-gnu
+        /usr/lib/aarch64-linux-gnu
+        /usr/lib/arm-linux-gnueabihf
+        /usr/lib/arm-linux-gnueabi
+        /usr/lib/i386-linux-gnu
+        /usr/lib/alpha-linux-gnu
+        /usr/lib/hppa-linux-gnu
+        /usr/lib/i386-gnu
+        /usr/lib/i686-gnu
+        /usr/lib/i686-linux-gnu
+        /usr/lib/x86_64-kfreebsd-gnu
+        /usr/lib/i686-kfreebsd-gnu
+        /usr/lib/m68k-linux-gnu
+        /usr/lib/mips-linux-gnu
+        /usr/lib/mips64el-linux-gnuabi64
+        /usr/lib/mipsel-linux-gnu
+        /usr/lib/powerpc-linux-gnu
+        /usr/lib/powerpc-linux-gnuspe
+        /usr/lib/powerpc64-linux-gnu
+        /usr/lib/powerpc64le-linux-gnu
+        /usr/lib/s390x-linux-gnu
+        /usr/lib/sparc64-linux-gnu
+        /usr/lib/x86_64-linux-gnux32
+        /usr/lib/sh4-linux-gnu
+)
 
 if(NOT GNUTLS_OPENSSL_LIBRARY)
     message(STATUS "Looking for OpenSSL instead...")
@@ -1092,22 +1086,22 @@ if(NOT GNUTLS_OPENSSL_LIBRARY)
         set(GNUTLS_INCLUDE_DIR ${OPENSSL_INCLUDE_DIR})
         set(GNUTLS_LIBRARIES "")
         set(GNUTLS_OPENSSL_LIBRARY ${OPENSSL_SSL_LIBRARY})
-    else(OPENSSL_FOUND)
+    else()
         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(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
+                message(" sudo yum install openssl-devel")
+            else()
+                message(" sudo apt-get install libgnutls-openssl-dev")
+            endif()
+        endif()
         if(OS_IS_MACOSX)
-          message(" sudo port install gnutls")
-        endif(OS_IS_MACOSX)
+            message(" sudo port install gnutls")
+        endif()
         message(FATAL_ERROR "GnuTLS libraries with openssl compatibility are required to build gnss-sdr")
-    endif(OPENSSL_FOUND)
-endif(NOT GNUTLS_OPENSSL_LIBRARY)
+    endif()
+endif()
 
 
 
@@ -1118,97 +1112,95 @@ 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).")
-    endif(MATIO_FOUND)
+    endif()
     message(STATUS " Matio v${GNSSSDR_MATIO_LOCAL_VERSION} will be downloaded and built automatically")
     message(STATUS " when doing '${CMAKE_MAKE_PROGRAM_PRETTY_NAME}'. ")
     find_package(ZLIB)
     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")
-        endif(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()
+                    message(" sudo apt-get install libtool")
+                endif()
+                message(FATAL_ERROR "libtool is required to build matio from source")
+            endif()
+            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()
+                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()
+                    message(" sudo apt-get install automake")
+                endif()
+                message(FATAL_ERROR "aclocal is required to build matio from source")
+            endif()
+        endif()
         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)
-        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")
-        endif(HDF5_FOUND)
-    else(ZLIB_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()
+                if(EXISTS /usr/local/include/hdf5.h)
+                    set(HDF5_BASE_DIR /usr/local)
+                endif()
+            endif()
+            if(CMAKE_VERSION VERSION_LESS 3.2)
+                ExternalProject_Add(matio-${GNSSSDR_MATIO_LOCAL_VERSION}
+                    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/matio
+                    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()
+                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()
+            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()
+            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()
+            if(OS_IS_LINUX)
+                message(STATUS "  $ sudo apt-get install libhdf5-dev")
+            endif()
+            message(FATAL_ERROR "*** The hdf5 library is required to build gnss-sdr")
+        endif()
+    else()
         message(FATAL_ERROR "*** The zlib library is required to build gnss-sdr")
-    endif(ZLIB_FOUND)
-endif(NOT MATIO_FOUND OR MATIO_VERSION_STRING VERSION_LESS ${GNSSSDR_MATIO_MIN_VERSION})
+    endif()
+endif()
 
 
 
@@ -1217,47 +1209,45 @@ endif(NOT MATIO_FOUND OR MATIO_VERSION_STRING VERSION_LESS ${GNSSSDR_MATIO_MIN_V
 ################################################################################
 find_package(PUGIXML QUIET)
 if(PUGIXML_FOUND)
-    message(STATUS "PugiXML has been found. Reading of GSA Galileo almanac XML files enabled.")
-else(PUGIXML_FOUND)
+    message(STATUS "PugiXML has been found.")
+else()
     message(STATUS " PugiXML v${GNSSSDR_PUGIXML_LOCAL_VERSION} will be downloaded and built automatically when doing '${CMAKE_MAKE_PROGRAM_PRETTY_NAME}'.")
     set(PUGIXML_COMPILER -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER})
     set(TOOLCHAIN_ARG "")
     if(EXISTS $ENV{OECORE_TARGET_SYSROOT})
         set(PUGIXML_COMPILER "")
         set(TOOLCHAIN_ARG "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_SOURCE_DIR}/cmake/Toolchains/oe-sdk_cross.cmake")
-    endif(EXISTS $ENV{OECORE_TARGET_SYSROOT})
+    endif()
     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 ""
+        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 ""
         )
-    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 ""
+    else()
+        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 ""
         )
-    endif(CMAKE_VERSION VERSION_LESS 3.2)
+    endif()
     set(PUGIXML_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION}/${CMAKE_FIND_LIBRARY_PREFIXES}pugixml${CMAKE_STATIC_LIBRARY_SUFFIX})
     set(PUGIXML_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/pugixml/pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION}/src)
     set(PUGIXML_LOCAL true)
-endif(PUGIXML_FOUND)
+endif()
 
 
 ################################################################################
@@ -1270,11 +1260,11 @@ if(ENABLE_UHD)
         message(STATUS " The USRP Hardware Driver (UHD) signal source will not be built,")
         message(STATUS " so all USRP-based front-ends will not be usable.")
         message(STATUS " Please check https://files.ettus.com/manual/")
-    else(NOT UHD_FOUND)
+    else()
         set(GR_REQUIRED_COMPONENTS UHD)
         find_package(Gnuradio)
-    endif(NOT UHD_FOUND)
-endif(ENABLE_UHD)
+    endif()
+endif()
 
 
 ################################################################################
@@ -1292,10 +1282,10 @@ if(DOXYGEN_FOUND)
     if(PDFLATEX_COMPILER)
         set(GENERATE_PDF_DOCUMENTATION "YES")
         set(GNSSSDR_USE_MATHJAX "NO")
-    else(PDFLATEX_COMPILER)
+    else()
         set(GENERATE_PDF_DOCUMENTATION "NO")
         set(GNSSSDR_USE_MATHJAX "YES")
-    endif(PDFLATEX_COMPILER)
+    endif()
     configure_file(${CMAKE_SOURCE_DIR}/docs/doxygen/Doxyfile.in
         ${CMAKE_BINARY_DIR}/docs/doxygen/Doxyfile
         @ONLY
@@ -1315,7 +1305,7 @@ if(DOXYGEN_FOUND)
             WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/docs/latex
             COMMENT "Generating PDF manual with Doxygen." VERBATIM
         )
-    endif(LATEX_COMPILER)
+    endif()
     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
@@ -1323,21 +1313,21 @@ if(DOXYGEN_FOUND)
         COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_BINARY_DIR}/docs/GNSS-SDR_manual.pdf
         COMMENT "Cleaning documentation." VERBATIM
     )
-else(DOXYGEN_FOUND)
+else()
     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")
+        else()
             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)
+        endif()
+    endif()
     if(OS_IS_MACOSX)
         message(STATUS " or simply by doing 'sudo port install doxygen +latex'.")
-    endif(OS_IS_MACOSX)
-endif(DOXYGEN_FOUND)
+    endif()
+endif()
 
 
 
@@ -1348,25 +1338,25 @@ if(ENABLE_OPENCL)
     find_package(OPENCL)
     if($ENV{DISABLE_OPENCL})
         set(DISABLE_OPENCL TRUE)
-    endif($ENV{DISABLE_OPENCL})
+    endif()
     if(DISABLE_OPENCL)
         set(OPENCL_FOUND FALSE)
-    else(DISABLE_OPENCL)
+    else()
         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 ../' ")
-        endif(OPENCL_FOUND)
-    endif(DISABLE_OPENCL)
+            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()
+    endif()
     if(ENABLE_GENERIC_ARCH)
         set(OPENCL_FOUND FALSE)
         message(STATUS "ENABLE_GENERIC_ARCH is set to ON so the use of OpenCL has been disabled.")
-    endif(ENABLE_GENERIC_ARCH)
+    endif()
     if(NOT OPENCL_FOUND)
         message(STATUS "Processing blocks using OpenCL will not be built.")
-    endif(NOT OPENCL_FOUND)
-else(ENABLE_OPENCL)
+    endif()
+else()
     set(OPENCL_FOUND FALSE)
-endif(ENABLE_OPENCL)
+endif()
 
 
 
@@ -1376,16 +1366,18 @@ endif(ENABLE_OPENCL)
 if($ENV{CUDA_GPU_ACCEL})
     message(STATUS "CUDA_GPU_ACCEL environment variable found.")
     set(ENABLE_CUDA ON)
-endif($ENV{CUDA_GPU_ACCEL})
+endif()
 
 if(ENABLE_CUDA)
-    FIND_PACKAGE(CUDA REQUIRED)
+    find_package(CUDA REQUIRED)
     message(STATUS "NVIDIA CUDA GPU Acceleration will be enabled.")
     message(STATUS "You can disable it with 'cmake -DENABLE_CUDA=OFF ../'")
-else(ENABLE_CUDA)
+else()
     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)
+endif()
+
+
 
 ###############################################################################
 # CUSTOM UDP PACKET SOURCE (OPTIONAL)
@@ -1393,10 +1385,10 @@ endif(ENABLE_CUDA)
 if(ENABLE_RAW_UDP)
     message(STATUS "High-optimized custom UDP ip packet source will be enabled.")
     message(STATUS "You can disable it with 'cmake -DENABLE_RAW_UDP=OFF ../'")
-else(ENABLE_RAW_UDP)
+else()
     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)
+endif()
 
 
 ###############################################################################
@@ -1405,10 +1397,10 @@ endif(ENABLE_RAW_UDP)
 if(ENABLE_FPGA)
     message(STATUS "FPGA Acceleration will be enabled.")
     message(STATUS "You can disable it with 'cmake -DENABLE_FPGA=OFF ../'")
-else(ENABLE_FPGA)
+else()
     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)
+endif()
 
 
 
@@ -1418,75 +1410,75 @@ endif(ENABLE_FPGA)
 if($ENV{GN3S_DRIVER})
     message(STATUS "GN3S_DRIVER environment variable found.")
     set(ENABLE_GN3S ON)
-endif($ENV{GN3S_DRIVER})
+endif()
 if(GN3S_DRIVER)
     set(ENABLE_GN3S ON)
-endif(GN3S_DRIVER)
+endif()
 if(ENABLE_GN3S)
     message(STATUS "The GN3S driver will be compiled.")
     message(STATUS "You can disable it with 'cmake -DENABLE_GN3S=OFF ../'")
-else(ENABLE_GN3S)
+else()
     message(STATUS "The (optional and experimental) GN3S driver is not enabled.")
     message(STATUS "Enable it with 'cmake -DENABLE_GN3S=ON ../' to add support for the GN3S dongle.")
-endif(ENABLE_GN3S)
+endif()
 
 if($ENV{RAW_ARRAY_DRIVER})
     message(STATUS "RAW_ARRAY_DRIVER environment variable found.")
     set(ENABLE_ARRAY ON)
-endif($ENV{RAW_ARRAY_DRIVER})
+endif()
 
 if(RAW_ARRAY_DRIVER)
     set(ENABLE_ARRAY ON)
-endif(RAW_ARRAY_DRIVER)
+endif()
 
 if(ENABLE_ARRAY)
     message(STATUS "CTTC's Antenna Array front-end driver will be compiled.")
     message(STATUS "You can disable it with 'cmake -DENABLE_ARRAY=OFF ../'")
     # copy firmware to install folder
     # Build project gr-dbfcttc
-else(ENABLE_ARRAY)
+else()
     message(STATUS "The (optional) CTTC's Antenna Array front-end driver is not enabled.")
     message(STATUS "Enable it with 'cmake -DENABLE_ARRAY=ON ../' to add support for the CTTC experimental array front-end.")
-endif(ENABLE_ARRAY)
+endif()
 
 if($ENV{RTLSDR_DRIVER})
     message(STATUS "RTLSDR_DRIVER environment variable found.")
     set(ENABLE_OSMOSDR ON)
-endif($ENV{RTLSDR_DRIVER})
+endif()
 
 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 ../'")
-    else(GROSMOSDR_FOUND)
+    else()
         if(ENABLE_PACKAGING)
-          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")
-        endif(ENABLE_PACKAGING)
-    endif(GROSMOSDR_FOUND)
-else(ENABLE_OSMOSDR)
+            message(WARNING "gr-osmosdr has not been found. Source blocks depending on it will NOT be built.")
+        else()
+            message(FATAL_ERROR "gr-osmosdr required to build gnss-sdr with the optional OSMOSDR driver")
+        endif()
+    endif()
+else()
     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)
+endif()
 
 if($ENV{FLEXIBAND_DRIVER})
     message(STATUS "FLEXIBAND_DRIVER environment variable found.")
     set(ENABLE_FLEXIBAND ON)
-endif($ENV{FLEXIBAND_DRIVER})
+endif()
 
 if(FLEXIBAND_DRIVER)
     set(ENABLE_FLEXIBAND ON)
-endif(FLEXIBAND_DRIVER)
+endif()
 
 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 ../'")
-else(ENABLE_FLEXIBAND)
+else()
     message(STATUS "The (optional) Teleorbit Flexiband front-end driver adapter is not enabled.")
     message(STATUS "Enable it with 'cmake -DENABLE_FLEXIBAND=ON ../' to add support for the Teleorbit Flexiband front-end.")
-endif(ENABLE_FLEXIBAND)
+endif()
 
 
 
@@ -1499,23 +1491,23 @@ if(ENABLE_GPERFTOOLS)
         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)
+    else()
         message(STATUS "GPerftools libraries found.")
         message(STATUS "Binaries will be compiled with 'tcmalloc' and 'profiler' libraries.")
-    endif(NOT GPERFTOOLS_FOUND)
-endif(ENABLE_GPERFTOOLS)
+    endif()
+endif()
 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")
-        endif((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")
+        endif()
         if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-          set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -fno-builtin")
-        endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    endif(GPERFTOOLS_FOUND)
-endif(ENABLE_GPERFTOOLS)
+            set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -fno-builtin")
+        endif()
+    endif()
+endif()
 
 
 
@@ -1526,7 +1518,7 @@ if(ENABLE_GPROF)
     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)
+endif()
 
 
 ########################################################################
@@ -1538,15 +1530,15 @@ endif(ENABLE_GPROF)
 if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
     if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.1.1")
         set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++11")
-    else(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.1.1")
+    else()
         # if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "8.0.0")
             set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++14")
         # else(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "8.0.0")
             # set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++17")
         # endif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "8.0.0")
-    endif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.1.1")
+    endif()
     set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -Wall -Wextra")  #Add warning flags: For "-Wall" see https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
-endif((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
+endif()
 
 # Support of C++17 is still not possible due to pm_remez.h (solved in GNU Radio 3.8)
 # Enable C++14 support in Clang >= 3.5.0 or AppleClang >= 600
@@ -1555,37 +1547,37 @@ 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")
-        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")
-        endif(CLANG_VERSION VERSION_LESS "600")
-    else(OS_IS_MACOSX)
+            set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++11")
+        else()
+            # 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()
+    else()
         if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "3.5.0")
-          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")
-        endif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "3.5.0")
-    endif(OS_IS_MACOSX)
+            set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++11")
+        else()
+            # 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()
+    endif()
 
     if(OS_IS_MACOSX)
         set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -stdlib=libc++")
-    endif(OS_IS_MACOSX)
-endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    endif()
+endif()
 
 if(NOT ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT (CMAKE_CXX_COMPILER_ID MATCHES "Clang")) AND NOT WIN32)
     if(NOT (CMAKE_VERSION VERSION_LESS "3.1"))
         set(CMAKE_C_STANDARD 11)
         set(CMAKE_CXX_STANDARD 14)
-    endif(NOT (CMAKE_VERSION VERSION_LESS "3.1"))
-endif(NOT ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT (CMAKE_CXX_COMPILER_ID MATCHES "Clang")) AND NOT WIN32)
+    endif()
+endif()
 
 # Processor-architecture related flags
 # See https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html
@@ -1593,31 +1585,31 @@ 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)
+      else()
           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)
+                      if(ARM_VERSION STREQUAL "arm")
+                          # Unknown arm version - try our best to detect
+                          set(ARCH_COMPILER_FLAGS "-mcpu=native")
+                      else()
+                          set(ARCH_COMPILER_FLAGS "-march=${ARM_VERSION}")
+                      endif()
+                  endif()
+              else()
                   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()
+          endif()
+      endif()
+    endif()
+endif()
 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)
     # https://gcc.gnu.org/wiki/Visibility
     add_definitions(-fvisibility=hidden)
-endif((CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
+endif()
 
 
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 84e918b73..83c519fd5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,5 +21,5 @@ add_subdirectory(core)
 add_subdirectory(main)
 if(ENABLE_UNIT_TESTING OR ENABLE_SYSTEM_TESTING)
     add_subdirectory(tests)
-endif(ENABLE_UNIT_TESTING OR ENABLE_SYSTEM_TESTING)
+endif()
 add_subdirectory(utils)
diff --git a/src/algorithms/PVT/adapters/CMakeLists.txt b/src/algorithms/PVT/adapters/CMakeLists.txt
index 74ef5d92a..d8c055506 100644
--- a/src/algorithms/PVT/adapters/CMakeLists.txt
+++ b/src/algorithms/PVT/adapters/CMakeLists.txt
@@ -19,7 +19,7 @@
 
 if(Boost_VERSION LESS 105800)
     add_definitions(-DOLD_BOOST=1)
-endif(Boost_VERSION LESS 105800)
+endif()
 
 set(PVT_ADAPTER_SOURCES
     rtklib_pvt.cc
diff --git a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
index bbe9ed19d..eb58c0894 100644
--- a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
@@ -19,7 +19,7 @@
 
 if(Boost_VERSION LESS 105800)
     add_definitions(-DOLD_BOOST=1)
-endif(Boost_VERSION LESS 105800)
+endif()
 
 set(PVT_GR_BLOCKS_SOURCES
     rtklib_pvt_cc.cc
diff --git a/src/algorithms/PVT/libs/CMakeLists.txt b/src/algorithms/PVT/libs/CMakeLists.txt
index ad1944c21..cd306531a 100644
--- a/src/algorithms/PVT/libs/CMakeLists.txt
+++ b/src/algorithms/PVT/libs/CMakeLists.txt
@@ -16,7 +16,7 @@
 # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
 #
 
-add_definitions( -DGNSS_SDR_VERSION="${VERSION}" )
+add_definitions(-DGNSS_SDR_VERSION="${VERSION}")
 
 set(PVT_LIB_SOURCES
     pvt_solution.cc
@@ -72,13 +72,13 @@ if(MATIO_FOUND)
         glog-${glog_RELEASE}
         armadillo-${armadillo_RELEASE}
     )
-else(MATIO_FOUND)
+else()
     add_dependencies(pvt_lib
         glog-${glog_RELEASE}
         armadillo-${armadillo_RELEASE}
         matio-${GNSSSDR_MATIO_LOCAL_VERSION}
     )
-endif(MATIO_FOUND)
+endif()
 
 target_link_libraries(
     pvt_lib
diff --git a/src/algorithms/acquisition/adapters/CMakeLists.txt b/src/algorithms/acquisition/adapters/CMakeLists.txt
index f1e21185d..ee0046970 100644
--- a/src/algorithms/acquisition/adapters/CMakeLists.txt
+++ b/src/algorithms/acquisition/adapters/CMakeLists.txt
@@ -70,7 +70,7 @@ if(ENABLE_FPGA)
         galileo_e5a_pcps_acquisition_fpga.h
         gps_l5i_pcps_acquisition_fpga.h
     )
-endif(ENABLE_FPGA)
+endif()
 
 if(OPENCL_FOUND)
     set(ACQ_ADAPTER_SOURCES
@@ -80,7 +80,7 @@ if(OPENCL_FOUND)
     set(ACQ_ADAPTER_HEADERS ${ACQ_ADAPTER_HEADERS}
         gps_l1_ca_pcps_opencl_acquisition.h
     )
-endif(OPENCL_FOUND)
+endif()
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
index a6d5f6a45..60825d6f0 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
@@ -42,12 +42,12 @@ set(ACQ_GR_BLOCKS_HEADERS
 if(ENABLE_FPGA)
     set(ACQ_GR_BLOCKS_SOURCES ${ACQ_GR_BLOCKS_SOURCES} pcps_acquisition_fpga.cc)
     set(ACQ_GR_BLOCKS_HEADERS ${ACQ_GR_BLOCKS_HEADERS} pcps_acquisition_fpga.h)
-endif(ENABLE_FPGA)
+endif()
 
 if(OPENCL_FOUND)
     set(ACQ_GR_BLOCKS_SOURCES ${ACQ_GR_BLOCKS_SOURCES} pcps_opencl_acquisition_cc.cc)
     set(ACQ_GR_BLOCKS_HEADERS ${ACQ_GR_BLOCKS_HEADERS} pcps_opencl_acquisition_cc.h)
-endif(OPENCL_FOUND)
+endif()
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
@@ -69,10 +69,10 @@ if(OPENCL_FOUND)
     include_directories(${OPENCL_INCLUDE_DIRS})
     if(OS_IS_MACOSX)
         set(OPT_LIBRARIES ${OPT_LIBRARIES} "-framework OpenCL")
-    else(OS_IS_MACOSX)
+    else()
         set(OPT_LIBRARIES ${OPT_LIBRARIES} ${OPENCL_LIBRARIES})
-    endif(OS_IS_MACOSX)
-endif(OPENCL_FOUND)
+    endif()
+endif()
 
 list(SORT ACQ_GR_BLOCKS_HEADERS)
 list(SORT ACQ_GR_BLOCKS_SOURCES)
@@ -91,7 +91,7 @@ if(ENABLE_FPGA)
         ${OPT_LIBRARIES}
         ${OPT_ACQUISITION_LIBRARIES}
     )
-else(ENABLE_FPGA)
+else()
     target_link_libraries(acq_gr_blocks
         gnss_sp_libs
         gnss_system_parameters
@@ -103,8 +103,8 @@ else(ENABLE_FPGA)
         ${MATIO_LIBRARIES}
         ${OPT_ACQUISITION_LIBRARIES}
     )
-endif(ENABLE_FPGA)
+endif()
 
-if(NOT VOLK_GNSSSDR_FOUND)
+if(NOT VOLKGNSSSDR_FOUND)
     add_dependencies(acq_gr_blocks volk_gnsssdr_module)
-endif(NOT VOLK_GNSSSDR_FOUND)
+endif()
diff --git a/src/algorithms/acquisition/libs/CMakeLists.txt b/src/algorithms/acquisition/libs/CMakeLists.txt
index 9ffc0e07a..c3f368be6 100644
--- a/src/algorithms/acquisition/libs/CMakeLists.txt
+++ b/src/algorithms/acquisition/libs/CMakeLists.txt
@@ -30,7 +30,7 @@ if(ENABLE_FPGA)
         ${GFlags_INCLUDE_DIRS}
         ${VOLK_GNSSSDR_INCLUDE_DIRS}
     )
-endif(ENABLE_FPGA)
+endif()
 
 set(ACQUISITION_LIB_HEADERS ${ACQUISITION_LIB_HEADERS} acq_conf.h)
 set(ACQUISITION_LIB_SOURCES ${ACQUISITION_LIB_SOURCES} acq_conf.cc)
@@ -51,8 +51,8 @@ target_link_libraries(acquisition_lib
     ${GNURADIO_RUNTIME_LIBRARIES}
 )
 
-if(VOLK_GNSSSDR_FOUND)
+if(VOLKGNSSSDR_FOUND)
     add_dependencies(acquisition_lib glog-${glog_RELEASE})
-else(VOLK_GNSSSDR_FOUND)
+else()
     add_dependencies(acquisition_lib glog-${glog_RELEASE} volk_gnsssdr_module)
 endif()
diff --git a/src/algorithms/input_filter/adapters/CMakeLists.txt b/src/algorithms/input_filter/adapters/CMakeLists.txt
index 7f33f4072..8153c6c3c 100644
--- a/src/algorithms/input_filter/adapters/CMakeLists.txt
+++ b/src/algorithms/input_filter/adapters/CMakeLists.txt
@@ -48,7 +48,7 @@ include_directories(
 
 if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
     add_definitions(-DGR_GREATER_38=1)
-endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
+endif()
 
 list(SORT INPUT_FILTER_ADAPTER_HEADERS)
 list(SORT INPUT_FILTER_ADAPTER_SOURCES)
diff --git a/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt b/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt
index ea3de1cb6..8a4aefc11 100644
--- a/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt
@@ -54,8 +54,8 @@ target_link_libraries(input_filter_gr_blocks
     ${VOLK_GNSSSDR_LIBRARIES}
     ${LOG4CPP_LIBRARIES})
 
-if(NOT VOLK_GNSSSDR_FOUND)
+if(NOT VOLKGNSSSDR_FOUND)
     add_dependencies(input_filter_gr_blocks volk_gnsssdr_module glog-${glog_RELEASE})
-else(NOT VOLK_GNSSSDR_FOUND)
+else()
     add_dependencies(input_filter_gr_blocks glog-${glog_RELEASE})
-endif(NOT VOLK_GNSSSDR_FOUND)
+endif()
diff --git a/src/algorithms/libs/CMakeLists.txt b/src/algorithms/libs/CMakeLists.txt
index 29869ea6a..9ef2da55c 100644
--- a/src/algorithms/libs/CMakeLists.txt
+++ b/src/algorithms/libs/CMakeLists.txt
@@ -78,7 +78,7 @@ if(ENABLE_FPGA)
         gnss_sdr_time_counter.h
         gnss_sdr_fpga_sample_counter.h
     )
-endif(ENABLE_FPGA)
+endif()
 
 if(OPENCL_FOUND)
     set(GNSS_SPLIBS_SOURCES ${GNSS_SPLIBS_SOURCES}
@@ -91,7 +91,7 @@ if(OPENCL_FOUND)
         opencl/fft_setup.h # Needs OpenCL
         opencl/fft_kernelstring.h # Needs OpenCL
     )
-endif(OPENCL_FOUND)
+endif()
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
@@ -112,10 +112,10 @@ if(OPENCL_FOUND)
     include_directories(${OPENCL_INCLUDE_DIRS})
     if(OS_IS_MACOSX)
         set(OPT_LIBRARIES ${OPT_LIBRARIES} "-framework OpenCL")
-    else(OS_IS_MACOSX)
+    else()
         set(OPT_LIBRARIES ${OPT_LIBRARIES} ${OPENCL_LIBRARIES})
-    endif(OS_IS_MACOSX)
-endif(OPENCL_FOUND)
+    endif()
+endif()
 
 add_definitions(-DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}")
 
@@ -138,16 +138,16 @@ target_link_libraries(gnss_sp_libs
     gnss_rx
 )
 
-if(NOT VOLK_GNSSSDR_FOUND)
+if(NOT VOLKGNSSSDR_FOUND)
     add_dependencies(gnss_sp_libs volk_gnsssdr_module
         armadillo-${armadillo_RELEASE})
-else(NOT VOLK_GNSSSDR_FOUND)
+else()
     add_dependencies(gnss_sp_libs armadillo-${armadillo_RELEASE})
-endif(NOT VOLK_GNSSSDR_FOUND)
+endif()
 
 if(${GFLAGS_GREATER_20})
     add_definitions(-DGFLAGS_GREATER_2_0=1)
-endif(${GFLAGS_GREATER_20})
+endif()
 
 add_library(gnss_sdr_flags gnss_sdr_flags.cc gnss_sdr_flags.h)
 source_group(Headers FILES gnss_sdr_flags.h)
diff --git a/src/algorithms/libs/rtklib/CMakeLists.txt b/src/algorithms/libs/rtklib/CMakeLists.txt
index c2f7ff6f8..882cd4a81 100644
--- a/src/algorithms/libs/rtklib/CMakeLists.txt
+++ b/src/algorithms/libs/rtklib/CMakeLists.txt
@@ -78,7 +78,7 @@ add_dependencies(rtklib_lib glog-${glog_RELEASE})
 
 if(OS_IS_MACOSX)
     set(MAC_LIBRARIES "-framework Accelerate")
-endif(OS_IS_MACOSX)
+endif()
 
 target_link_libraries(
     rtklib_lib
diff --git a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt
index 5a1a55e8d..e829c474d 100644
--- a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt
@@ -48,14 +48,14 @@ if(MATIO_FOUND)
         glog-${glog_RELEASE}
         armadillo-${armadillo_RELEASE}
     )
-else(MATIO_FOUND)
+else()
     add_dependencies(obs_gr_blocks
         gnss_sp_libs
         glog-${glog_RELEASE}
         armadillo-${armadillo_RELEASE}
         matio-${GNSSSDR_MATIO_LOCAL_VERSION}
     )
-endif(MATIO_FOUND)
+endif()
 
 target_link_libraries(obs_gr_blocks
     gnss_sp_libs
diff --git a/src/algorithms/resampler/adapters/CMakeLists.txt b/src/algorithms/resampler/adapters/CMakeLists.txt
index 0f6c92684..07e8ddc74 100644
--- a/src/algorithms/resampler/adapters/CMakeLists.txt
+++ b/src/algorithms/resampler/adapters/CMakeLists.txt
@@ -39,7 +39,7 @@ include_directories(
 
 if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
     add_definitions(-DGR_GREATER_38=1)
-endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
+endif()
 
 list(SORT RESAMPLER_ADAPTER_HEADERS)
 list(SORT RESAMPLER_ADAPTER_SOURCES)
diff --git a/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
index eade10e00..30ab655e1 100644
--- a/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
@@ -47,8 +47,8 @@ target_link_libraries(signal_generator_blocks
     ${ORC_LIBRARIES}
 )
 
-if(VOLK_GNSSSDR_FOUND)
+if(VOLKGNSSSDR_FOUND)
     # add_dependencies(signal_generator_blocks glog-${glog_RELEASE})
-else(VOLK_GNSSSDR_FOUND)
+else()
     add_dependencies(signal_generator_blocks volk_gnsssdr_module)
-endif(VOLK_GNSSSDR_FOUND)
+endif()
diff --git a/src/algorithms/signal_source/adapters/CMakeLists.txt b/src/algorithms/signal_source/adapters/CMakeLists.txt
index 83062ea66..6674cd853 100644
--- a/src/algorithms/signal_source/adapters/CMakeLists.txt
+++ b/src/algorithms/signal_source/adapters/CMakeLists.txt
@@ -23,13 +23,13 @@ if(ENABLE_RAW_UDP)
     find_package(PCAP)
     if(NOT PCAP_FOUND)
         message(FATAL_ERROR "PCAP required to compile custom UDP packet sample source (ENABLE_RAW_UDP)")
-    endif(NOT PCAP_FOUND)
+    endif()
     get_filename_component(PCAP_LIBRARY_DIRS ${PCAP_LIBRARY} DIRECTORY CACHE)
     set(OPT_LIBRARIES ${OPT_LIBRARIES} ${PCAP_LIBRARIES})
     set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${PCAP_INCLUDE_DIRS})
     set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} custom_udp_signal_source.cc)
     set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} custom_udp_signal_source.h)
-endif(ENABLE_RAW_UDP)
+endif()
 
 if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2)
     find_package(GRIIO REQUIRED)
@@ -40,10 +40,10 @@ if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2)
         message(STATUS " * libad9361-iio from https://github.com/analogdevicesinc/libad9361-iio")
         message(STATUS " * gnuradio-iio from https://github.com/analogdevicesinc/gr-iio")
         message(FATAL_ERROR "gnuradio-iio is required for building gnss-sdr with this option enabled.")
-    endif(NOT GRIIO_FOUND)
+    endif()
     set(OPT_LIBRARIES ${OPT_LIBRARIES} ${IIO_LIBRARIES})
     set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS})
-endif(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2)
+endif()
 
 if(ENABLE_AD9361)
     find_package(LIBIIO REQUIRED)
@@ -54,10 +54,10 @@ if(ENABLE_AD9361)
         message(STATUS " * libad9361-iio from https://github.com/analogdevicesinc/libad9361-iio")
         message(STATUS " * gnuradio-iio from https://github.com/analogdevicesinc/gr-iio")
         message(FATAL_ERROR "libiio is required for building gnss-sdr with this option enabled.")
-    endif(NOT LIBIIO_FOUND)
+    endif()
     set(OPT_LIBRARIES ${OPT_LIBRARIES} ${LIBIIO_LIBRARIES})
     set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${LIBIIO_INCLUDE_DIRS})
-endif(ENABLE_AD9361)
+endif()
 
 
 if(ENABLE_PLUTOSDR)
@@ -67,8 +67,8 @@ if(ENABLE_PLUTOSDR)
     if(GRIIO_FOUND)
         set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} plutosdr_signal_source.cc)
         set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} plutosdr_signal_source.h)
-    endif(GRIIO_FOUND)
-endif(ENABLE_PLUTOSDR)
+    endif()
+endif()
 
 
 if(ENABLE_FMCOMMS2)
@@ -78,8 +78,8 @@ if(ENABLE_FMCOMMS2)
     if(GRIIO_FOUND)
         set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} fmcomms2_signal_source.cc)
         set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} fmcomms2_signal_source.h)
-    endif(GRIIO_FOUND)
-endif(ENABLE_FMCOMMS2)
+    endif()
+endif()
 
 
 if(ENABLE_AD9361)
@@ -89,8 +89,8 @@ if(ENABLE_AD9361)
     if(LIBIIO_FOUND)
         set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} ad9361_fpga_signal_source.cc)
         set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} ad9361_fpga_signal_source.h)
-    endif(LIBIIO_FOUND)
-endif(ENABLE_AD9361)
+    endif()
+endif()
 
 
 if(ENABLE_GN3S)
@@ -101,12 +101,12 @@ if(ENABLE_GN3S)
     if(NOT GRGN3S_FOUND)
         message(" gr-gn3s not found, install it from https://github.com/gnss-sdr/gr-gn3s ")
         message(FATAL_ERROR "gr-gn3s required for building gnss-sdr with this option enabled")
-    endif(NOT GRGN3S_FOUND)
+    endif()
     set(OPT_LIBRARIES ${OPT_LIBRARIES} ${GR_GN3S_LIBRARIES})
     set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${GR_GN3S_INCLUDE_DIRS})
     set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} gn3s_signal_source.cc)
     set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} gn3s_signal_source.h)
-endif(ENABLE_GN3S)
+endif()
 
 
 if(ENABLE_FLEXIBAND)
@@ -116,7 +116,7 @@ if(ENABLE_FLEXIBAND)
     find_package(TELEORBIT REQUIRED)
     if(NOT TELEORBIT_FOUND)
         message(FATAL_ERROR "Teleorbit Flexiband GNU Radio driver required to build gnss-sdr with the optional FLEXIBAND adapter")
-    endif(NOT TELEORBIT_FOUND)
+    endif()
     # Set up variables
     set(FLEXIBAND_DRIVER_INCLUDE_DIRS
         ${OPT_DRIVER_INCLUDE_DIRS}
@@ -126,7 +126,7 @@ if(ENABLE_FLEXIBAND)
     set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${FLEXIBAND_DRIVER_INCLUDE_DIRS})
     set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} flexiband_signal_source.cc)
     set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} flexiband_signal_source.h)
-endif(ENABLE_FLEXIBAND)
+endif()
 
 
 if(ENABLE_ARRAY)
@@ -137,12 +137,12 @@ if(ENABLE_ARRAY)
     if(NOT GRDBFCTTC_FOUND)
         message(" gr-dbfcttc not found, install it from https://github.com/gnss-sdr/gr-dbfcttc ")
         message(FATAL_ERROR "gr-dbfcttc required for building gnss-sdr with this option enabled")
-    endif(NOT GRDBFCTTC_FOUND)
+    endif()
     set(OPT_LIBRARIES ${OPT_LIBRARIES} ${GR_DBFCTTC_LIBRARIES})
     set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${GR_DBFCTTC_INCLUDE_DIRS})
     set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} raw_array_signal_source.cc)
     set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} raw_array_signal_source.h)
-endif(ENABLE_ARRAY)
+endif()
 
 
 if(ENABLE_OSMOSDR)
@@ -152,8 +152,8 @@ if(ENABLE_OSMOSDR)
     if(NOT GROSMOSDR_FOUND)
         if(ENABLE_PACKAGING)
             list(REMOVE_ITEM SIGNAL_SOURCE_ADAPTER_HEADERS ${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/adapters/osmosdr_signal_source.h)
-        endif(ENABLE_PACKAGING)
-    else(NOT GROSMOSDR_FOUND)
+        endif()
+    else()
         # set OSMO include dirs
         set(OSMO_DRIVER_INCLUDE_DIRS
             ${OPT_DRIVER_INCLUDE_DIRS}
@@ -163,8 +163,8 @@ if(ENABLE_OSMOSDR)
         set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} osmosdr_signal_source.h)
         set(OPT_LIBRARIES ${OPT_LIBRARIES} ${GROSMOSDR_LIBRARIES})
         set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${OSMO_DRIVER_INCLUDE_DIRS})
-    endif(NOT GROSMOSDR_FOUND)
-endif(ENABLE_OSMOSDR)
+    endif()
+endif()
 
 
 if(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd)
@@ -172,27 +172,29 @@ if(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd)
     set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} uhd_signal_source.h)
     set(OPT_LIBRARIES ${OPT_LIBRARIES} ${UHD_LIBRARIES} ${GNURADIO_UHD_LIBRARIES})
     set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${UHD_INCLUDE_DIRS})
-endif(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd)
+endif()
 
 
-set(SIGNAL_SOURCE_ADAPTER_SOURCES file_signal_source.cc
-                                  gen_signal_source.cc
-                                  nsr_file_signal_source.cc
-                                  spir_file_signal_source.cc
-                                  spir_gss6450_file_signal_source.cc
-                                  rtl_tcp_signal_source.cc
-                                  labsat_signal_source.cc
-                                  ${OPT_DRIVER_SOURCES}
+set(SIGNAL_SOURCE_ADAPTER_SOURCES
+    file_signal_source.cc
+    gen_signal_source.cc
+    nsr_file_signal_source.cc
+    spir_file_signal_source.cc
+    spir_gss6450_file_signal_source.cc
+    rtl_tcp_signal_source.cc
+    labsat_signal_source.cc
+    ${OPT_DRIVER_SOURCES}
 )
 
-set(SIGNAL_SOURCE_ADAPTER_HEADERS file_signal_source.h
-                                  gen_signal_source.h
-                                  nsr_file_signal_source.h
-                                  spir_file_signal_source.h
-                                  spir_gss6450_file_signal_source.h
-                                  rtl_tcp_signal_source.h
-                                  labsat_signal_source.h
-                                  ${OPT_DRIVER_HEADERS}
+set(SIGNAL_SOURCE_ADAPTER_HEADERS
+    file_signal_source.h
+    gen_signal_source.h
+    nsr_file_signal_source.h
+    spir_file_signal_source.h
+    spir_gss6450_file_signal_source.h
+    rtl_tcp_signal_source.h
+    labsat_signal_source.h
+    ${OPT_DRIVER_HEADERS}
 )
 
 
@@ -203,7 +205,7 @@ if(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.3)
     set(SIGNAL_SOURCE_ADAPTER_HEADERS ${SIGNAL_SOURCE_ADAPTER_HEADERS}
         two_bit_cpx_file_signal_source.h
         two_bit_packed_file_signal_source.h)
-endif(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.3)
+endif()
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
@@ -222,7 +224,7 @@ include_directories(
 
 if(ARCH_64BITS)
     add_definitions(-DARCH_64BITS=1)
-endif(ARCH_64BITS)
+endif()
 
 add_definitions(-DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}")
 
diff --git a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
index b673dd897..fb94ec51c 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
@@ -20,14 +20,14 @@
 if(ENABLE_RAW_UDP)
     find_package(PCAP)
     if(NOT PCAP_FOUND)
-        message(FATAL_ERROR "PCAP required to compile custom UDP packet sample source (ENABLE_RAW_UDP)")
-    endif(NOT PCAP_FOUND)
+        message(FATAL_ERROR "PCAP required to compile custom UDP packet sample source")
+    endif()
     get_filename_component(PCAP_LIBRARY_DIRS ${PCAP_LIBRARY} DIRECTORY CACHE)
     set(OPT_LIBRARIES ${OPT_LIBRARIES} ${PCAP_LIBRARIES})
     set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${PCAP_INCLUDE_DIRS})
     set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} gr_complex_ip_packet_source.cc)
     set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} gr_complex_ip_packet_source.h)
-endif(ENABLE_RAW_UDP)
+endif()
 
 
 set(SIGNAL_SOURCE_GR_BLOCKS_SOURCES
@@ -69,12 +69,18 @@ include_directories(
 list(SORT SIGNAL_SOURCE_GR_BLOCKS_HEADERS)
 list(SORT SIGNAL_SOURCE_GR_BLOCKS_SOURCES)
 
-add_library(signal_source_gr_blocks ${SIGNAL_SOURCE_GR_BLOCKS_SOURCES} ${SIGNAL_SOURCE_GR_BLOCKS_HEADERS})
+add_library(signal_source_gr_blocks
+    ${SIGNAL_SOURCE_GR_BLOCKS_SOURCES}
+    ${SIGNAL_SOURCE_GR_BLOCKS_HEADERS}
+)
+
 source_group(Headers FILES ${SIGNAL_SOURCE_GR_BLOCKS_HEADERS})
+
 target_link_libraries(signal_source_gr_blocks
     signal_source_lib
     ${GNURADIO_RUNTIME_LIBRARIES}
     ${Boost_LIBRARIES}
     ${OPT_LIBRARIES}
 )
+
 add_dependencies(signal_source_gr_blocks glog-${glog_RELEASE})
diff --git a/src/algorithms/signal_source/libs/CMakeLists.txt b/src/algorithms/signal_source/libs/CMakeLists.txt
index af65174c0..3f2a6bbe5 100644
--- a/src/algorithms/signal_source/libs/CMakeLists.txt
+++ b/src/algorithms/signal_source/libs/CMakeLists.txt
@@ -25,10 +25,10 @@ if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2)
             message(STATUS " * libad9361-iio from https://github.com/analogdevicesinc/libad9361-iio")
             message(STATUS " * gnuradio-iio from https://github.com/analogdevicesinc/gr-iio")
             message(FATAL_ERROR "gnuradio-iio is required for building gnss-sdr with this option enabled")
-        endif(NOT GRIIO_FOUND)
+        endif()
     set(OPT_LIBRARIES ${OPT_LIBRARIES} ${IIO_LIBRARIES})
     set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS})
-endif(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2)
+endif()
 
 if(ENABLE_FMCOMMS2 OR ENABLE_AD9361)
     find_package(LIBIIO REQUIRED)
@@ -39,7 +39,7 @@ if(ENABLE_FMCOMMS2 OR ENABLE_AD9361)
             message(STATUS " * libad9361-iio from https://github.com/analogdevicesinc/libad9361-iio")
             message(STATUS " * gnuradio-iio from https://github.com/analogdevicesinc/gr-iio")
             message(FATAL_ERROR "libiio is required for building gnss-sdr with this option enabled")
-        endif(NOT LIBIIO_FOUND)
+        endif()
     set(OPT_LIBRARIES ${OPT_LIBRARIES} ${LIBIIO_LIBRARIES})
     set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${LIBIIO_INCLUDE_DIRS})
 
@@ -49,13 +49,13 @@ if(ENABLE_FMCOMMS2 OR ENABLE_AD9361)
     if(LIBIIO_FOUND)
         set(OPT_SIGNAL_SOURCE_LIB_SOURCES ad9361_manager.cc)
         set(OPT_SIGNAL_SOURCE_LIB_HEADERS ad9361_manager.h)
-    endif(LIBIIO_FOUND)
-endif(ENABLE_FMCOMMS2 OR ENABLE_AD9361)
+    endif()
+endif()
 
 if(ENABLE_FPGA OR ENABLE_AD9361)
     set(OPT_SIGNAL_SOURCE_LIB_SOURCES ${OPT_SIGNAL_SOURCE_LIB_SOURCES} fpga_switch.cc)
     set(OPT_SIGNAL_SOURCE_LIB_HEADERS ${OPT_SIGNAL_SOURCE_LIB_HEADERS} fpga_switch.h)
-endif(ENABLE_FPGA OR ENABLE_AD9361)
+endif()
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt b/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt
index 92d258bfe..83fe5d36f 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt
@@ -67,6 +67,6 @@ target_link_libraries(telemetry_decoder_gr_blocks
     ${VOLK_GNSSSDR_LIBRARIES}
 )
 
-if(NOT VOLK_GNSSSDR_FOUND)
+if(NOT VOLKGNSSSDR_FOUND)
     add_dependencies(telemetry_decoder_gr_blocks volk_gnsssdr_module)
-endif(NOT VOLK_GNSSSDR_FOUND)
+endif()
diff --git a/src/algorithms/tracking/adapters/CMakeLists.txt b/src/algorithms/tracking/adapters/CMakeLists.txt
index db967b669..5150aa400 100644
--- a/src/algorithms/tracking/adapters/CMakeLists.txt
+++ b/src/algorithms/tracking/adapters/CMakeLists.txt
@@ -30,7 +30,7 @@ if(ENABLE_CUDA)
         ${OPT_TRACKING_INCLUDE_DIRS}
         ${CUDA_INCLUDE_DIRS}
     )
-endif(ENABLE_CUDA)
+endif()
 
 if(ENABLE_FPGA)
     set(OPT_TRACKING_ADAPTERS_SOURCES
@@ -41,7 +41,6 @@ if(ENABLE_FPGA)
         galileo_e5a_dll_pll_tracking_fpga.cc
         gps_l5_dll_pll_tracking_fpga.cc
     )
-
     set(OPT_TRACKING_ADAPTERS_HEADERS
         ${OPT_TRACKING_ADAPTERS_HEADERS}
         gps_l1_ca_dll_pll_tracking_fpga.h
@@ -50,7 +49,7 @@ if(ENABLE_FPGA)
         galileo_e5a_dll_pll_tracking_fpga.h
         gps_l5_dll_pll_tracking_fpga.h
     )
-endif(ENABLE_FPGA)
+endif()
 
 set(TRACKING_ADAPTER_SOURCES
     galileo_e1_dll_pll_veml_tracking.cc
diff --git a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
index fdc72cd34..2dd5b494f 100644
--- a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
@@ -33,7 +33,7 @@ if(ENABLE_CUDA)
         ${OPT_TRACKING_LIBRARIES}
         ${CUDA_LIBRARIES}
     )
-endif(ENABLE_CUDA)
+endif()
 
 if(ENABLE_FPGA)
     set(OPT_TRACKING_BLOCKS_SOURCES
@@ -44,7 +44,7 @@ if(ENABLE_FPGA)
         ${OPT_TRACKING_BLOCKS_HEADERS}
         dll_pll_veml_tracking_fpga.h
     )
-endif(ENABLE_FPGA)
+endif()
 
 set(TRACKING_GR_BLOCKS_SOURCES
     galileo_e1_tcp_connector_tracking_cc.cc
@@ -97,12 +97,15 @@ include_directories(
 
 if(ENABLE_GENERIC_ARCH)
     add_definitions(-DGENERIC_ARCH=1)
-endif(ENABLE_GENERIC_ARCH)
+endif()
 
 list(SORT TRACKING_GR_BLOCKS_HEADERS)
 list(SORT TRACKING_GR_BLOCKS_SOURCES)
 
-add_library(tracking_gr_blocks ${TRACKING_GR_BLOCKS_SOURCES} ${TRACKING_GR_BLOCKS_HEADERS})
+add_library(tracking_gr_blocks
+    ${TRACKING_GR_BLOCKS_SOURCES}
+    ${TRACKING_GR_BLOCKS_HEADERS}
+)
 
 source_group(Headers FILES ${TRACKING_GR_BLOCKS_HEADERS})
 
@@ -116,14 +119,18 @@ target_link_libraries(tracking_gr_blocks
     ${OPT_TRACKING_LIBRARIES}
 )
 
-if(NOT VOLK_GNSSSDR_FOUND)
+if(NOT VOLKGNSSSDR_FOUND)
     if(MATIO_FOUND)
         add_dependencies(tracking_gr_blocks volk_gnsssdr_module)
-    else(MATIO_FOUND)
-        add_dependencies(tracking_gr_blocks volk_gnsssdr_module matio-${GNSSSDR_MATIO_LOCAL_VERSION})
-    endif(MATIO_FOUND)
-else(NOT VOLK_GNSSSDR_FOUND)
+    else()
+        add_dependencies(tracking_gr_blocks volk_gnsssdr_module
+            matio-${GNSSSDR_MATIO_LOCAL_VERSION}
+        )
+    endif()
+else()
     if(NOT MATIO_FOUND)
-        add_dependencies(tracking_gr_blocks matio-${GNSSSDR_MATIO_LOCAL_VERSION})
-    endif(NOT MATIO_FOUND)
-endif(NOT VOLK_GNSSSDR_FOUND)
+        add_dependencies(tracking_gr_blocks
+            matio-${GNSSSDR_MATIO_LOCAL_VERSION}
+        )
+    endif()
+endif()
diff --git a/src/algorithms/tracking/libs/CMakeLists.txt b/src/algorithms/tracking/libs/CMakeLists.txt
index 7cce9e680..6991fbd55 100644
--- a/src/algorithms/tracking/libs/CMakeLists.txt
+++ b/src/algorithms/tracking/libs/CMakeLists.txt
@@ -27,7 +27,7 @@ if(ENABLE_CUDA)
     cuda_add_library(CUDA_CORRELATOR_LIB ${LIB_TYPE} cuda_multicorrelator.h cuda_multicorrelator.cu)
     set(OPT_TRACKING_LIBRARIES ${OPT_TRACKING_LIBRARIES} CUDA_CORRELATOR_LIB)
     set(OPT_TRACKING_INCLUDES ${OPT_TRACKING_INCLUDES} ${CUDA_INCLUDE_DIRS})
-endif(ENABLE_CUDA)
+endif()
 
 set(TRACKING_LIB_SOURCES
     cpu_multicorrelator.cc
@@ -64,7 +64,7 @@ set(TRACKING_LIB_HEADERS
 if(ENABLE_FPGA)
     set(TRACKING_LIB_SOURCES ${TRACKING_LIB_SOURCES} fpga_multicorrelator.cc dll_pll_conf_fpga.cc)
     set(TRACKING_LIB_HEADERS ${TRACKING_LIB_HEADERS} fpga_multicorrelator.h dll_pll_conf_fpga.h)
-endif(ENABLE_FPGA)
+endif()
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
@@ -82,11 +82,11 @@ include_directories(
 
 if(ENABLE_GENERIC_ARCH)
     add_definitions(-DGENERIC_ARCH=1)
-endif(ENABLE_GENERIC_ARCH)
+endif()
 
 if(SSE3_AVAILABLE)
     add_definitions(-DHAVE_SSE3=1)
-endif(SSE3_AVAILABLE)
+endif()
 
 list(SORT TRACKING_LIB_HEADERS)
 list(SORT TRACKING_LIB_SOURCES)
@@ -103,8 +103,8 @@ target_link_libraries(tracking_lib
     ${GNURADIO_RUNTIME_LIBRARIES}
 )
 
-if(VOLK_GNSSSDR_FOUND)
+if(VOLKGNSSSDR_FOUND)
     add_dependencies(tracking_lib glog-${glog_RELEASE})
-else(VOLK_GNSSSDR_FOUND)
+else()
     add_dependencies(tracking_lib glog-${glog_RELEASE} volk_gnsssdr_module)
 endif()
diff --git a/src/core/libs/CMakeLists.txt b/src/core/libs/CMakeLists.txt
index bbecef4d0..9557199c4 100644
--- a/src/core/libs/CMakeLists.txt
+++ b/src/core/libs/CMakeLists.txt
@@ -20,7 +20,7 @@ add_subdirectory(supl)
 
 if(OPENSSL_FOUND)
     add_definitions(-DUSE_OPENSSL_FALLBACK=1)
-endif(OPENSSL_FOUND)
+endif()
 
 set(CORE_LIBS_SOURCES
     ini.cc
@@ -57,4 +57,4 @@ target_link_libraries(rx_core_lib supl_library ${PUGIXML_LIBRARY})
 
 if(PUGIXML_LOCAL)
     add_dependencies(rx_core_lib pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION})
-endif(PUGIXML_LOCAL)
+endif()
diff --git a/src/core/libs/supl/CMakeLists.txt b/src/core/libs/supl/CMakeLists.txt
index 65a639e10..e8e1e69a6 100644
--- a/src/core/libs/supl/CMakeLists.txt
+++ b/src/core/libs/supl/CMakeLists.txt
@@ -27,7 +27,7 @@ set(SUPL_SOURCES
 
 if(OPENSSL_FOUND)
     add_definitions(-DUSE_OPENSSL_FALLBACK=1)
-endif(OPENSSL_FOUND)
+endif()
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
@@ -40,8 +40,8 @@ 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")
-    endif(CMAKE_BUILD_TYPE MATCHES "Release")
-endif(CMAKE_C_COMPILER_ID MATCHES "Clang")
+    endif()
+endif()
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_C_FLAGS}")
 
 add_library(supl_library STATIC ${ASN_RRLP_SOURCES} ${ASN_SUPL_SOURCES} ${SUPL_SOURCES})
diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt
index 89540b525..239e8cf00 100644
--- a/src/core/receiver/CMakeLists.txt
+++ b/src/core/receiver/CMakeLists.txt
@@ -34,6 +34,7 @@ set(GNSS_RECEIVER_HEADERS
     gnss_block_factory.h
     gnss_flowgraph.h
     in_memory_configuration.h
+    tcp_cmd_interface.h
     concurrent_map.h
     concurrent_queue.h
     control_message.h
@@ -41,78 +42,86 @@ set(GNSS_RECEIVER_HEADERS
 
 if(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.3)
     add_definitions(-DMODERN_GNURADIO=1)
-endif(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.3)
+endif()
 
 if(ENABLE_CUDA)
     add_definitions(-DCUDA_GPU_ACCEL=1)
-    set(OPT_RECEIVER_INCLUDE_DIRS ${OPT_RECEIVER_INCLUDE_DIRS} ${CUDA_INCLUDE_DIRS})
-endif(ENABLE_CUDA)
+    set(OPT_RECEIVER_INCLUDE_DIRS
+        ${OPT_RECEIVER_INCLUDE_DIRS} ${CUDA_INCLUDE_DIRS}
+    )
+endif()
 
 if(ENABLE_FPGA)
     add_definitions(-DENABLE_FPGA=1)
-endif(ENABLE_FPGA)
+endif()
 
 if(ENABLE_RAW_UDP)
     add_definitions(-DRAW_UDP=1)
-endif(ENABLE_RAW_UDP)
+endif()
 
 if(Boost_VERSION LESS 105000)
     add_definitions(-DOLD_BOOST=1)
-endif(Boost_VERSION LESS 105000)
+endif()
 
 if(OPENSSL_FOUND)
-    add_definitions( -DUSE_OPENSSL_FALLBACK=1 )
-endif(OPENSSL_FOUND)
+    add_definitions(-DUSE_OPENSSL_FALLBACK=1)
+endif()
 
 if(ENABLE_GN3S)
     add_definitions(-DGN3S_DRIVER=1)
-endif(ENABLE_GN3S)
+endif()
 
 if(ENABLE_ARRAY)
     add_definitions(-DRAW_ARRAY_DRIVER=1)
-endif(ENABLE_ARRAY)
+endif()
 
 if(ENABLE_FLEXIBAND)
     add_definitions(-DFLEXIBAND_DRIVER=1)
-endif(ENABLE_FLEXIBAND)
+endif()
 
 if(ENABLE_OSMOSDR)
     if(GROSMOSDR_FOUND)
         add_definitions(-DOSMOSDR_DRIVER=1)
-    endif(GROSMOSDR_FOUND)
-endif(ENABLE_OSMOSDR)
+    endif()
+endif()
 
 if(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd)
     add_definitions(-DUHD_DRIVER=1)
-endif(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd)
+endif()
 
 #Enable OpenCL if found in the system
 if(OPENCL_FOUND)
     message(STATUS "Adding processing blocks implemented using OpenCL")
     add_definitions(-DOPENCL_BLOCKS=1)
-else(OPENCL_FOUND)
+else()
     add_definitions(-DOPENCL_BLOCKS=0)
-endif(OPENCL_FOUND)
+endif()
 
 #enable SDR Hardware based on fmcomms2
 if(ENABLE_PLUTOSDR)
     add_definitions(-DPLUTOSDR_DRIVER=1)
-    set(OPT_RECEIVER_INCLUDE_DIRS ${OPT_RECEIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS})
-endif(ENABLE_PLUTOSDR)
+    set(OPT_RECEIVER_INCLUDE_DIRS
+        ${OPT_RECEIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS}
+    )
+endif()
 
 if(ENABLE_FMCOMMS2)
     add_definitions(-DFMCOMMS2_DRIVER=1)
-    set(OPT_RECEIVER_INCLUDE_DIRS ${OPT_RECEIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS})
-endif(ENABLE_FMCOMMS2)
+    set(OPT_RECEIVER_INCLUDE_DIRS
+        ${OPT_RECEIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS}
+    )
+endif()
 
 if(ENABLE_AD9361)
     add_definitions(-DAD9361_DRIVER=1)
-    set(OPT_RECEIVER_INCLUDE_DIRS ${OPT_RECEIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS})
-endif(ENABLE_AD9361)
+    set(OPT_RECEIVER_INCLUDE_DIRS
+        ${OPT_RECEIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS}
+    )
+endif()
 
 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")
+    add_definitions(-DGR_GREATER_38=1)
+endif()
 
 
 include_directories(
@@ -184,7 +193,8 @@ add_library(gnss_rx
     ${GNSS_RECEIVER_INTERFACE_HEADERS}
 )
 
-source_group(Headers FILES ${GNSS_RECEIVER_HEADERS} ${GNSS_RECEIVER_INTERFACE_HEADERS})
+source_group(Headers FILES ${GNSS_RECEIVER_HEADERS}
+    ${GNSS_RECEIVER_INTERFACE_HEADERS})
 
 target_link_libraries(gnss_rx
     ${Boost_LIBRARIES}
diff --git a/src/core/system_parameters/CMakeLists.txt b/src/core/system_parameters/CMakeLists.txt
index 4593d8e1f..39f3231fb 100644
--- a/src/core/system_parameters/CMakeLists.txt
+++ b/src/core/system_parameters/CMakeLists.txt
@@ -99,8 +99,6 @@ include_directories(
     ${GFlags_INCLUDE_DIRS}
 )
 
-link_directories(${Boost_LIBRARY_DIR})
-
 list(SORT SYSTEM_PARAMETERS_HEADERS)
 list(SORT SYSTEM_PARAMETERS_SOURCES)
 
diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index 94a6344e6..85b250e91 100644
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -23,28 +23,28 @@ if(ENABLE_GPERFTOOLS)
     if(GPERFTOOLS_FOUND)
         set(GNSS_SDR_OPTIONAL_LIBS "${GNSS_SDR_OPTIONAL_LIBS};${GPERFTOOLS_PROFILER};${GPERFTOOLS_TCMALLOC}")
         set(GNSS_SDR_OPTIONAL_HEADERS "${GNSS_SDR_OPTIONAL_HEADERS};${GPERFTOOLS_INCLUDE_DIR}")
-    endif(GPERFTOOLS_FOUND)
-endif(ENABLE_GPERFTOOLS)
+    endif()
+endif()
 
 if(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd)
     set(GNSS_SDR_OPTIONAL_LIBS ${GNSS_SDR_OPTIONAL_LIBS} ${UHD_LIBRARIES} ${GNURADIO_UHD_LIBRARIES})
     set(GNSS_SDR_OPTIONAL_HEADERS ${GNSS_SDR_OPTIONAL_HEADERS} ${UHD_INCLUDE_DIRS})
-endif(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd)
+endif()
 
 if(OPENSSL_FOUND)
     add_definitions(-DUSE_OPENSSL_FALLBACK=1)
-endif(OPENSSL_FOUND)
+endif()
 
 if(ENABLE_CUDA)
     add_definitions(-DCUDA_GPU_ACCEL=1)
     set(GNSS_SDR_OPTIONAL_LIBS ${GNSS_SDR_OPTIONAL_LIBS} ${CUDA_LIBRARIES})
     set(GNSS_SDR_OPTIONAL_HEADERS ${GNSS_SDR_OPTIONAL_HEADERS} ${CUDA_INCLUDE_DIRS})
-endif(ENABLE_CUDA)
+endif()
 
 if(ORC_FOUND)
     set(GNSS_SDR_OPTIONAL_LIBS ${GNSS_SDR_OPTIONAL_LIBS} ${ORC_LIBRARIES})
     set(GNSS_SDR_OPTIONAL_HEADERS ${GNSS_SDR_OPTIONAL_HEADERS} ${ORC_INCLUDE_DIRS})
-endif(ORC_FOUND)
+endif()
 
 include_directories(
     ${CMAKE_SOURCE_DIR}/src/core/system_parameters
@@ -72,8 +72,8 @@ add_definitions(-DGNSS_SDR_VERSION="${VERSION}")
 if(OS_IS_MACOSX)
     if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         set(MAC_LIBRARIES "-framework Accelerate -lc++")
-    endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-endif(OS_IS_MACOSX)
+    endif()
+endif()
 
 add_executable(gnss-sdr ${CMAKE_CURRENT_SOURCE_DIR}/main.cc)
 
@@ -110,10 +110,10 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/conf DESTINATION share/gnss-sdr
 install(FILES ${CMAKE_SOURCE_DIR}/conf/gnss-sdr.conf DESTINATION share/gnss-sdr/conf
     RENAME default.conf)
 
-if(NOT VOLK_GNSSSDR_FOUND)
+if(NOT VOLKGNSSSDR_FOUND)
     install(PROGRAMS ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build/apps/volk_gnsssdr_profile DESTINATION bin COMPONENT "volk_gnsssdr")
     install(PROGRAMS ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build/apps/volk_gnsssdr-config-info DESTINATION bin COMPONENT "volk_gnsssdr")
-endif(NOT VOLK_GNSSSDR_FOUND)
+endif()
 
 find_program(GZIP
     gzip
@@ -135,12 +135,12 @@ if(NOT GZIP_NOTFOUND)
 
     install(FILES ${CMAKE_BINARY_DIR}/changelog.gz DESTINATION share/doc/gnss-sdr)
 
-    if(NOT VOLK_GNSSSDR_FOUND)
+    if(NOT VOLKGNSSSDR_FOUND)
         execute_process(COMMAND gzip -9 -c ${CMAKE_SOURCE_DIR}/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Packaging/volk_gnsssdr_profile-manpage
             WORKING_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_FILE "${CMAKE_BINARY_DIR}/volk_gnsssdr_profile.1.gz")
         execute_process(COMMAND gzip -9 -c ${CMAKE_SOURCE_DIR}/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Packaging/volk_gnsssdr-config-info-manpage
             WORKING_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_FILE "${CMAKE_BINARY_DIR}/volk_gnsssdr-config-info.1.gz")
         install(FILES ${CMAKE_BINARY_DIR}/volk_gnsssdr_profile.1.gz DESTINATION share/man/man1)
         install(FILES ${CMAKE_BINARY_DIR}/volk_gnsssdr-config-info.1.gz DESTINATION share/man/man1)
-    endif(NOT VOLK_GNSSSDR_FOUND)
-endif(NOT GZIP_NOTFOUND)
+    endif()
+endif()
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 0d8dec6f8..de39387b7 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -25,26 +25,26 @@ add_subdirectory(system-tests/libs)
 ################################################################################
 if(EXISTS $ENV{GTEST_DIR})
     set(GTEST_DIR_LOCAL $ENV{GTEST_DIR})
-endif(EXISTS $ENV{GTEST_DIR})
+endif()
 if(GTEST_DIR)
     set(GTEST_DIR_LOCAL ${GTEST_DIR})
-endif(GTEST_DIR)
+endif()
 if(NOT GTEST_DIR_LOCAL)
     set(GTEST_DIR_LOCAL false)
 else()
     set(GTEST_DIR_LOCAL true)
-endif(NOT GTEST_DIR_LOCAL)
+endif()
 
 if(GTEST_INCLUDE_DIRS)
     set(GTEST_DIR_LOCAL true)
-endif(GTEST_INCLUDE_DIRS)
+endif()
 
 set(GTEST_COMPILER -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER})
 set(TOOLCHAIN_ARG "")
 if(EXISTS $ENV{OECORE_TARGET_SYSROOT})
     set(GTEST_COMPILER "")
     set(TOOLCHAIN_ARG "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/Toolchains/oe-sdk_cross.cmake")
-endif(EXISTS $ENV{OECORE_TARGET_SYSROOT})
+endif()
 
 if(NOT ${GTEST_DIR_LOCAL})
     # if GTEST_DIR is not defined, we download and build it
@@ -60,7 +60,7 @@ if(NOT ${GTEST_DIR_LOCAL})
         PATCH_COMMAND ""
         INSTALL_COMMAND ""
       )
-    else(CMAKE_VERSION VERSION_LESS 3.2)
+    else()
       ExternalProject_Add(
         gtest-${GNSSSDR_GTEST_LOCAL_VERSION}
         GIT_REPOSITORY https://github.com/google/googletest
@@ -74,7 +74,7 @@ if(NOT ${GTEST_DIR_LOCAL})
             ${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()
 
     # Set up variables
     # Set recently downloaded and build Googletest root folder
@@ -87,30 +87,31 @@ if(NOT ${GTEST_DIR_LOCAL})
     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(FINAL_D "d")
+            set(ADD_DEBUG "Debug/")
+        endif()
+    endif()
+    set(GTEST_LIBRARY_PATH "${binary_dir}/googletest/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX};${binary_dir}/googletest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${FINAL_D}${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}
+        ${binary_dir}/googletest/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX}
+        ${binary_dir}/googletest/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${FINAL_D}${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})
+else()
     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)
+    else()
         # 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)
+    endif()
     target_link_libraries(gtest ${THREAD_LIBRARIES})
-endif(NOT ${GTEST_DIR_LOCAL})
+endif()
 
 
 
@@ -123,58 +124,57 @@ set(GNSS_SDR_TEST_OPTIONAL_HEADERS "")
 if(ENABLE_CUDA)
     set(GNSS_SDR_TEST_OPTIONAL_HEADERS ${GNSS_SDR_TEST_OPTIONAL_HEADERS} ${CUDA_INCLUDE_DIRS})
     set(GNSS_SDR_TEST_OPTIONAL_LIBS ${GNSS_SDR_TEST_OPTIONAL_LIBS} ${CUDA_LIBRARIES})
-endif(ENABLE_CUDA)
-
+endif()
 
 if(ENABLE_GPERFTOOLS)
     if(GPERFTOOLS_FOUND)
         set(GNSS_SDR_TEST_OPTIONAL_LIBS "${GNSS_SDR_TEST_OPTIONAL_LIBS};${GPERFTOOLS_LIBRARIES}")
         set(GNSS_SDR_TEST_OPTIONAL_HEADERS "${GNSS_SDR_TEST_OPTIONAL_HEADERS};${GPERFTOOLS_INCLUDE_DIR}")
-    endif(GPERFTOOLS_FOUND)
-endif(ENABLE_GPERFTOOLS)
+    endif()
+endif()
 
 if(Boost_VERSION LESS 105000)
     add_definitions(-DOLD_BOOST=1)
-endif(Boost_VERSION LESS 105000)
+endif()
 
 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")
+    add_definitions(-DGR_GREATER_38=1)
+endif()
+
+if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.15")
+    add_definitions(-DGR_GREATER_38=1)
+endif()
 
 if(OPENSSL_FOUND)
     add_definitions(-DUSE_OPENSSL_FALLBACK=1)
-endif(OPENSSL_FOUND)
+endif()
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     if(OS_IS_MACOSX)
         set(CLANG_FLAGS "-stdlib=libc++ -lc++")
-    endif(OS_IS_MACOSX)
-endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    endif()
+endif()
 
 if(OPENCL_FOUND)
     add_definitions(-DOPENCL_BLOCKS_TEST=1)
-endif(OPENCL_FOUND)
+endif()
 
 if(ENABLE_CUDA)
     add_definitions(-DCUDA_BLOCKS_TEST=1)
-endif(ENABLE_CUDA)
+endif()
 
 if(ENABLE_FPGA)
     add_definitions(-DFPGA_BLOCKS_TEST=1)
-endif(ENABLE_FPGA)
+endif()
 
 find_package(Gnuplot)
 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")
+endif()
 
 if(ENABLE_UNIT_TESTING_MINIMAL)
     add_definitions(-DUNIT_TESTING_MINIMAL=1)
-endif(ENABLE_UNIT_TESTING_MINIMAL)
+endif()
 
 
 ################################################################################
@@ -186,42 +186,42 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR 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)
+      endif()
+    else()
       set(CROSS_INSTALL_DIR "")
-    endif(ENABLE_FPGA)
+    endif()
     find_package(GNSSSIMULATOR QUIET)
     if(GNSSSIMULATOR_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(GNSSSIMULATOR_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 ""
-      )
-      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")
-      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")
-      endif(ENABLE_INSTALL_TESTS)
-    endif(GNSSSIMULATOR_FOUND OR NOT ENABLE_GNSS_SIM_INSTALL)
+    else()
+        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 ""
+        )
+        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")
+        else()
+            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()
+    endif()
 
     ################################################################################
     # Local installation of GPSTk http://www.gpstk.org/
@@ -229,10 +229,10 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA)
     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 "")
+      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 "")
+      endif()
       include(GNUInstallDirs)
       string(REGEX REPLACE /[^/]*$ "" LIBDIR ${CMAKE_INSTALL_LIBDIR})
       if(CMAKE_VERSION VERSION_LESS 3.2)
@@ -246,7 +246,7 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA)
             UPDATE_COMMAND ""
             PATCH_COMMAND ""
           )
-      else(CMAKE_VERSION VERSION_LESS 3.2)
+      else()
           ExternalProject_Add(
             gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}
             GIT_REPOSITORY https://github.com/SGL-UT/GPSTk
@@ -258,24 +258,24 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA)
             UPDATE_COMMAND ""
             PATCH_COMMAND ""
           )
-      endif(CMAKE_VERSION VERSION_LESS 3.2)
+      endif()
       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/${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)
+    else()
       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)
+    endif()
+endif()
 
 
-if (ENABLE_UNIT_TESTING_EXTRA)
+if(ENABLE_UNIT_TESTING_EXTRA)
     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)
+endif()
 
 if(ENABLE_UNIT_TESTING_EXTRA)
     add_definitions(-DEXTRA_TESTS)
@@ -284,18 +284,18 @@ if(ENABLE_UNIT_TESTING_EXTRA)
       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)
+    endif()
     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)
+    endif()
     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)
-    endif(ENABLE_INSTALL_TESTS)
-endif(ENABLE_UNIT_TESTING_EXTRA)
+    endif()
+endif()
 
 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)
@@ -305,7 +305,7 @@ if(ENABLE_INSTALL_TESTS)
     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)
+else()
     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)
@@ -313,7 +313,7 @@ else(ENABLE_INSTALL_TESTS)
     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)
+endif()
 
 set(LIST_INCLUDE_DIRS
     ${GTEST_INCLUDE_DIRECTORIES}
@@ -400,44 +400,46 @@ if(ENABLE_UNIT_TESTING)
     )
     if(NOT ${GTEST_DIR_LOCAL})
         add_dependencies(run_tests gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
-    endif(NOT ${GTEST_DIR_LOCAL})
+    endif()
 
     if(ENABLE_INSTALL_TESTS)
         if(EXISTS ${CMAKE_SOURCE_DIR}/install/run_tests)
             file(REMOVE ${CMAKE_SOURCE_DIR}/install/run_tests)
-        endif(EXISTS ${CMAKE_SOURCE_DIR}/install/run_tests)
+        endif()
         install(TARGETS run_tests RUNTIME DESTINATION bin COMPONENT "run_tests")
-    else(ENABLE_INSTALL_TESTS)
+    else()
         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>)
-    endif(ENABLE_INSTALL_TESTS)
-endif(ENABLE_UNIT_TESTING)
+    endif()
+endif()
 
 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")
-endif(ENABLE_FPGA)
+        RUNTIME DESTINATION bin
+        COMPONENT "fpga-test"
+    )
+endif()
 
 
 
@@ -451,14 +453,14 @@ function(add_system_test executable)
     # Ensure that executable is rebuilt if it was previously built and then removed
     if(NOT EXISTS ${CMAKE_SOURCE_DIR}/install/${executable})
         execute_process(COMMAND ${CMAKE_COMMAND} -E touch ${SYSTEM_TEST_SOURCES})
-    endif(NOT EXISTS ${CMAKE_SOURCE_DIR}/install/${executable})
+    endif()
     add_executable(${executable} ${SYSTEM_TEST_SOURCES})
 
     if(NOT ${GTEST_DIR_LOCAL})
         add_dependencies(${executable} gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
-    else(NOT ${GTEST_DIR_LOCAL})
+    else()
         add_dependencies(${executable} gtest)
-    endif(NOT ${GTEST_DIR_LOCAL})
+    endif()
 
     include_directories(${OPT_INCLUDES_})
     target_link_libraries(${executable} ${OPT_LIBS_})
@@ -466,14 +468,14 @@ function(add_system_test executable)
     if(ENABLE_INSTALL_TESTS)
         if(EXISTS ${CMAKE_SOURCE_DIR}/install/${executable})
             file(REMOVE ${CMAKE_SOURCE_DIR}/install/${executable})
-        endif(EXISTS ${CMAKE_SOURCE_DIR}/install/${executable})
+        endif()
         install(TARGETS ${executable} RUNTIME DESTINATION bin COMPONENT "${executable}_test")
-    else(ENABLE_INSTALL_TESTS)
+    else()
         add_custom_command(TARGET ${executable} POST_BUILD
             COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${executable}>
             ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:${executable}>)
-    endif(ENABLE_INSTALL_TESTS)
-endfunction(add_system_test)
+    endif()
+endfunction()
 
 
 if(ENABLE_SYSTEM_TESTING)
@@ -482,10 +484,10 @@ if(ENABLE_SYSTEM_TESTING)
         set(HOST_SYSTEM "GNU/Linux ${LINUX_DISTRIBUTION} ${LINUX_VER} ${ARCH_}")
         string(REPLACE "\n" "" HOST_SYSTEM "${HOST_SYSTEM}")
         string(REPLACE "\"" "" HOST_SYSTEM "${HOST_SYSTEM}")
-    endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    endif()
     if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
         set(HOST_SYSTEM "MacOS")
-    endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    endif()
     add_definitions(-DHOST_SYSTEM="${HOST_SYSTEM}")
 
     #### TTFF
@@ -505,32 +507,22 @@ if(ENABLE_SYSTEM_TESTING)
                       ${GNURADIO_ANALOG_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES}
                       gnss_sp_libs gnss_rx gnss_system_parameters
                       system_testing_lib)
-
         add_system_test(position_test)
-
-        #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_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)
-        #endif(GPSTK_FOUND OR OWN_GPSTK)
-    else(ENABLE_SYSTEM_TESTING_EXTRA)
+    else()
         # 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)
-        endif(EXISTS ${CMAKE_SOURCE_DIR}/install/position_test)
-    endif(ENABLE_SYSTEM_TESTING_EXTRA)
-else(ENABLE_SYSTEM_TESTING)
+        endif()
+    endif()
+else()
     # 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)
-    endif(EXISTS ${CMAKE_SOURCE_DIR}/install/ttff)
+    endif()
     if(EXISTS ${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)
+    endif()
+endif()
 
 
 #########################################################
@@ -550,13 +542,15 @@ target_link_libraries(flowgraph_test ${Boost_LIBRARIES}
     gnss_sp_libs
     gnss_rx
     gnss_system_parameters
-    ${VOLK_GNSSSDR_LIBRARIES})
+    ${VOLK_GNSSSDR_LIBRARIES}
+)
+
 add_test(flowgraph_test flowgraph_test)
 if(NOT ${GTEST_DIR_LOCAL})
     add_dependencies(flowgraph_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
-else(NOT ${GTEST_DIR_LOCAL})
+else()
     add_dependencies(flowgraph_test gtest)
-endif(NOT ${GTEST_DIR_LOCAL})
+endif()
 set_property(TEST flowgraph_test PROPERTY TIMEOUT 30)
 
 #########################################################
@@ -569,7 +563,8 @@ add_executable(gnss_block_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.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/control-plane/gnss_block_factory_test.cc
+)
 target_link_libraries(gnss_block_test ${Boost_LIBRARIES}
     ${GFlags_LIBS}
     ${GLOG_LIBRARIES}
@@ -581,19 +576,21 @@ target_link_libraries(gnss_block_test ${Boost_LIBRARIES}
     gnss_sp_libs
     gnss_rx
     gnss_system_parameters
-    ${VOLK_GNSSSDR_LIBRARIES})
+    ${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})
-else(NOT ${GTEST_DIR_LOCAL})
+else()
     add_dependencies(gnss_block_test gtest)
-endif(NOT ${GTEST_DIR_LOCAL})
+endif()
 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}
@@ -605,40 +602,42 @@ target_link_libraries(gnuradio_block_test ${Boost_LIBRARIES}
     gnss_sp_libs
     gnss_rx
     gnss_system_parameters
-    ${VOLK_GNSSSDR_LIBRARIES})
+    ${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})
-else(NOT ${GTEST_DIR_LOCAL})
+else()
     add_dependencies(gnuradio_block_test gtest)
-endif(NOT ${GTEST_DIR_LOCAL})
+endif()
 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)
+    gnss_system_parameters
+)
 add_test(matio_test matio_test)
 if(NOT ${GTEST_DIR_LOCAL})
     if(MATIO_FOUND)
         add_dependencies(matio_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
-    else(MATIO_FOUND)
+    else()
         add_dependencies(matio_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION} matio-${GNSSSDR_MATIO_LOCAL_VERSION})
-    endif(MATIO_FOUND)
-else(NOT ${GTEST_DIR_LOCAL})
+    endif()
+else()
     if(MATIO_FOUND)
         add_dependencies(matio_test gtest)
-    else(MATIO_FOUND)
+    else()
         add_dependencies(matio_test gtest matio-${GNSSSDR_MATIO_LOCAL_VERSION})
-    endif(MATIO_FOUND)
-endif(NOT ${GTEST_DIR_LOCAL})
+    endif()
+endif()
 set_property(TEST matio_test PROPERTY TIMEOUT 30)
 
 #########################################################
@@ -663,9 +662,9 @@ target_link_libraries(acq_test ${Boost_LIBRARIES}
 add_test(acq_test acq_test)
 if(NOT ${GTEST_DIR_LOCAL})
     add_dependencies(acq_test acq_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
-else(NOT ${GTEST_DIR_LOCAL})
+else()
     add_dependencies(acq_test acq_test gtest)
-endif(NOT ${GTEST_DIR_LOCAL})
+endif()
 set_property(TEST acq_test PROPERTY TIMEOUT 30)
 
 #########################################################
@@ -674,7 +673,8 @@ 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/bayesian_estimation_test.cc
+)
 
 target_link_libraries(trk_test ${Boost_LIBRARIES}
     ${GFlags_LIBS}
@@ -688,13 +688,14 @@ target_link_libraries(trk_test ${Boost_LIBRARIES}
     gnss_rx
     gnss_system_parameters
     signal_generator_blocks
-    ${VOLK_GNSSSDR_LIBRARIES})
+    ${VOLK_GNSSSDR_LIBRARIES}
+)
 add_test(trk_test trk_test)
 if(NOT ${GTEST_DIR_LOCAL})
     add_dependencies(trk_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
-else(NOT ${GTEST_DIR_LOCAL})
+else()
     add_dependencies(trk_test gtest)
-endif(NOT ${GTEST_DIR_LOCAL})
+endif()
 set_property(TEST trk_test PROPERTY TIMEOUT 30)
 
 
@@ -703,29 +704,31 @@ 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_thread_test.cc
+    )
 
     target_link_libraries(control_thread_test ${Boost_LIBRARIES}
         ${GFlags_LIBS}
         ${GLOG_LIBRARIES}
         ${GTEST_LIBRARIES}
-        gnss_rx)
+        gnss_rx
+    )
 
     add_test(control_thread_test control_thread_test)
     if(NOT ${GTEST_DIR_LOCAL})
         add_dependencies(control_thread_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
-    else(NOT ${GTEST_DIR_LOCAL})
+    else()
         add_dependencies(control_thread_test gtest)
-    endif(NOT ${GTEST_DIR_LOCAL})
+    endif()
     set_property(TEST control_thread_test PROPERTY TIMEOUT 30)
-endif(NOT ENABLE_PACKAGING)
+endif()
 
 #########################################################
 
 if(ENABLE_PACKAGING)
     add_dependencies(check flowgraph_test gnss_block_test
         gnuradio_block_test acq_test trk_test matio_test)
-else(ENABLE_PACKAGING)
+else()
     add_dependencies(check control_thread_test flowgraph_test gnss_block_test
         gnuradio_block_test acq_test trk_test matio_test)
-endif(ENABLE_PACKAGING)
+endif()
diff --git a/src/tests/system-tests/libs/CMakeLists.txt b/src/tests/system-tests/libs/CMakeLists.txt
index 89b6970c3..178f83479 100644
--- a/src/tests/system-tests/libs/CMakeLists.txt
+++ b/src/tests/system-tests/libs/CMakeLists.txt
@@ -23,22 +23,29 @@ set(SYSTEM_TESTING_LIB_SOURCES
 )
 
 include_directories(
-     ${CMAKE_CURRENT_SOURCE_DIR}
-     ${Boost_INCLUDE_DIRS}
-     ${GLOG_INCLUDE_DIRS}
-     ${GFlags_INCLUDE_DIRS}
-     ${MATIO_INCLUDE_DIRS}
-     ${ARMADILLO_INCLUDE_DIRS}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${Boost_INCLUDE_DIRS}
+    ${GLOG_INCLUDE_DIRS}
+    ${GFlags_INCLUDE_DIRS}
+    ${MATIO_INCLUDE_DIRS}
+    ${ARMADILLO_INCLUDE_DIRS}
 )
 
-
 file(GLOB SYSTEM_TESTING_LIB_HEADERS "*.h")
 list(SORT SYSTEM_TESTING_LIB_HEADERS)
-add_library(system_testing_lib ${SYSTEM_TESTING_LIB_SOURCES} ${SYSTEM_TESTING_LIB_HEADERS})
+
+add_library(system_testing_lib
+    ${SYSTEM_TESTING_LIB_SOURCES}
+    ${SYSTEM_TESTING_LIB_HEADERS}
+)
+
 source_group(Headers FILES ${SYSTEM_TESTING_LIB_HEADERS})
 
 if(NOT MATIO_FOUND)
-   add_dependencies(system_testing_lib armadillo-${armadillo_RELEASE} matio-${GNSSSDR_MATIO_LOCAL_VERSION})
-else(NOT MATIO_FOUND)
-   add_dependencies(system_testing_lib armadillo-${armadillo_RELEASE})
-endif(NOT MATIO_FOUND)
\ No newline at end of file
+    add_dependencies(system_testing_lib
+        armadillo-${armadillo_RELEASE}
+        matio-${GNSSSDR_MATIO_LOCAL_VERSION}
+    )
+else()
+    add_dependencies(system_testing_lib armadillo-${armadillo_RELEASE})
+endif()
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt b/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt
index 7d15075f2..d0bd655d7 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt
@@ -21,29 +21,36 @@ set(SIGNAL_PROCESSING_TESTING_LIB_SOURCES
     acquisition_dump_reader.cc
     acquisition_msg_rx.cc
     tracking_dump_reader.cc
-    tlm_dump_reader.cc  
-    observables_dump_reader.cc    
+    tlm_dump_reader.cc
+    observables_dump_reader.cc
     tracking_true_obs_reader.cc
     true_observables_reader.cc
 )
 
 include_directories(
-     ${CMAKE_CURRENT_SOURCE_DIR}
-     ${Boost_INCLUDE_DIRS}
-     ${GLOG_INCLUDE_DIRS}
-     ${GFlags_INCLUDE_DIRS}
-     ${MATIO_INCLUDE_DIRS}
-     ${GNURADIO_RUNTIME_INCLUDE_DIRS}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${Boost_INCLUDE_DIRS}
+    ${GLOG_INCLUDE_DIRS}
+    ${GFlags_INCLUDE_DIRS}
+    ${MATIO_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
 )
 
 
 file(GLOB SIGNAL_PROCESSING_TESTING_LIB_HEADERS "*.h")
 list(SORT SIGNAL_PROCESSING_TESTING_LIB_HEADERS)
-add_library(signal_processing_testing_lib ${SIGNAL_PROCESSING_TESTING_LIB_SOURCES} ${SIGNAL_PROCESSING_TESTING_LIB_HEADERS})
+
+add_library(signal_processing_testing_lib
+    ${SIGNAL_PROCESSING_TESTING_LIB_SOURCES}
+    ${SIGNAL_PROCESSING_TESTING_LIB_HEADERS}
+)
+
 source_group(Headers FILES ${SIGNAL_PROCESSING_TESTING_LIB_HEADERS})
 
 if(NOT MATIO_FOUND)
-   add_dependencies(signal_processing_testing_lib matio-${GNSSSDR_MATIO_LOCAL_VERSION} glog-${glog_RELEASE})
-else(NOT MATIO_FOUND)
-   add_dependencies(signal_processing_testing_lib glog-${glog_RELEASE})
-endif(NOT MATIO_FOUND)
+    add_dependencies(signal_processing_testing_lib
+        matio-${GNSSSDR_MATIO_LOCAL_VERSION} glog-${glog_RELEASE}
+    )
+else()
+    add_dependencies(signal_processing_testing_lib glog-${glog_RELEASE})
+endif()
diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt
index bd1a31852..c68294b45 100644
--- a/src/utils/CMakeLists.txt
+++ b/src/utils/CMakeLists.txt
@@ -20,4 +20,4 @@ add_subdirectory(front-end-cal)
 
 if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA)
     add_subdirectory(rinex2assist)
-endif(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA)
+endif()
diff --git a/src/utils/front-end-cal/CMakeLists.txt b/src/utils/front-end-cal/CMakeLists.txt
index 817676b30..16dfa40be 100644
--- a/src/utils/front-end-cal/CMakeLists.txt
+++ b/src/utils/front-end-cal/CMakeLists.txt
@@ -19,7 +19,7 @@
 
 if(OPENSSL_FOUND)
     add_definitions(-DUSE_OPENSSL_FALLBACK=1)
-endif(OPENSSL_FOUND)
+endif()
 
 set(FRONT_END_CAL_SOURCES front_end_cal.cc)
 set(FRONT_END_CAL_HEADERS front_end_cal.h)
@@ -112,6 +112,5 @@ find_program(GZIP gzip
 if(NOT GZIP_NOTFOUND)
     execute_process(COMMAND gzip -9 -c ${CMAKE_SOURCE_DIR}/docs/manpage/front-end-cal-manpage
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_FILE "${CMAKE_BINARY_DIR}/front-end-cal.1.gz")
-
     install(FILES ${CMAKE_BINARY_DIR}/front-end-cal.1.gz DESTINATION share/man/man1)
-endif(NOT GZIP_NOTFOUND)
+endif()
diff --git a/src/utils/rinex2assist/CMakeLists.txt b/src/utils/rinex2assist/CMakeLists.txt
index 0461d6185..f99b52421 100644
--- a/src/utils/rinex2assist/CMakeLists.txt
+++ b/src/utils/rinex2assist/CMakeLists.txt
@@ -22,7 +22,7 @@ if(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK)
     string(REGEX REPLACE /[^/]*$ "" LIBDIR ${CMAKE_INSTALL_LIBDIR})
     set(GPSTK_LIBRARY ${CMAKE_CURRENT_SOURCE_DIR}/../../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/${LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}gpstk${CMAKE_SHARED_LIBRARY_SUFFIX})
     set(GPSTK_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/include)
-endif(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK)
+endif()
 
 set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} ${GPSTK_INCLUDE_DIR}/gpstk)
 
@@ -48,11 +48,11 @@ target_link_libraries(rinex2assist
 
 if(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK)
     add_dependencies(rinex2assist gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION})
-endif(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK)
+endif()
 
 add_custom_command(TARGET rinex2assist POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:rinex2assist>
-    ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:rinex2assist>
+        ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:rinex2assist>
 )
 
 install(TARGETS rinex2assist