mirror of
				https://github.com/gnss-sdr/gnss-sdr
				synced 2025-10-30 23:03:05 +00:00 
			
		
		
		
	Fix building if Armadillo < 9.400
This commit is contained in:
		| @@ -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 | ||||
|   | ||||
| @@ -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}") | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Carles Fernandez
					Carles Fernandez