From f8e5b0e705edb70ab81e494f2139cf424d2a4628 Mon Sep 17 00:00:00 2001
From: Antonio Ramos <antonio.ramosdet@gmail.com>
Date: Tue, 30 Jan 2018 15:46:13 +0100
Subject: [PATCH] Set matio min ver.

---
 CMakeLists.txt                                             | 7 ++++---
 src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt  | 3 ++-
 .../signal-processing-blocks/libs/CMakeLists.txt           | 1 +
 src/utils/matlab/plot_acq_grid.m                           | 5 +++++
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 39a7f9cf4..8b7a453e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -317,6 +317,7 @@ set(GNSSSDR_BOOST_MIN_VERSION "1.45")
 set(GNSSSDR_PYTHON_MIN_VERSION "2.7")
 set(GNSSSDR_MAKO_MIN_VERSION "0.4.2")
 set(GNSSSDR_ARMADILLO_MIN_VERSION "4.200.0")
+set(GNSSSDR_MATIO_MIN_VERSION "1.5.11")
 
 
 
@@ -1092,7 +1093,7 @@ endif(NOT GNUTLS_OPENSSL_LIBRARY)
 # Matio - https://github.com/tbeu/matio
 ########################################################################
 find_package(MATIO)
-if(NOT MATIO_FOUND)
+if(NOT MATIO_FOUND OR MATIO_VERSION_STRING VERSION_LESS GNSSSDR_MATIO_MIN_VERSION)
     find_package(ZLIB)
     if(ZLIB_FOUND)
         get_filename_component(ZLIB_BASE_DIR ${ZLIB_INCLUDE_DIRS} DIRECTORY)
@@ -1112,7 +1113,7 @@ if(NOT MATIO_FOUND)
             if(CMAKE_VERSION VERSION_LESS 3.2)
               ExternalProject_Add(
                  matio-${GNSSSDR_MATIO_LOCAL_VERSION}
-                 PREFIX ${CMAKE_CURRENT_BINARY_DIR}/mati
+                 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}
@@ -1152,7 +1153,7 @@ if(NOT MATIO_FOUND)
     else(ZLIB_FOUND)
         message(FATAL_ERROR "*** The zlib library is required to build gnss-sdr")
     endif(ZLIB_FOUND)
-endif(NOT MATIO_FOUND)
+endif(NOT MATIO_FOUND OR MATIO_VERSION_STRING VERSION_LESS GNSSSDR_MATIO_MIN_VERSION)
 
 
 
diff --git a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
index 8a22651c4..3a7494721 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
@@ -48,6 +48,7 @@ include_directories(
      ${GFlags_INCLUDE_DIRS}
      ${GNURADIO_RUNTIME_INCLUDE_DIRS}
      ${VOLK_GNSSSDR_INCLUDE_DIRS}
+     ${MATIO_INCLUDE_DIRS}
 )
 
 
@@ -69,7 +70,7 @@ source_group(Headers FILES ${ACQ_GR_BLOCKS_HEADERS})
 if(ENABLE_FPGA)
 	target_link_libraries(acq_gr_blocks acquisition_lib gnss_sp_libs gnss_system_parameters ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_FFT_LIBRARIES} ${VOLK_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${OPT_LIBRARIES} ${OPT_ACQUISITION_LIBRARIES})
 else(ENABLE_FPGA)
-	target_link_libraries(acq_gr_blocks gnss_sp_libs gnss_system_parameters ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_FFT_LIBRARIES} ${VOLK_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${OPT_LIBRARIES} ${OPT_ACQUISITION_LIBRARIES})
+	target_link_libraries(acq_gr_blocks gnss_sp_libs gnss_system_parameters ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_FFT_LIBRARIES} ${VOLK_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${OPT_LIBRARIES} ${OPT_ACQUISITION_LIBRARIES} ${MATIO_LIBRARIES})
 endif(ENABLE_FPGA)
 if(NOT VOLK_GNSSSDR_FOUND)
     add_dependencies(acq_gr_blocks volk_gnsssdr_module)
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 14c2f5bd2..ee71cc113 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt
@@ -30,6 +30,7 @@ include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${GLOG_INCLUDE_DIRS}
      ${GFlags_INCLUDE_DIRS}
+     ${MATIO_INCLUDE_DIRS}
 )
 
 
diff --git a/src/utils/matlab/plot_acq_grid.m b/src/utils/matlab/plot_acq_grid.m
index 9054f3837..23bf63fff 100644
--- a/src/utils/matlab/plot_acq_grid.m
+++ b/src/utils/matlab/plot_acq_grid.m
@@ -43,6 +43,7 @@ sat = 7;
 %     3 GPS  L5
 %     4 Gal. E1B
 %     5 Gal. E5
+%     6 Glo. 1G
 
 signal_type = 1;
 
@@ -75,6 +76,10 @@ switch(signal_type)
         n_chips = 10230;
         system = 'E';
         signal = '5X';
+    case 6
+        n_chips = 511;
+        system = 'R';
+        signal = '1G';
 end
 filename = [path file '_' system '_' signal '_sat_' num2str(sat) '.mat'];
 load(filename);