mirrors
/
gnss-sdr
mirror of https://github.com/gnss-sdr/gnss-sdr
1
0
Fork 0
Code Issues Releases Wiki Activity

Relax Armadillo version for nonlinear filters

This commit is contained in:
Carles Fernandez 2019-06-15 10:11:11 +02:00
parent 61f7ea2922
commit 7467f94164
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/algorithms/tracking/libs/CMakeLists.txt
View File

@ -63,8 +63,8 @@ set(TRACKING_LIB_HEADERS
exponential_smoother.h
)
if(ARMADILLO_VERSION_STRING VERSION_GREATER 9.400)
# sqrtmat_sympd() requires 9.400
if(ARMADILLO_VERSION_STRING VERSION_GREATER 7.400)
# sqrtmat_sympd() requires 7.400
set(TRACKING_LIB_SOURCES ${TRACKING_LIB_SOURCES} nonlinear_tracking.cc)
set(TRACKING_LIB_HEADERS ${TRACKING_LIB_HEADERS} nonlinear_tracking.h)
endif()

6
src/tests/CMakeLists.txt
View File

@ -161,8 +161,8 @@ if(ENABLE_FPGA)
add_definitions(-DFPGA_BLOCKS_TEST=1)
endif()
if(ARMADILLO_VERSION_STRING VERSION_GREATER 9.400)
# sqrtmat_sympd() in nonlinear_tracking.cc requires 9.400
if(ARMADILLO_VERSION_STRING VERSION_GREATER 8.400)
# mvnrnd() requires 8.400
add_definitions(-DARMADILLO_HAVE_MVNRND=1)
endif()
@ -799,7 +799,7 @@ endif()
#########################################################
if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA)
set(NONLINEAR_SOURCES "")
if(ARMADILLO_VERSION_STRING VERSION_GREATER 9.400)
if(ARMADILLO_VERSION_STRING VERSION_GREATER 8.400)
set(NONLINEAR_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/cubature_filter_test.cc
${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/unscented_filter_test.cc