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

CMakeLists.txt

@@ -822,9 +822,9 @@ ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/c
      # Ensure that aclocal and libtool are present
      if(OS_IS_LINUX)
          if(EXISTS "/usr/bin/libtoolize")
-             if(EXISTS "/usr/bin/aclocal-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.11"  OR EXISTS "/usr/bin/aclocal-1.10")
+             if(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-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.11"  OR EXISTS "/usr/bin/aclocal-1.10")
+             else(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")
@@ -835,7 +835,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/c
                       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-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.11"  OR EXISTS "/usr/bin/aclocal-1.10")
+             endif(EXISTS "/usr/bin/aclocal-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.13" OR EXISTS "/usr/bin/aclocal-1.11"  OR EXISTS "/usr/bin/aclocal-1.10")
          else(EXISTS "/usr/bin/libtoolize")
              message(" libtool has not been found.")
              message(" You can try to install it by typing:")
@@ -1098,6 +1098,32 @@ if(NOT MATIO_FOUND)
     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(NOT 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(NOT EXISTS "/usr/bin/aclocal-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.13" OR EXISTS "/usr/bin/aclocal-1.11"  OR EXISTS "/usr/bin/aclocal-1.10")
+        endif(OS_IS_LINUX)      
         find_package(HDF5)
         if(HDF5_FOUND)
             list(GET HDF5_LIBRARIES 0 HDF5_FIRST_DIR)

README.md

@@ -31,8 +31,7 @@ This section describes how to set up the compilation environment in GNU/Linux or
 GNU/Linux
 ----------
 
- * Tested distributions: Ubuntu 14.04 LTS and [above](http://packages.ubuntu.com/search?keywords=gnss-sdr), Debian 8.0 "jessie" and [above](https://packages.debian.org/search?searchon=names&keywords=gnss-sdr), Linaro 15.03
+ * Tested distributions: Ubuntu 16.04 LTS and above; Debian 8.0 "jessie" and above; Fedora 26 and above; CentOS 7; Arch Linux.
- * Known to work but not continually tested: Arch Linux, Fedora, and openSUSE
  * Supported microprocessor architectures:
    * i386: Intel x86 instruction set (32-bit microprocessors).
    * amd64: also known as x86-64, the 64-bit version of the x86 instruction set, originally created by AMD and implemented by AMD, Intel, VIA and others.
@@ -53,7 +52,11 @@ Before building GNSS-SDR, you need to install all the required dependencies. The
 
 ### Alternative 1: Install dependencies using software packages
 
-If you want to start building and running GNSS-SDR as quick and easy as possible, the best option is to install all the required dependencies as binary packages. If you are using Debian 8, Ubuntu 14.10 or above, this can be done by copying and pasting the following line in a terminal:
+If you want to start building and running GNSS-SDR as quick and easy as possible, the best option is to install all the required dependencies as binary packages. 
+
+#### Debian / Ubuntu
+
+If you are using Debian 8, Ubuntu 14.10 or above, this can be done by copying and pasting the following line in a terminal:
 
 ~~~~~~
 $ sudo apt-get install build-essential cmake git libboost-dev libboost-date-time-dev \
@@ -84,6 +87,32 @@ Once you have installed these packages, you can jump directly to [how to downloa
 Note for Ubuntu 14.04 LTS "trusty" users: you will need to build from source and install GNU Radio manually, as explained below, since GNSS-SDR requires gnuradio-dev >= 3.7.3, and Ubuntu 14.04 came with 3.7.2. Install all the packages above BUT EXCEPT ```libuhd-dev```, ```gnuradio-dev``` and ```gr-osmosdr``` (and remove them if they are already installed in your machine), and install those dependencies using PyBOMBS.
 
 
+#### Fedora
+
+If you are using Fedora 26 or above:
+
+~~~~~~
+$ sudo yum install make automake gcc gcc-c++ kernel-devel cmake git boost-devel \
+       boost-date-time boost-system boost-filesystem boost-thread boost-chrono \
+       boost-serialization log4cpp-devel gnuradio-devel gr-osmosdr blas-devel \
+       lapack-devel matio-devel armadillo-devel gflags-devel glog-devel \
+       gnutls-devel openssl-devel python-mako python-six 
+~~~~~~
+
+Once you have installed these packages, you can jump directly to [how to download the source code and build GNSS-SDR](#download-and-build-linux).
+
+#### Arch Linux
+
+If you are using Arch Linux (with base-devel group installed):
+
+~~~~~~
+$ pacman -S cmake git boost boost-libs log4cpp libvolk gnuradio gnuradio-osmosdr \
+       blas lapack gflags google-glog gnutls openssl python2-mako python2-six \
+       libmatio gtest
+~~~~~~
+
+Once you have installed these packages, you can jump directly to [how to download the source code and build GNSS-SDR](#download-and-build-linux).
+
 ### Alternative 2: Install dependencies using PyBOMBS
 
 This option is adequate if you are interested in development, in working with the most recent versions of software dependencies, want more fine tuning on the installed versions, or simply in building everything from the scratch just for the fun of it. In such cases, we recommend to use [PyBOMBS](http://gnuradio.org/pybombs "Python Build Overlay Managed Bundle System wiki") (Python Build Overlay Managed Bundle System), GNU Radio's meta-package manager tool that installs software from source, or whatever the local package manager is, that automatically does all the work for you. Please take a look at the configuration options and general PyBOMBS usage at https://github.com/gnuradio/pybombs. Here we provide a quick step-by-step tutorial.

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr-config-info.cc

@@ -20,10 +20,11 @@
 #include <config.h>
 #endif
 
-#include <volk_gnsssdr/constants.h>
+#include <volk_gnsssdr/constants.h>      // for volk_gnsssdr_available_machines, volk_gnsssdr_c_compiler ...
-#include "volk_gnsssdr/volk_gnsssdr.h"
+#include <iostream>                      // for operator<<, endl, cout, ostream
-#include <iostream>
+#include <string>                        // for string
-#include "volk_gnsssdr_option_helpers.h"
+#include "volk_gnsssdr/volk_gnsssdr.h"   // for volk_gnsssdr_get_alignment, volk_gnsssdr_get_machine
+#include "volk_gnsssdr_option_helpers.h" // for option_list, option_t
 
 void print_alignment()
 {

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_option_helpers.cc

@@ -17,8 +17,14 @@
  */
 
 #include "volk_gnsssdr_option_helpers.h"
+#include <climits>      // IWYU pragma: keep
+#include <cstdlib>      // IWYU pragma: keep
+#include <cstring>      // IWYU pragma: keep
+#include <exception>    // for exception
+#include <iostream>     // for operator<<, endl, basic_ostream, cout, ostream
+#include <utility>      // for pair
+
 
-#include <iostream>
 
 /*
  * Option type

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_option_helpers.h

@@ -19,9 +19,13 @@
 #ifndef VOLK_VOLK_OPTION_HELPERS_H
 #define VOLK_VOLK_OPTION_HELPERS_H
 
+#include <climits>
+#include <cstring>
+#include <map>
 #include <string>
 #include <vector>
 
+
 typedef enum
 {
     VOID_CALLBACK,

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc

@@ -1,4 +1,4 @@
-/* Copyright (C) 2010-2015 (see AUTHORS file for a list of contributors)
+/* Copyright (C) 2010-2018 (see AUTHORS file for a list of contributors)
  *
  * This file is part of GNSS-SDR.
  *
@@ -16,19 +16,24 @@
  * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "qa_utils.h"
+
-#include "kernel_tests.h"
+#include <sys/stat.h>                          // for stat
-#include "volk_gnsssdr_option_helpers.h"
+#include <cstddef>                             // for size_t
+#include <iostream>                            // for operator<<, basic_ostream
+#include <fstream>                             // IWYU pragma: keep
+#include <map>                                 // for map, map<>::iterator
+#include <utility>                             // for pair
+#include <vector>                              // for vector, vector<>::const_...
+#include <boost/filesystem/operations.hpp>     // for create_directories, exists
+#include <boost/filesystem/path.hpp>           // for path, operator<<
+#include <boost/filesystem/path_traits.hpp>    // for filesystem
+#include <volk_gnsssdr/volk_gnsssdr_prefs.h>   // for volk_gnsssdr_get_config_path
+#include "kernel_tests.h"                      // for init_test_list
+#include "qa_utils.h"                          // for volk_gnsssdr_test_results_t
+#include "volk_gnsssdr/volk_gnsssdr_complex.h" // for lv_32fc_t
+#include "volk_gnsssdr_option_helpers.h"       // for option_list, option_t
 #include "volk_gnsssdr_profile.h"
 
-#include <volk_gnsssdr/volk_gnsssdr.h>
-#include <volk_gnsssdr/volk_gnsssdr_prefs.h>
-
-#include <vector>
-#include <boost/filesystem.hpp>
-#include <iostream>
-#include <fstream>
-#include <sys/stat.h>
 
 namespace fs = boost::filesystem;
 
@@ -222,7 +227,7 @@ void write_results(const std::vector<volk_gnsssdr_test_results_t> *results, bool
     const fs::path config_path(path);
     // Until we can update the config on a kernel by kernel basis
     // do not overwrite volk_gnsssdr_config when using a regex.
-    if (not fs::exists(config_path.branch_path()))
+    if (! fs::exists(config_path.branch_path()))
     {
         std::cout << "Creating " << config_path.branch_path() << " ..." << std::endl;
         fs::create_directories(config_path.branch_path());

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.h

@@ -27,6 +27,12 @@
  * -------------------------------------------------------------------------
  */
 
+#include <cstdbool>   // for bool
+#include <iosfwd>     // for ofstream
+#include <string>     // for string
+#include <vector>     // for vector
+
+class volk_test_results_t;
 
 
 void read_results(std::vector<volk_gnsssdr_test_results_t> *results);

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.cc

@@ -1,4 +1,4 @@
-/* Copyright (C) 2010-2015 (see AUTHORS file for a list of contributors)
+/* Copyright (C) 2010-2018 (see AUTHORS file for a list of contributors)
  *
  * This file is part of GNSS-SDR.
  *
@@ -17,13 +17,25 @@
  */
 
 #include "qa_utils.h"
-#include <chrono>
+#include <cassert>                                  // for assert
-#include <random>
+#include <chrono>                                   // for system_clock, duration,...
-#include <boost/foreach.hpp>
+#include <cmath>                                    // for sqrt, fabs, abs
-#include <boost/tokenizer.hpp>
+#include <cstdint>                                  // for uint16_t, uint64_t,int16_t, int32_t
-#include <boost/lexical_cast.hpp>
+#include <cstring>                                  // for memcpy, memset
-#include <volk_gnsssdr/volk_gnsssdr_cpu.h>
+#include <fstream>                                  // for operator<<
-#include <volk_gnsssdr/volk_gnsssdr_malloc.h>
+#include <iostream>                                 // for cout, cerr
+#include <limits>                                   // for numeric_limits
+#include <map>                                      // for map
+#include <random>                                   // for random_device, default_random_engine, uniform_real_distribution
+#include <vector>                                   // for vector
+#include <boost/foreach.hpp>                        // for auto_any_base
+#include <boost/lexical_cast.hpp>                   // for lexical_cast
+#include <boost/token_functions.hpp>                // for char_separator
+#include <boost/token_iterator.hpp>                 // for token_iterator
+#include <boost/tokenizer.hpp>                      // for tokenizer
+#include <volk_gnsssdr/volk_gnsssdr.h>              // for volk_gnsssdr_func_desc_t
+#include <volk_gnsssdr/volk_gnsssdr_malloc.h>       // for volk_gnsssdr_free, volk_gnsssdr_malloc
+
 
 float uniform() {
     std::random_device r;

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h

@@ -1,4 +1,4 @@
-/* Copyright (C) 2010-2015 (see AUTHORS file for a list of contributors)
+/* Copyright (C) 2010-2018 (see AUTHORS file for a list of contributors)
  *
  * This file is part of GNSS-SDR.
  *
@@ -23,13 +23,14 @@
 #define _DARWIN_C_SOURCE
 #endif
 
-#include <string>
+#include <cstdbool>       // for bool, false
-#include <iostream>
+#include <cstdlib>        // for NULL
-#include <fstream>
+#include <map>            // for map
-#include <vector>
+#include <string>         // for string, basic_string
-#include <map>
+#include <vector>         // for vector
-#include <volk_gnsssdr/volk_gnsssdr.h>
+#include <volk_gnsssdr/volk_gnsssdr.h>          // for volk_gnsssdr_func_desc_t
-#include <volk_gnsssdr/volk_gnsssdr_common.h>
+#include "volk_gnsssdr/volk_gnsssdr_complex.h"  // for lv_32fc_t
+
 
 /************************************************
  * VOLK QA type definitions                     *

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/testqa.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2015 (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2018 (see AUTHORS file for a list of contributors)
  *
  * This file is part of GNSS-SDR.
  *
@@ -18,15 +18,16 @@
  */
 
 
-#include "qa_utils.h"
+#include <cstdbool>             // for bool, false, true
-#include "kernel_tests.h"
+#include <iostream>             // for operator<<, basic_ostream, endl, char...
-
+#include <fstream>              // IWYU pragma: keep
-#include <volk_gnsssdr/volk_gnsssdr.h>
+#include <map>                  // for map, map<>::iterator, _Rb_tree_iterator
-
+#include <string>               // for string, operator<<
-#include <vector>
+#include <utility>              // for pair
-#include <utility>
+#include <vector>               // for vector
-#include <iostream>
+#include "kernel_tests.h"       // for init_test_list
-#include <fstream>
+#include "qa_utils.h"           // for volk_gnsssdr_test_case_t, volk_gnsssdr_test_results_t
+#include "volk_gnsssdr/volk_gnsssdr_complex.h"  // for lv_32fc_t
 
 void print_qa_xml(std::vector<volk_gnsssdr_test_results_t> results, unsigned int nfails);
 

src/tests/CMakeLists.txt

@@ -700,31 +700,64 @@ else(NOT ${GTEST_DIR_LOCAL})
     add_dependencies(gnuradio_block_test gtest)
 endif(NOT ${GTEST_DIR_LOCAL})
 
-# add_executable(acq_test ${EXCLUDE}
+add_executable(matio_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
-#      ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
+                          ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/arithmetic/matio_test.cc )
-#      ${CMAKE_CURRENT_SOURCE_DIR}/gnss_block/gps_l1_ca_pcps_acquisition_test.cc
+
-#      ${CMAKE_CURRENT_SOURCE_DIR}/gnss_block/galileo_e1_pcps_ambiguous_acquisition_test.cc
+target_link_libraries(matio_test ${Boost_LIBRARIES}
-# )
+                                 ${GFlags_LIBS}
-# target_link_libraries(acq_test ${Boost_LIBRARIES}
+                                 ${GLOG_LIBRARIES}
-#                                ${GFlags_LIBS}
+                                 ${GTEST_LIBRARIES}
-#                                ${GLOG_LIBRARIES}
+                                 ${MATIO_LIBRARIES}
-#                                ${GTEST_LIBRARIES}
+                                 gnss_system_parameters )
-#                                ${GNURADIO_RUNTIME_LIBRARIES}
+add_test(matio_test matio_test)
-#                                ${GNURADIO_BLOCKS_LIBRARIES}
+if(NOT ${GTEST_DIR_LOCAL})
-#                                ${GNURADIO_FILTER_LIBRARIES}
+    if(MATIO_FOUND)
-#                                ${GNURADIO_ANALOG_LIBRARIES}
+        add_dependencies(matio_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
-#                                gnss_sp_libs
+    else(MATIO_FOUND)
-#                                gnss_rx
+        add_dependencies(matio_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION} matio-${GNSSSDR_MATIO_LOCAL_VERSION})
-#                                gnss_system_parameters
+    endif(MATIO_FOUND)
-#                                signal_generator_blocks
+else(NOT ${GTEST_DIR_LOCAL})
-#                                ${VOLK_GNSSSDR_LIBRARIES}
+   if(MATIO_FOUND)
-#                                )
+        add_dependencies(matio_test gtest)
-# add_test(acq_test acq_test)
+    else(MATIO_FOUND)
+        add_dependencies(matio_test gtest matio-${GNSSSDR_MATIO_LOCAL_VERSION}) 
+    endif(MATIO_FOUND)
+endif(NOT ${GTEST_DIR_LOCAL})
+                                          
+add_executable(acq_test
+      ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
+      ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
+ )
+target_link_libraries(acq_test ${Boost_LIBRARIES}
+                                ${GFlags_LIBS}
+                                ${GLOG_LIBRARIES}
+                                ${GTEST_LIBRARIES}
+                                ${GNURADIO_RUNTIME_LIBRARIES}
+                                ${GNURADIO_BLOCKS_LIBRARIES}
+                                ${GNURADIO_FILTER_LIBRARIES}
+                                ${GNURADIO_ANALOG_LIBRARIES}
+                                gnss_sp_libs
+                                gnss_rx
+                                gnss_system_parameters
+                                signal_generator_blocks
+                                signal_processing_testing_lib
+                                ${VOLK_GNSSSDR_LIBRARIES}
+                                )
+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})
+    add_dependencies(acq_test acq_test gtest)
+endif(NOT ${GTEST_DIR_LOCAL})
+
+
 
 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
               )
+
 target_link_libraries(trk_test ${Boost_LIBRARIES}
                                ${GFlags_LIBS}
                                ${GLOG_LIBRARIES}
@@ -747,9 +780,5 @@ else(NOT ${GTEST_DIR_LOCAL})
 endif(NOT ${GTEST_DIR_LOCAL})
 
 
-if(${ENABLE_PACKAGING})
+add_dependencies(check control_thread_test flowgraph_test gnss_block_test
-     add_dependencies(check gnuradio_block_test trk_test)
+                       gnuradio_block_test acq_test trk_test matio_test)
-else(${ENABLE_PACKAGING})
-     add_dependencies(check control_thread_test flowgraph_test gnss_block_test
-                      gnuradio_block_test trk_test)
-endif(${ENABLE_PACKAGING})

src/tests/unit-tests/arithmetic/matio_test.cc

@@ -33,6 +33,7 @@
 #include <matio.h>
 #include <cstdio>
 #include <gnuradio/gr_complex.h>
+#include <gtest/gtest.h>
 
 TEST(MatioTest, WriteAndReadDoubles)
 {

src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc

@@ -34,6 +34,7 @@
 #include <chrono>
 #include <iostream>
 #include <boost/make_shared.hpp>
+#include <glog/logging.h>
 #include <gnuradio/top_block.h>
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/analog/sig_source_waveform.h>

src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc

@@ -457,7 +457,7 @@ TEST_F(GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test, ConnectAndRun)
         start = std::chrono::system_clock::now();
         top_block->run(); // Start threads and wait
         end = std::chrono::system_clock::now();
-        std::chrono::duration<double> elapsed_seconds = end - start;
+        elapsed_seconds = end - start;
     }) << "Failure running the top_block.";
 
     std::cout <<  "Processed " << nsamples << " samples in " << elapsed_seconds.count() * 1e6 << " microseconds" << std::endl;

src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc

@@ -36,6 +36,7 @@
 #include <iostream>
 #include <boost/filesystem.hpp>
 #include <boost/make_shared.hpp>
+#include <glog/logging.h>
 #include <gnuradio/top_block.h>
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/analog/sig_source_waveform.h>
@@ -49,6 +50,7 @@
 #include "gnss_sdr_valve.h"
 #include "gnss_synchro.h"
 #include "gnuplot_i.h"
+#include "GPS_L1_CA.h"
 #include "test_flags.h"
 #include "acquisition_dump_reader.h"
 #include "gps_l1_ca_pcps_acquisition.h"

src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt

@@ -39,3 +39,6 @@ list(SORT 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})
+endif(NOT MATIO_FOUND)