1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-29 02:14:51 +00:00

Reorder libraries

This commit is contained in:
Carles Fernandez 2019-02-07 22:44:31 +01:00
parent 4b7e3992c6
commit ae005c62f2
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
3 changed files with 19 additions and 18 deletions

View File

@ -33,10 +33,10 @@ target_link_libraries(pvt_adapters
PUBLIC PUBLIC
Armadillo::armadillo Armadillo::armadillo
Gnuradio::runtime Gnuradio::runtime
pvt_gr_blocks
pvt_lib
gnss_system_parameters gnss_system_parameters
gnss_rx gnss_rx
pvt_lib
pvt_gr_blocks
PRIVATE PRIVATE
Boost::serialization Boost::serialization
) )

View File

@ -59,9 +59,9 @@ target_link_libraries(pvt_lib
PUBLIC PUBLIC
Armadillo::armadillo Armadillo::armadillo
Boost::date_time Boost::date_time
gnss_system_parameters
gnss_sp_libs gnss_sp_libs
rtklib_lib rtklib_lib
gnss_system_parameters
gnss_rx gnss_rx
PRIVATE PRIVATE
Boost::filesystem Boost::filesystem

View File

@ -363,8 +363,6 @@ if(ENABLE_UNIT_TESTING)
Volk::volk Volk::volk
Volkgnsssdr::volkgnsssdr Volkgnsssdr::volkgnsssdr
gnss_sp_libs gnss_sp_libs
gnss_rx
gnss_system_parameters
core_monitor_lib core_monitor_lib
signal_source_adapters signal_source_adapters
datatype_adapters datatype_adapters
@ -378,8 +376,11 @@ if(ENABLE_UNIT_TESTING)
obs_adapters obs_adapters
signal_generator_adapters signal_generator_adapters
pvt_adapters pvt_adapters
pvt_lib
signal_processing_testing_lib signal_processing_testing_lib
system_testing_lib system_testing_lib
gnss_system_parameters
gnss_rx
) )
if(ENABLE_UNIT_TESTING_EXTRA) if(ENABLE_UNIT_TESTING_EXTRA)
target_link_libraries(run_tests PUBLIC Gpstk::gpstk) target_link_libraries(run_tests PUBLIC Gpstk::gpstk)
@ -435,11 +436,11 @@ if(ENABLE_FPGA)
Volk::volk Volk::volk
channel_fsm channel_fsm
gnss_sp_libs gnss_sp_libs
gnss_rx
datatype_adapters datatype_adapters
gnss_system_parameters
signal_processing_testing_lib signal_processing_testing_lib
tracking_adapters tracking_adapters
gnss_system_parameters
gnss_rx
) )
install(TARGETS gps_l1_ca_dll_pll_tracking_test_fpga install(TARGETS gps_l1_ca_dll_pll_tracking_test_fpga
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
@ -495,7 +496,7 @@ if(ENABLE_SYSTEM_TESTING)
Gnuradio::runtime GTest::GTest GTest::Main Gnuradio::runtime GTest::GTest GTest::Main
Gnuradio::blocks Gnuradio::filter Gnuradio::blocks Gnuradio::filter
Gnuradio::analog gnss_sp_libs Gnuradio::analog gnss_sp_libs
gnss_rx gnss_system_parameters gnss_system_parameters gnss_rx
) )
add_system_test(ttff) add_system_test(ttff)
@ -506,7 +507,7 @@ if(ENABLE_SYSTEM_TESTING)
GTest::GTest GTest::Main Gnuradio::runtime GTest::GTest GTest::Main Gnuradio::runtime
Gnuradio::blocks Gnuradio::filter Gnuradio::blocks Gnuradio::filter
Gnuradio::analog Matio::matio Volkgnsssdr::volkgnsssdr Gnuradio::analog Matio::matio Volkgnsssdr::volkgnsssdr
gnss_sp_libs gnss_rx gnss_system_parameters gnss_sp_libs gnss_system_parameters gnss_rx
system_testing_lib signal_processing_testing_lib system_testing_lib signal_processing_testing_lib
) )
add_system_test(position_test) add_system_test(position_test)
@ -591,8 +592,8 @@ target_link_libraries(gnss_block_test PUBLIC
input_filter_adapters input_filter_adapters
channel_adapters channel_adapters
gnss_sp_libs gnss_sp_libs
gnss_rx
gnss_system_parameters gnss_system_parameters
gnss_rx
) )
target_include_directories(gnss_block_test PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs) target_include_directories(gnss_block_test PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
@ -620,9 +621,9 @@ target_link_libraries(gnuradio_block_test PUBLIC
GTest::Main GTest::Main
Volkgnsssdr::volkgnsssdr Volkgnsssdr::volkgnsssdr
gnss_sp_libs gnss_sp_libs
gnss_rx
gnss_system_parameters
signal_source_gr_blocks signal_source_gr_blocks
gnss_system_parameters
gnss_rx
) )
add_test(gnuradio_block_test gnuradio_block_test) add_test(gnuradio_block_test gnuradio_block_test)
@ -641,8 +642,8 @@ target_link_libraries(matio_test
GTest::GTest GTest::GTest
GTest::Main GTest::Main
Matio::matio Matio::matio
gnss_rx
gnss_system_parameters gnss_system_parameters
gnss_rx
) )
add_test(matio_test matio_test) add_test(matio_test matio_test)
@ -669,11 +670,11 @@ target_link_libraries(acq_test
GTest::Main GTest::Main
Volkgnsssdr::volkgnsssdr Volkgnsssdr::volkgnsssdr
gnss_sp_libs gnss_sp_libs
gnss_rx
gnss_system_parameters
signal_generator_blocks signal_generator_blocks
acq_adapters acq_adapters
signal_processing_testing_lib signal_processing_testing_lib
gnss_system_parameters
gnss_rx
) )
add_test(acq_test acq_test) add_test(acq_test acq_test)
@ -704,10 +705,10 @@ target_link_libraries(trk_test
GTest::Main GTest::Main
Volkgnsssdr::volkgnsssdr Volkgnsssdr::volkgnsssdr
gnss_sp_libs gnss_sp_libs
gnss_rx
tracking_adapters tracking_adapters
gnss_system_parameters
signal_generator_blocks signal_generator_blocks
gnss_system_parameters
gnss_rx
) )
add_test(trk_test trk_test) add_test(trk_test trk_test)
@ -732,8 +733,8 @@ if(NOT ENABLE_PACKAGING)
GTest::Main GTest::Main
signal_source_adapters signal_source_adapters
gnss_sp_libs gnss_sp_libs
gnss_rx
gnss_system_parameters gnss_system_parameters
gnss_rx
) )
add_test(control_thread_test control_thread_test) add_test(control_thread_test control_thread_test)