mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2025-01-24 07:56:59 +00:00
Relax Armadillo version for nonlinear filters
This commit is contained in:
parent
61f7ea2922
commit
7467f94164
src
@ -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()
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user