mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-15 19:55:47 +00:00
Code Issues Releases Wiki Activity

Discard changes in CMake regarding Matio min. required version

Browse Source
This commit is contained in:
Antonio Ramos 2018-01-31 12:52:09 +01:00
parent 9c292302d9
commit 11f332f9d8
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -317,7 +317,6 @@ set(GNSSSDR_BOOST_MIN_VERSION "1.45")
set(GNSSSDR_PYTHON_MIN_VERSION "2.7") set(GNSSSDR_PYTHON_MIN_VERSION "2.7")
set(GNSSSDR_MAKO_MIN_VERSION "0.4.2") set(GNSSSDR_MAKO_MIN_VERSION "0.4.2")
set(GNSSSDR_ARMADILLO_MIN_VERSION "4.200.0") set(GNSSSDR_ARMADILLO_MIN_VERSION "4.200.0")
set(GNSSSDR_MATIO_MIN_VERSION "1.5.11")
@ -1093,7 +1092,7 @@ endif(NOT GNUTLS_OPENSSL_LIBRARY)
# Matio - https://github.com/tbeu/matio # Matio - https://github.com/tbeu/matio
######################################################################## ########################################################################
find_package(MATIO) find_package(MATIO)
if(NOT MATIO_FOUND OR MATIO_VERSION_STRING VERSION_LESS GNSSSDR_MATIO_MIN_VERSION) if(NOT MATIO_FOUND)
find_package(ZLIB) find_package(ZLIB)
if(ZLIB_FOUND) if(ZLIB_FOUND)
get_filename_component(ZLIB_BASE_DIR ${ZLIB_INCLUDE_DIRS} DIRECTORY) get_filename_component(ZLIB_BASE_DIR ${ZLIB_INCLUDE_DIRS} DIRECTORY)
@ -1153,7 +1152,7 @@ if(NOT MATIO_FOUND OR MATIO_VERSION_STRING VERSION_LESS GNSSSDR_MATIO_MIN_VERSIO
else(ZLIB_FOUND) else(ZLIB_FOUND)
message(FATAL_ERROR "*** The zlib library is required to build gnss-sdr") message(FATAL_ERROR "*** The zlib library is required to build gnss-sdr")
endif(ZLIB_FOUND) endif(ZLIB_FOUND)
endif(NOT MATIO_FOUND OR MATIO_VERSION_STRING VERSION_LESS GNSSSDR_MATIO_MIN_VERSION) endif(NOT MATIO_FOUND)

2
src/utils/matlab/plot_acq_grid.m
View File

@ -32,7 +32,7 @@
%%%%%%%%% ¡¡¡ CONFIGURE !!! %%%%%%%%%%%%% %%%%%%%%% ¡¡¡ CONFIGURE !!! %%%%%%%%%%%%%
path = '/home/aramos/gnss-sdr/install/'; path = '/archive/';
file = 'acq'; file = 'acq';
sat = 7; sat = 7;