mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-14 04:00:34 +00:00
Code Issues Releases Wiki Activity

Set matio min ver.

Browse Source
This commit is contained in:
Antonio Ramos 2018-01-30 15:46:13 +01:00
parent 42dc14b2bb
commit f8e5b0e705
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -317,6 +317,7 @@ 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")
@ -1092,7 +1093,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) if(NOT MATIO_FOUND OR MATIO_VERSION_STRING VERSION_LESS GNSSSDR_MATIO_MIN_VERSION)
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)
@ -1112,7 +1113,7 @@ if(NOT MATIO_FOUND)
if(CMAKE_VERSION VERSION_LESS 3.2) if(CMAKE_VERSION VERSION_LESS 3.2)
ExternalProject_Add( ExternalProject_Add(
matio-${GNSSSDR_MATIO_LOCAL_VERSION} 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_REPOSITORY https://github.com/tbeu/matio
GIT_TAG v${GNSSSDR_MATIO_LOCAL_VERSION} GIT_TAG v${GNSSSDR_MATIO_LOCAL_VERSION}
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/matio/matio-${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) 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) endif(NOT MATIO_FOUND OR MATIO_VERSION_STRING VERSION_LESS GNSSSDR_MATIO_MIN_VERSION)

3
src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
View File

@ -48,6 +48,7 @@ include_directories(
${GFlags_INCLUDE_DIRS} ${GFlags_INCLUDE_DIRS}
${GNURADIO_RUNTIME_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS}
${VOLK_GNSSSDR_INCLUDE_DIRS} ${VOLK_GNSSSDR_INCLUDE_DIRS}
${MATIO_INCLUDE_DIRS}
) )
@ -69,7 +70,7 @@ source_group(Headers FILES ${ACQ_GR_BLOCKS_HEADERS})
if(ENABLE_FPGA) 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}) 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) 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) endif(ENABLE_FPGA)
if(NOT VOLK_GNSSSDR_FOUND) if(NOT VOLK_GNSSSDR_FOUND)
add_dependencies(acq_gr_blocks volk_gnsssdr_module) add_dependencies(acq_gr_blocks volk_gnsssdr_module)

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

@ -30,6 +30,7 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${GLOG_INCLUDE_DIRS} ${GLOG_INCLUDE_DIRS}
${GFlags_INCLUDE_DIRS} ${GFlags_INCLUDE_DIRS}
${MATIO_INCLUDE_DIRS}
) )

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

@ -43,6 +43,7 @@ sat = 7;
% 3 GPS L5 % 3 GPS L5
% 4 Gal. E1B % 4 Gal. E1B
% 5 Gal. E5 % 5 Gal. E5
% 6 Glo. 1G
signal_type = 1; signal_type = 1;
@ -75,6 +76,10 @@ switch(signal_type)
n_chips = 10230; n_chips = 10230;
system = 'E'; system = 'E';
signal = '5X'; signal = '5X';
case 6
n_chips = 511;
system = 'R';
signal = '1G';
end end
filename = [path file '_' system '_' signal '_sat_' num2str(sat) '.mat']; filename = [path file '_' system '_' signal '_sat_' num2str(sat) '.mat'];
load(filename); load(filename);