mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-11-17 15:24:56 +00:00
Code Issues Releases Wiki Activity

Fix merge

Browse Source 
# Conflicts:
#	src/algorithms/tracking/adapters/CMakeLists.txt
#	src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
This commit is contained in:
Carles Fernandez 2018-04-03 12:04:03 +02:00
parent 5656dbee89
commit bd850eb5f3
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
View File

@ -38,6 +38,10 @@ set(TRACKING_GR_BLOCKS_SOURCES
glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc
gps_l1_ca_kf_tracking_cc.cc gps_l1_ca_kf_tracking_cc.cc
glonass_l2_ca_dll_pll_tracking_cc.cc
glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc
dll_pll_veml_tracking.cc
${OPT_TRACKING_BLOCKS} ${OPT_TRACKING_BLOCKS}
) )