mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-12-15 20:50:33 +00:00
Merge branch 'next' of https://github.com/carlesfernandez/gnss-sdr into next
This commit is contained in:
commit
c8dfa5fb4c
@ -31,12 +31,12 @@ add_library(pvt_adapters ${PVT_ADAPTER_SOURCES} ${PVT_ADAPTER_HEADERS})
|
||||
|
||||
target_link_libraries(pvt_adapters
|
||||
PUBLIC
|
||||
pvt_gr_blocks
|
||||
Armadillo::armadillo
|
||||
Gnuradio::runtime
|
||||
gnss_system_parameters
|
||||
gnss_rx
|
||||
pvt_lib
|
||||
pvt_gr_blocks
|
||||
PRIVATE
|
||||
Boost::serialization
|
||||
)
|
||||
|
@ -31,8 +31,8 @@ add_library(pvt_gr_blocks ${PVT_GR_BLOCKS_SOURCES} ${PVT_GR_BLOCKS_HEADERS})
|
||||
target_link_libraries(pvt_gr_blocks
|
||||
PUBLIC
|
||||
Boost::date_time
|
||||
pvt_lib
|
||||
Gnuradio::runtime
|
||||
pvt_lib
|
||||
gnss_system_parameters
|
||||
gnss_rx
|
||||
PRIVATE
|
||||
|
@ -92,11 +92,11 @@ add_library(acq_adapters ${ACQ_ADAPTER_SOURCES} ${ACQ_ADAPTER_HEADERS})
|
||||
|
||||
target_link_libraries(acq_adapters
|
||||
PUBLIC
|
||||
Gnuradio::blocks
|
||||
gnss_sp_libs
|
||||
gnss_sdr_flags
|
||||
acq_gr_blocks
|
||||
rx_core_lib
|
||||
Gnuradio::blocks
|
||||
gnss_system_parameters
|
||||
PRIVATE
|
||||
Boost::boost
|
||||
|
@ -35,8 +35,8 @@ add_library(channel_fsm ${CHANNEL_FSM_SOURCES} ${CHANNEL_FSM_HEADERS})
|
||||
|
||||
target_link_libraries(channel_fsm
|
||||
PUBLIC
|
||||
gnss_rx
|
||||
Gnuradio::runtime
|
||||
gnss_rx
|
||||
PRIVATE
|
||||
Gflags::gflags
|
||||
Glog::glog
|
||||
|
@ -36,8 +36,8 @@ add_library(conditioner_adapters ${COND_ADAPTER_SOURCES} ${COND_ADAPTER_HEADERS}
|
||||
|
||||
target_link_libraries(conditioner_adapters
|
||||
PUBLIC
|
||||
gnss_rx
|
||||
Gnuradio::runtime
|
||||
gnss_rx
|
||||
PRIVATE
|
||||
Gflags::gflags
|
||||
Glog::glog
|
||||
|
@ -109,9 +109,9 @@ add_library(gnss_sp_libs ${GNSS_SPLIBS_SOURCES} ${GNSS_SPLIBS_HEADERS})
|
||||
|
||||
target_link_libraries(gnss_sp_libs
|
||||
PUBLIC
|
||||
Armadillo::armadillo
|
||||
Boost::boost
|
||||
Gflags::gflags
|
||||
Armadillo::armadillo
|
||||
Gnuradio::runtime
|
||||
Gnuradio::blocks
|
||||
Volk::volk ${ORC_LIBRARIES}
|
||||
|
@ -28,9 +28,8 @@ add_library(signal_generator_adapters
|
||||
|
||||
target_link_libraries(signal_generator_adapters
|
||||
PUBLIC
|
||||
signal_generator_blocks
|
||||
Gnuradio::runtime
|
||||
Gnuradio::blocks
|
||||
signal_generator_blocks
|
||||
gnss_rx
|
||||
PRIVATE
|
||||
Gflags::gflags
|
||||
|
@ -32,8 +32,8 @@ target_link_libraries(signal_generator_blocks
|
||||
Gnuradio::runtime
|
||||
gnss_system_parameters
|
||||
PRIVATE
|
||||
gnss_sp_libs
|
||||
Volkgnsssdr::volkgnsssdr
|
||||
gnss_sp_libs
|
||||
)
|
||||
|
||||
target_include_directories(signal_generator_blocks
|
||||
|
@ -60,9 +60,9 @@ add_library(signal_source_gr_blocks
|
||||
|
||||
target_link_libraries(signal_source_gr_blocks
|
||||
PUBLIC
|
||||
signal_source_lib
|
||||
Gnuradio::runtime
|
||||
Boost::thread
|
||||
Gnuradio::runtime
|
||||
signal_source_lib
|
||||
PRIVATE
|
||||
Gflags::gflags
|
||||
Glog::glog
|
||||
|
@ -50,12 +50,12 @@ add_library(telemetry_decoder_gr_blocks
|
||||
|
||||
target_link_libraries(telemetry_decoder_gr_blocks
|
||||
PUBLIC
|
||||
Gnuradio::runtime
|
||||
Volkgnsssdr::volkgnsssdr
|
||||
telemetry_decoder_libswiftcnav
|
||||
telemetry_decoder_lib
|
||||
gnss_system_parameters
|
||||
gnss_rx
|
||||
Gnuradio::runtime
|
||||
Volkgnsssdr::volkgnsssdr
|
||||
PRIVATE
|
||||
Boost::boost
|
||||
Gflags::gflags
|
||||
|
Loading…
Reference in New Issue
Block a user