From 1d80f1ba9beed559372947acef4c596433dbb3b1 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 14 Jun 2019 18:22:07 +0200
Subject: [PATCH] Fix building if Armadillo < 9.400

---
 src/algorithms/tracking/libs/CMakeLists.txt | 9 +++++++--
 src/tests/CMakeLists.txt                    | 5 +++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/algorithms/tracking/libs/CMakeLists.txt b/src/algorithms/tracking/libs/CMakeLists.txt
index 80948c7e3..f8fb19479 100644
--- a/src/algorithms/tracking/libs/CMakeLists.txt
+++ b/src/algorithms/tracking/libs/CMakeLists.txt
@@ -33,7 +33,6 @@ set(TRACKING_LIB_SOURCES
     cpu_multicorrelator.cc
     cpu_multicorrelator_real_codes.cc
     cpu_multicorrelator_16sc.cc
-    nonlinear_tracking.cc
     lock_detectors.cc
     tcp_communication.cc
     tcp_packet_data.cc
@@ -51,7 +50,6 @@ set(TRACKING_LIB_HEADERS
     cpu_multicorrelator.h
     cpu_multicorrelator_real_codes.h
     cpu_multicorrelator_16sc.h
-    nonlinear_tracking.h
     lock_detectors.h
     tcp_communication.h
     tcp_packet_data.h
@@ -65,6 +63,12 @@ set(TRACKING_LIB_HEADERS
     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)
     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)
@@ -84,6 +88,7 @@ target_link_libraries(tracking_libs
         Gnuradio::runtime
         Volkgnsssdr::volkgnsssdr
         core_system_parameters
+        algorithms_libs
         ${OPT_TRACKING_LIBRARIES}
     PRIVATE
         Gflags::gflags
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 8bbddef13..219676d34 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -161,6 +161,11 @@ 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
+    add_definitions(-DARMADILLO_HAVE_MVNRND=1)
+endif()
+
 find_package(Gnuplot)
 if(GNUPLOT_FOUND)
     add_definitions(-DGNUPLOT_EXECUTABLE="${GNUPLOT_EXECUTABLE}")