From 0dcdf00d194b69304a857ceafe82179f3bf3b1f5 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 16 Jul 2015 15:46:01 +0200
Subject: [PATCH] Fixing linking problems

---
 src/main/main.cc              | 4 ++--
 src/tests/CMakeLists.txt      | 4 +++-
 src/tests/single_test_main.cc | 7 +++++++
 src/tests/test_main.cc        | 4 ++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/main.cc b/src/main/main.cc
index 4659034fb..05a085775 100644
--- a/src/main/main.cc
+++ b/src/main/main.cc
@@ -102,8 +102,8 @@ concurrent_map<Gps_Ref_Location> global_gps_ref_location_map;
 // For GPS NAVIGATION (L2)
 concurrent_queue<Gps_CNAV_Ephemeris> global_gps_cnav_ephemeris_queue;
 concurrent_map<Gps_CNAV_Ephemeris> global_gps_cnav_ephemeris_map;
-concurrent_queue<Gps_CNAV_Ephemeris> global_gps_cnav_iono_queue;
-concurrent_map<Gps_CNAV_Ephemeris> global_gps_cnav_iono_map;
+concurrent_queue<Gps_CNAV_Iono> global_gps_cnav_iono_queue;
+concurrent_map<Gps_CNAV_Iono> global_gps_cnav_iono_map;
 
 // For GALILEO NAVIGATION
 concurrent_queue<Galileo_Ephemeris> global_galileo_ephemeris_queue;
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 72bf7dd33..9cef36e19 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -215,7 +215,8 @@ target_link_libraries(control_thread_test ${Boost_LIBRARIES}
                                           ${GFLAGS_LIBS} 
                                           ${GLOG_LIBRARIES} 
                                           ${GTEST_LIBRARIES} 
-                                          gnss_sp_libs 
+                                          gnss_sp_libs
+                                          gnss_system_parameters
                                           gnss_rx
                                           ${VOLK_GNSSSDR_LIBRARIES} ${ORC_LIBRARIES}
                                           )
@@ -242,6 +243,7 @@ target_link_libraries(flowgraph_test ${Boost_LIBRARIES}
                                      ${GTEST_LIBRARIES} 
                                      gnss_sp_libs 
                                      gnss_rx
+                                     gnss_system_parameters
                                      ${VOLK_GNSSSDR_LIBRARIES} ${ORC_LIBRARIES}
                                      )
 
diff --git a/src/tests/single_test_main.cc b/src/tests/single_test_main.cc
index 98b7ae570..d8db7e2a3 100644
--- a/src/tests/single_test_main.cc
+++ b/src/tests/single_test_main.cc
@@ -42,6 +42,8 @@
 #include "concurrent_map.h"
 #include "gps_navigation_message.h"
 #include "gps_ephemeris.h"
+#include "gps_cnav_ephemeris.h"
+#include "gps_cnav_iono.h"
 #include "gps_acq_assist.h"
 #include "gps_ref_location.h"
 #include "gps_ref_time.h"
@@ -68,6 +70,11 @@ concurrent_map<Gps_Acq_Assist> global_gps_acq_assist_map;
 concurrent_map<Gps_Ref_Location> global_gps_ref_location_map;
 concurrent_map<Gps_Ref_Time> global_gps_ref_time_map;
 
+concurrent_queue<Gps_CNAV_Ephemeris> global_gps_cnav_ephemeris_queue;
+concurrent_map<Gps_CNAV_Ephemeris> global_gps_cnav_ephemeris_map;
+concurrent_queue<Gps_CNAV_Iono> global_gps_cnav_iono_queue;
+concurrent_map<Gps_CNAV_Iono> global_gps_cnav_iono_map;
+
 concurrent_queue<Galileo_Ephemeris> global_galileo_ephemeris_queue;
 concurrent_queue<Galileo_Iono> global_galileo_iono_queue;
 concurrent_queue<Galileo_Utc_Model> global_galileo_utc_model_queue;
diff --git a/src/tests/test_main.cc b/src/tests/test_main.cc
index 31daaa64b..8145cb87d 100644
--- a/src/tests/test_main.cc
+++ b/src/tests/test_main.cc
@@ -132,8 +132,8 @@ concurrent_map<Gps_Ref_Time> global_gps_ref_time_map;
 // For GPS NAVIGATION (L2)
 concurrent_queue<Gps_CNAV_Ephemeris> global_gps_cnav_ephemeris_queue;
 concurrent_map<Gps_CNAV_Ephemeris> global_gps_cnav_ephemeris_map;
-concurrent_queue<Gps_CNAV_Ephemeris> global_gps_cnav_iono_queue;
-concurrent_map<Gps_CNAV_Ephemeris> global_gps_cnav_iono_map;
+concurrent_queue<Gps_CNAV_Iono> global_gps_cnav_iono_queue;
+concurrent_map<Gps_CNAV_Iono> global_gps_cnav_iono_map;
 
 // For GALILEO NAVIGATION
 concurrent_queue<Galileo_Ephemeris> global_galileo_ephemeris_queue;