mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-10-31 07:13:03 +00:00
Code Issues Releases Wiki Activity

Fix building if Armadillo < 9.400

Browse Source
This commit is contained in:
Carles Fernandez
2019-06-14 18:22:07 +02:00
parent d389525af4
commit 1d80f1ba9b
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,6 @@ set(TRACKING_LIB_SOURCES
cpu_multicorrelator.cc cpu_multicorrelator.cc
cpu_multicorrelator_real_codes.cc cpu_multicorrelator_real_codes.cc
cpu_multicorrelator_16sc.cc cpu_multicorrelator_16sc.cc
nonlinear_tracking.cc
lock_detectors.cc lock_detectors.cc
tcp_communication.cc tcp_communication.cc
tcp_packet_data.cc tcp_packet_data.cc
@@ -51,7 +50,6 @@ set(TRACKING_LIB_HEADERS
cpu_multicorrelator.h cpu_multicorrelator.h
cpu_multicorrelator_real_codes.h cpu_multicorrelator_real_codes.h
cpu_multicorrelator_16sc.h cpu_multicorrelator_16sc.h
nonlinear_tracking.h
lock_detectors.h lock_detectors.h
tcp_communication.h tcp_communication.h
tcp_packet_data.h tcp_packet_data.h
@@ -65,6 +63,12 @@ set(TRACKING_LIB_HEADERS
exponential_smoother.h exponential_smoother.h
) )
if(ARMADILLO_VERSION_STRING VERSION_GREATER 9.400)
# sqrtmat_sympd() requires 9.400
set(TRACKING_LIB_SOURCES ${TRACKING_LIB_SOURCES} nonlinear_tracking.cc)
set(TRACKING_LIB_HEADERS ${TRACKING_LIB_HEADERS} nonlinear_tracking.h)
endif()
if(ENABLE_FPGA) if(ENABLE_FPGA)
set(TRACKING_LIB_SOURCES ${TRACKING_LIB_SOURCES} fpga_multicorrelator.cc dll_pll_conf_fpga.cc) set(TRACKING_LIB_SOURCES ${TRACKING_LIB_SOURCES} fpga_multicorrelator.cc dll_pll_conf_fpga.cc)
set(TRACKING_LIB_HEADERS ${TRACKING_LIB_HEADERS} fpga_multicorrelator.h dll_pll_conf_fpga.h) set(TRACKING_LIB_HEADERS ${TRACKING_LIB_HEADERS} fpga_multicorrelator.h dll_pll_conf_fpga.h)
@@ -84,6 +88,7 @@ target_link_libraries(tracking_libs
Gnuradio::runtime Gnuradio::runtime
Volkgnsssdr::volkgnsssdr Volkgnsssdr::volkgnsssdr
core_system_parameters core_system_parameters
algorithms_libs
${OPT_TRACKING_LIBRARIES} ${OPT_TRACKING_LIBRARIES}
PRIVATE PRIVATE
Gflags::gflags Gflags::gflags

5
src/tests/CMakeLists.txt
View File

@@ -161,6 +161,11 @@ if(ENABLE_FPGA)
add_definitions(-DFPGA_BLOCKS_TEST=1) add_definitions(-DFPGA_BLOCKS_TEST=1)
endif() endif()
if(ARMADILLO_VERSION_STRING VERSION_GREATER 9.400)
# sqrtmat_sympd() in nonlinear_tracking.cc requires 9.400
add_definitions(-DARMADILLO_HAVE_MVNRND=1)
endif()
find_package(Gnuplot) find_package(Gnuplot)
if(GNUPLOT_FOUND) if(GNUPLOT_FOUND)
add_definitions(-DGNUPLOT_EXECUTABLE="${GNUPLOT_EXECUTABLE}") add_definitions(-DGNUPLOT_EXECUTABLE="${GNUPLOT_EXECUTABLE}")