mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-16 04:05:46 +00:00
Code Issues Releases Wiki Activity

Improve target design

Browse Source
This commit is contained in:
Carles Fernandez 2019-02-10 01:13:02 +01:00
parent f1bb647124
commit ce051e040f
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
33 changed files with 292 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/algorithms/PVT/adapters/CMakeLists.txt
View File

@ -36,11 +36,15 @@ target_link_libraries(pvt_adapters
pvt_gr_blocks pvt_gr_blocks
pvt_lib pvt_lib
gnss_system_parameters gnss_system_parameters
gnss_rx
PRIVATE PRIVATE
Boost::serialization Boost::serialization
) )
target_include_directories(pvt_adapters
PUBLIC
${CMAKE_SOURCE_DIR}/src/core/interfaces
)
if(Boost_VERSION LESS 105800) if(Boost_VERSION LESS 105800)
target_compile_definitions(pvt_adapters PRIVATE -DOLD_BOOST=1) target_compile_definitions(pvt_adapters PRIVATE -DOLD_BOOST=1)
endif() endif()

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

@ -33,19 +33,17 @@ target_link_libraries(pvt_gr_blocks
Boost::date_time Boost::date_time
Gnuradio::runtime Gnuradio::runtime
pvt_lib pvt_lib
gnss_system_parameters
gnss_rx
PRIVATE PRIVATE
Gflags::gflags Gflags::gflags
Glog::glog Glog::glog
Boost::filesystem Boost::filesystem
Boost::system Boost::system
gnss_system_parameters
) )
target_include_directories(pvt_gr_blocks target_include_directories(pvt_gr_blocks
PUBLIC PUBLIC
${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs
${CMAKE_SOURCE_DIR}/src/core/system_parameters
) )
if(Boost_VERSION LESS 105800) if(Boost_VERSION LESS 105800)

2
src/algorithms/PVT/libs/CMakeLists.txt
View File

@ -62,7 +62,6 @@ target_link_libraries(pvt_lib
gnss_sp_libs gnss_sp_libs
rtklib_lib rtklib_lib
gnss_system_parameters gnss_system_parameters
gnss_rx
PRIVATE PRIVATE
Boost::filesystem Boost::filesystem
Boost::system Boost::system
@ -75,6 +74,7 @@ target_include_directories(pvt_lib
PUBLIC PUBLIC
${CMAKE_SOURCE_DIR}/src/algorithms/libs ${CMAKE_SOURCE_DIR}/src/algorithms/libs
${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib ${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib
${CMAKE_SOURCE_DIR}/src/core/receiver
) )
target_compile_definitions(pvt_lib PRIVATE -DGNSS_SDR_VERSION="${VERSION}") target_compile_definitions(pvt_lib PRIVATE -DGNSS_SDR_VERSION="${VERSION}")

6
src/algorithms/acquisition/adapters/CMakeLists.txt
View File

@ -96,7 +96,6 @@ target_link_libraries(acq_adapters
gnss_sp_libs gnss_sp_libs
gnss_sdr_flags gnss_sdr_flags
acq_gr_blocks acq_gr_blocks
rx_core_lib
gnss_system_parameters gnss_system_parameters
PRIVATE PRIVATE
Boost::boost Boost::boost
@ -106,6 +105,11 @@ target_link_libraries(acq_adapters
acquisition_lib acquisition_lib
) )
target_include_directories(acq_adapters
PUBLIC
${CMAKE_SOURCE_DIR}/src/core/interfaces
)
set_property(TARGET acq_adapters set_property(TARGET acq_adapters
APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>

10
src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
View File

@ -81,15 +81,19 @@ target_link_libraries(acq_gr_blocks
Matio::matio Matio::matio
Volkgnsssdr::volkgnsssdr Volkgnsssdr::volkgnsssdr
gnss_sp_libs gnss_sp_libs
gnss_rx )
target_include_directories(acq_gr_blocks
PUBLIC
${CMAKE_SOURCE_DIR}/src/algorithms/libs
PRIVATE
${CMAKE_SOURCE_DIR}/src/core/receiver
) )
if(OPENCL_FOUND) if(OPENCL_FOUND)
target_include_directories(acq_gr_blocks PUBLIC ${OPENCL_INCLUDE_DIRS}) target_include_directories(acq_gr_blocks PUBLIC ${OPENCL_INCLUDE_DIRS})
endif() endif()
target_include_directories(acq_gr_blocks PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
set_property(TARGET acq_gr_blocks set_property(TARGET acq_gr_blocks
APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>

1
src/algorithms/acquisition/libs/CMakeLists.txt
View File

@ -43,7 +43,6 @@ target_link_libraries(acquisition_lib
Glog::glog Glog::glog
gnss_sp_libs gnss_sp_libs
gnss_system_parameters gnss_system_parameters
gnss_rx
) )
set_property(TARGET acquisition_lib set_property(TARGET acquisition_lib

6
src/algorithms/channel/adapters/CMakeLists.txt
View File

@ -30,13 +30,17 @@ target_link_libraries(channel_adapters
PUBLIC PUBLIC
Gnuradio::runtime Gnuradio::runtime
channel_fsm channel_fsm
gnss_rx
PRIVATE PRIVATE
Gflags::gflags Gflags::gflags
Glog::glog Glog::glog
gnss_sdr_flags gnss_sdr_flags
) )
target_include_directories(channel_adapters
PUBLIC
${CMAKE_SOURCE_DIR}/src/core/interfaces
)
set_property(TARGET channel_adapters set_property(TARGET channel_adapters
APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>

3
src/algorithms/channel/libs/CMakeLists.txt
View File

@ -36,10 +36,11 @@ add_library(channel_fsm ${CHANNEL_FSM_SOURCES} ${CHANNEL_FSM_HEADERS})
target_link_libraries(channel_fsm target_link_libraries(channel_fsm
PUBLIC PUBLIC
Gnuradio::runtime Gnuradio::runtime
gnss_rx gnss_system_parameters
PRIVATE PRIVATE
Gflags::gflags Gflags::gflags
Glog::glog Glog::glog
gnss_rx
) )
set_property(TARGET channel_fsm set_property(TARGET channel_fsm

6
src/algorithms/conditioner/adapters/CMakeLists.txt
View File

@ -37,12 +37,16 @@ add_library(conditioner_adapters ${COND_ADAPTER_SOURCES} ${COND_ADAPTER_HEADERS}
target_link_libraries(conditioner_adapters target_link_libraries(conditioner_adapters
PUBLIC PUBLIC
Gnuradio::runtime Gnuradio::runtime
gnss_rx
PRIVATE PRIVATE
Gflags::gflags Gflags::gflags
Glog::glog Glog::glog
) )
target_include_directories(conditioner_adapters
PUBLIC
${CMAKE_SOURCE_DIR}/src/core/interfaces
)
set_property(TARGET conditioner_adapters set_property(TARGET conditioner_adapters
APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>

2
src/algorithms/data_type_adapter/adapters/CMakeLists.txt
View File

@ -51,7 +51,6 @@ target_link_libraries(datatype_adapters
data_type_gr_blocks data_type_gr_blocks
gnss_sp_libs gnss_sp_libs
gnss_system_parameters gnss_system_parameters
gnss_rx
PRIVATE PRIVATE
Gflags::gflags Gflags::gflags
Glog::glog Glog::glog
@ -61,6 +60,7 @@ target_link_libraries(datatype_adapters
target_include_directories(datatype_adapters target_include_directories(datatype_adapters
PUBLIC PUBLIC
${CMAKE_SOURCE_DIR}/src/algorithms/libs ${CMAKE_SOURCE_DIR}/src/algorithms/libs
${CMAKE_SOURCE_DIR}/src/core/interfaces
) )
set_property(TARGET datatype_adapters set_property(TARGET datatype_adapters

5
src/algorithms/input_filter/adapters/CMakeLists.txt
View File

@ -50,13 +50,14 @@ target_link_libraries(input_filter_adapters
Gnuradio::filter Gnuradio::filter
input_filter_gr_blocks input_filter_gr_blocks
gnss_sp_libs gnss_sp_libs
gnss_rx
PRIVATE PRIVATE
Volk::volk Volk::volk
) )
target_include_directories(input_filter_adapters target_include_directories(input_filter_adapters
PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs PUBLIC
${CMAKE_SOURCE_DIR}/src/algorithms/libs
${CMAKE_SOURCE_DIR}/src/core/interfaces
) )
if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4") if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")

11
src/algorithms/libs/CMakeLists.txt
View File

@ -22,7 +22,6 @@ set(GNSS_SPLIBS_SOURCES
gps_l2c_signal.cc gps_l2c_signal.cc
gps_l5_signal.cc gps_l5_signal.cc
galileo_e1_signal_processing.cc galileo_e1_signal_processing.cc
gnss_sdr_valve.cc
gnss_sdr_sample_counter.cc gnss_sdr_sample_counter.cc
gnss_signal_processing.cc gnss_signal_processing.cc
gps_sdr_signal_processing.cc gps_sdr_signal_processing.cc
@ -41,13 +40,13 @@ set(GNSS_SPLIBS_SOURCES
conjugate_ic.cc conjugate_ic.cc
gnss_sdr_create_directory.cc gnss_sdr_create_directory.cc
geofunctions.cc geofunctions.cc
rtcm.cc
) )
set(GNSS_SPLIBS_HEADERS set(GNSS_SPLIBS_HEADERS
gps_l2c_signal.h gps_l2c_signal.h
gps_l5_signal.h gps_l5_signal.h
galileo_e1_signal_processing.h galileo_e1_signal_processing.h
gnss_sdr_valve.h
gnss_sdr_sample_counter.h gnss_sdr_sample_counter.h
gnss_signal_processing.h gnss_signal_processing.h
gps_sdr_signal_processing.h gps_sdr_signal_processing.h
@ -67,6 +66,7 @@ set(GNSS_SPLIBS_HEADERS
gnss_sdr_create_directory.h gnss_sdr_create_directory.h
gnss_circular_deque.h gnss_circular_deque.h
geofunctions.h geofunctions.h
rtcm.h
) )
if(ENABLE_FPGA) if(ENABLE_FPGA)
@ -122,7 +122,12 @@ target_link_libraries(gnss_sp_libs
Boost::filesystem Boost::filesystem
Gflags::gflags Gflags::gflags
Glog::glog Glog::glog
gnss_rx )
target_include_directories(gnss_sp_libs
PUBLIC
${CMAKE_SOURCE_DIR}/src/core/interfaces
${CMAKE_SOURCE_DIR}/src/core/receiver
) )
target_compile_definitions(gnss_sp_libs target_compile_definitions(gnss_sp_libs

0
src/core/system_parameters/rtcm.cc → src/algorithms/libs/rtcm.cc
View File

0
src/core/system_parameters/rtcm.h → src/algorithms/libs/rtcm.h
View File

8
src/algorithms/libs/rtklib/CMakeLists.txt
View File

@ -1,4 +1,4 @@
# Copyright (C) 2012-2018 (see AUTHORS file for a list of contributors) # Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors)
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #
@ -65,20 +65,14 @@ source_group(Headers FILES ${RTKLIB_LIB_HEADERS})
add_library(rtklib_lib ${RTKLIB_LIB_SOURCES} ${RTKLIB_LIB_HEADERS}) add_library(rtklib_lib ${RTKLIB_LIB_SOURCES} ${RTKLIB_LIB_HEADERS})
if(OS_IS_MACOSX)
set(MAC_LIBRARIES "-framework Accelerate")
endif()
target_link_libraries(rtklib_lib target_link_libraries(rtklib_lib
PUBLIC PUBLIC
gnss_rx
gnss_system_parameters gnss_system_parameters
PRIVATE PRIVATE
Gflags::gflags Gflags::gflags
Glog::glog Glog::glog
${BLAS} ${BLAS}
${LAPACK} ${LAPACK}
${MAC_LIBRARIES}
) )
set_property(TARGET rtklib_lib set_property(TARGET rtklib_lib

2
src/algorithms/observables/adapters/CMakeLists.txt
View File

@ -31,12 +31,12 @@ add_library(obs_adapters ${OBS_ADAPTER_SOURCES} ${OBS_ADAPTER_HEADERS})
target_include_directories(obs_adapters target_include_directories(obs_adapters
PUBLIC PUBLIC
${CMAKE_SOURCE_DIR}/src/algorithms/libs ${CMAKE_SOURCE_DIR}/src/algorithms/libs
${CMAKE_SOURCE_DIR}/src/core/interfaces
) )
target_link_libraries(obs_adapters target_link_libraries(obs_adapters
PUBLIC PUBLIC
obs_gr_blocks obs_gr_blocks
gnss_rx
gnss_sp_libs gnss_sp_libs
PRIVATE PRIVATE
Gflags::gflags Gflags::gflags

6
src/algorithms/resampler/adapters/CMakeLists.txt
View File

@ -41,13 +41,17 @@ target_link_libraries(resampler_adapters
PUBLIC PUBLIC
Gnuradio::runtime Gnuradio::runtime
resampler_gr_blocks resampler_gr_blocks
gnss_rx
PRIVATE PRIVATE
Gflags::gflags Gflags::gflags
Glog::glog Glog::glog
Volk::volk Volk::volk
) )
target_include_directories(resampler_adapters
PUBLIC
${CMAKE_SOURCE_DIR}/src/core/interfaces
)
if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4") if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
target_compile_definitions(resampler_adapters PUBLIC -DGR_GREATER_38=1) target_compile_definitions(resampler_adapters PUBLIC -DGR_GREATER_38=1)
endif() endif()

6
src/algorithms/signal_generator/adapters/CMakeLists.txt
View File

@ -30,13 +30,17 @@ target_link_libraries(signal_generator_adapters
PUBLIC PUBLIC
Gnuradio::blocks Gnuradio::blocks
signal_generator_blocks signal_generator_blocks
gnss_rx
PRIVATE PRIVATE
Gflags::gflags Gflags::gflags
Glog::glog Glog::glog
gnss_sp_libs gnss_sp_libs
) )
target_include_directories(signal_generator_adapters
PUBLIC
${CMAKE_SOURCE_DIR}/src/core/interfaces
)
set_property(TARGET signal_generator_adapters set_property(TARGET signal_generator_adapters
APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>

7
src/algorithms/signal_source/adapters/CMakeLists.txt
View File

@ -179,7 +179,8 @@ add_library(signal_source_adapters
) )
target_include_directories(signal_source_adapters target_include_directories(signal_source_adapters
PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs PUBLIC
${CMAKE_SOURCE_DIR}/src/core/interfaces
) )
target_link_libraries(signal_source_adapters target_link_libraries(signal_source_adapters
@ -189,9 +190,9 @@ target_link_libraries(signal_source_adapters
Gnuradio::blocks Gnuradio::blocks
signal_source_gr_blocks signal_source_gr_blocks
signal_source_lib signal_source_lib
gnss_sp_libs
gnss_rx
PRIVATE PRIVATE
gnss_sdr_flags
gnss_system_parameters
Gflags::gflags Gflags::gflags
Glog::glog Glog::glog
Volk::volk Volk::volk

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

@ -75,6 +75,6 @@ if(ENABLE_RAW_UDP AND PCAP_FOUND)
) )
endif() endif()
set_property(TARGET signal_source_gr_blocks APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES set_property(TARGET signal_source_gr_blocks APPEND PROPERTY
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> INTERFACE_INCLUDE_DIRECTORIES $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
) )

4
src/algorithms/signal_source/libs/CMakeLists.txt
View File

@ -49,12 +49,14 @@ endif()
set(SIGNAL_SOURCE_LIB_SOURCES set(SIGNAL_SOURCE_LIB_SOURCES
rtl_tcp_commands.cc rtl_tcp_commands.cc
rtl_tcp_dongle_info.cc rtl_tcp_dongle_info.cc
gnss_sdr_valve.cc
${OPT_SIGNAL_SOURCE_LIB_SOURCES} ${OPT_SIGNAL_SOURCE_LIB_SOURCES}
) )
set(SIGNAL_SOURCE_LIB_HEADERS set(SIGNAL_SOURCE_LIB_HEADERS
rtl_tcp_commands.h rtl_tcp_commands.h
rtl_tcp_dongle_info.h rtl_tcp_dongle_info.h
gnss_sdr_valve.h
${OPT_SIGNAL_SOURCE_LIB_HEADERS} ${OPT_SIGNAL_SOURCE_LIB_HEADERS}
) )
@ -68,9 +70,11 @@ add_library(signal_source_lib ${SIGNAL_SOURCE_LIB_SOURCES} ${SIGNAL_SOURCE_LIB_H
target_link_libraries(signal_source_lib target_link_libraries(signal_source_lib
PUBLIC PUBLIC
Boost::boost Boost::boost
Gnuradio::runtime
PRIVATE PRIVATE
Gflags::gflags Gflags::gflags
Glog::glog Glog::glog
gnss_rx
) )
if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2) if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2)

0
src/algorithms/libs/gnss_sdr_valve.cc → src/algorithms/signal_source/libs/gnss_sdr_valve.cc
View File

0
src/algorithms/libs/gnss_sdr_valve.h → src/algorithms/signal_source/libs/gnss_sdr_valve.h
View File

6
src/algorithms/telemetry_decoder/adapters/CMakeLists.txt
View File

@ -55,7 +55,6 @@ target_link_libraries(telemetry_decoder_adapters
PUBLIC PUBLIC
telemetry_decoder_gr_blocks telemetry_decoder_gr_blocks
gnss_system_parameters gnss_system_parameters
gnss_rx
PRIVATE PRIVATE
Gflags::gflags Gflags::gflags
Glog::glog Glog::glog
@ -63,6 +62,11 @@ target_link_libraries(telemetry_decoder_adapters
telemetry_decoder_lib telemetry_decoder_lib
) )
target_include_directories(telemetry_decoder_adapters
PUBLIC
${CMAKE_SOURCE_DIR}/src/core/interfaces
)
set_property(TARGET telemetry_decoder_adapters set_property(TARGET telemetry_decoder_adapters
APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>

1
src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt
View File

@ -55,7 +55,6 @@ target_link_libraries(telemetry_decoder_gr_blocks
telemetry_decoder_libswiftcnav telemetry_decoder_libswiftcnav
telemetry_decoder_lib telemetry_decoder_lib
gnss_system_parameters gnss_system_parameters
gnss_rx
PRIVATE PRIVATE
Boost::boost Boost::boost
Gflags::gflags Gflags::gflags

3
src/algorithms/telemetry_decoder/libs/CMakeLists.txt
View File

@ -39,9 +39,6 @@ add_library(telemetry_decoder_lib
) )
target_link_libraries(telemetry_decoder_lib target_link_libraries(telemetry_decoder_lib
PUBLIC
gnss_system_parameters
gnss_rx
PRIVATE PRIVATE
Gflags::gflags Gflags::gflags
Glog::glog Glog::glog

5
src/algorithms/tracking/adapters/CMakeLists.txt
View File

@ -100,6 +100,11 @@ target_link_libraries(tracking_adapters
gnss_sdr_flags gnss_sdr_flags
) )
target_include_directories(tracking_adapters
PUBLIC
${CMAKE_SOURCE_DIR}/src/core/interfaces
)
if(ENABLE_CUDA) if(ENABLE_CUDA)
target_link_libraries(tracking_adapters target_link_libraries(tracking_adapters
PUBLIC PUBLIC

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

@ -88,7 +88,6 @@ target_link_libraries(tracking_gr_blocks
Volkgnsssdr::volkgnsssdr Volkgnsssdr::volkgnsssdr
gnss_sdr_flags gnss_sdr_flags
gnss_sp_libs gnss_sp_libs
gnss_rx
tracking_lib tracking_lib
) )

17
src/core/libs/supl/CMakeLists.txt
View File

@ -35,18 +35,25 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_C_FLAGS}")
add_library(supl_library STATIC ${ASN_RRLP_SOURCES} ${ASN_SUPL_SOURCES} ${SUPL_SOURCES}) add_library(supl_library STATIC ${ASN_RRLP_SOURCES} ${ASN_SUPL_SOURCES} ${SUPL_SOURCES})
if(OPENSSL_FOUND)
target_compile_definitions(supl_library PUBLIC -DUSE_OPENSSL_FALLBACK=1)
endif()
target_link_libraries(supl_library target_link_libraries(supl_library
PUBLIC PUBLIC
${GNUTLS_LIBRARIES} ${GNUTLS_LIBRARIES}
${GNUTLS_OPENSSL_LIBRARY} ${GNUTLS_OPENSSL_LIBRARY}
gnss_system_parameters )
target_include_directories(supl_library
PUBLIC
${GNUTLS_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl
${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp
) )
set_target_properties(supl_library PROPERTIES set_target_properties(supl_library PROPERTIES
LINKER_LANGUAGE C LINKER_LANGUAGE C
INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl;${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp;${GNUTLS_INCLUDE_DIR}" INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl;${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp;${GNUTLS_INCLUDE_DIR}"
) )
if(OPENSSL_FOUND)
target_compile_definitions(supl_library PUBLIC -DUSE_OPENSSL_FALLBACK=1)
endif()

1
src/core/receiver/CMakeLists.txt
View File

@ -142,7 +142,6 @@ target_link_libraries(gnss_rx
Gnuradio::runtime Gnuradio::runtime
rx_core_lib rx_core_lib
core_monitor_lib core_monitor_lib
gnss_system_parameters
PRIVATE PRIVATE
Boost::chrono Boost::chrono
Gflags::gflags Gflags::gflags

3
src/core/system_parameters/CMakeLists.txt
View File

@ -45,7 +45,6 @@ set(SYSTEM_PARAMETERS_SOURCES
gps_cnav_navigation_message.cc gps_cnav_navigation_message.cc
gps_cnav_iono.cc gps_cnav_iono.cc
gps_cnav_utc_model.cc gps_cnav_utc_model.cc
rtcm.cc
glonass_gnav_ephemeris.cc glonass_gnav_ephemeris.cc
glonass_gnav_almanac.cc glonass_gnav_almanac.cc
glonass_gnav_utc_model.cc glonass_gnav_utc_model.cc
@ -75,7 +74,6 @@ set(SYSTEM_PARAMETERS_HEADERS
gps_cnav_navigation_message.h gps_cnav_navigation_message.h
gps_cnav_iono.h gps_cnav_iono.h
gps_cnav_utc_model.h gps_cnav_utc_model.h
rtcm.h
glonass_gnav_ephemeris.h glonass_gnav_ephemeris.h
glonass_gnav_almanac.h glonass_gnav_almanac.h
glonass_gnav_utc_model.h glonass_gnav_utc_model.h
@ -115,7 +113,6 @@ target_link_libraries(gnss_system_parameters
Boost::date_time Boost::date_time
Boost::serialization Boost::serialization
Glog::glog Glog::glog
gnss_rx
PRIVATE PRIVATE
Gflags::gflags Gflags::gflags
) )

2
src/main/CMakeLists.txt
View File

@ -34,7 +34,7 @@ target_compile_definitions(gnss-sdr PRIVATE -DGNSS_SDR_VERSION="${VERSION}")
# Disable internal logging # Disable internal logging
if(NOT ENABLE_LOG) if(NOT ENABLE_LOG)
target_compile_definitions(gnss-sdr PRIVATE -DGOOGLE_STRIP_LOG=1) target_compile_definitions(gnss-sdr PUBLIC -DGOOGLE_STRIP_LOG=1)
endif() endif()
if(ENABLE_CUDA) if(ENABLE_CUDA)

115
src/tests/CMakeLists.txt
View File

@ -362,9 +362,9 @@ if(ENABLE_UNIT_TESTING)
Matio::matio Matio::matio
Volk::volk Volk::volk
Volkgnsssdr::volkgnsssdr Volkgnsssdr::volkgnsssdr
gnss_sp_libs
core_monitor_lib
signal_source_adapters signal_source_adapters
signal_source_gr_blocks
signal_source_lib
datatype_adapters datatype_adapters
input_filter_adapters input_filter_adapters
resampler_adapters resampler_adapters
@ -377,10 +377,12 @@ if(ENABLE_UNIT_TESTING)
signal_generator_adapters signal_generator_adapters
pvt_adapters pvt_adapters
pvt_lib pvt_lib
gnss_sp_libs
core_monitor_lib
signal_processing_testing_lib signal_processing_testing_lib
system_testing_lib system_testing_lib
gnss_system_parameters
gnss_rx gnss_rx
gnss_system_parameters
) )
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,12 +437,12 @@ if(ENABLE_FPGA)
Matio::matio Matio::matio
Volk::volk Volk::volk
channel_fsm channel_fsm
gnss_sp_libs
datatype_adapters datatype_adapters
signal_processing_testing_lib
tracking_adapters tracking_adapters
gnss_system_parameters signal_processing_testing_lib
gnss_sp_libs
gnss_rx gnss_rx
gnss_system_parameters
) )
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
@ -496,7 +498,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_system_parameters gnss_rx gnss_rx gnss_system_parameters
) )
add_system_test(ttff) add_system_test(ttff)
@ -507,7 +509,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_system_parameters gnss_rx gnss_sp_libs gnss_rx gnss_system_parameters
system_testing_lib signal_processing_testing_lib system_testing_lib signal_processing_testing_lib
) )
add_system_test(position_test) add_system_test(position_test)
@ -534,10 +536,14 @@ endif()
set(CMAKE_CTEST_COMMAND ctest -V) set(CMAKE_CTEST_COMMAND ctest -V)
add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}) add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
add_executable(flowgraph_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc if(NOT ENABLE_PACKAGING)
${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/gnss_flowgraph_test.cc) add_executable(flowgraph_test
${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/gnss_flowgraph_test.cc
)
target_link_libraries(flowgraph_test PUBLIC target_link_libraries(flowgraph_test
PUBLIC
Boost::filesystem Boost::filesystem
Boost::system Boost::system
Boost::thread Boost::thread
@ -547,24 +553,31 @@ target_link_libraries(flowgraph_test PUBLIC
GTest::GTest GTest::GTest
GTest::Main GTest::Main
Volkgnsssdr::volkgnsssdr Volkgnsssdr::volkgnsssdr
gnss_sp_libs
gnss_rx
gnss_system_parameters
signal_source_adapters signal_source_adapters
signal_source_gr_blocks signal_source_gr_blocks
signal_source_lib
input_filter_adapters input_filter_adapters
channel_adapters channel_adapters
gnss_rx
gnss_sp_libs
gnss_system_parameters
) )
target_include_directories(flowgraph_test PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs) target_include_directories(flowgraph_test
PUBLIC
${CMAKE_SOURCE_DIR}/src/algorithms/libs
)
add_test(flowgraph_test flowgraph_test) add_test(flowgraph_test flowgraph_test)
set_property(TEST flowgraph_test PROPERTY TIMEOUT 30) set_property(TEST flowgraph_test PROPERTY TIMEOUT 30)
endif()
######################################################### #########################################################
if(NOT ENABLE_PACKAGING)
add_executable(gnss_block_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc add_executable(gnss_block_test
${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/sources/file_signal_source_test.cc ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/sources/file_signal_source_test.cc
${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc
${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/pulse_blanking_filter_test.cc ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/pulse_blanking_filter_test.cc
@ -574,7 +587,9 @@ add_executable(gnss_block_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/adapter/adapter_test.cc ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/adapter/adapter_test.cc
${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/gnss_block_factory_test.cc ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/gnss_block_factory_test.cc
) )
target_link_libraries(gnss_block_test PUBLIC
target_link_libraries(gnss_block_test
PUBLIC
Boost::filesystem Boost::filesystem
Boost::system Boost::system
Boost::thread Boost::thread
@ -588,12 +603,14 @@ target_link_libraries(gnss_block_test PUBLIC
GTest::Main GTest::Main
Volkgnsssdr::volkgnsssdr Volkgnsssdr::volkgnsssdr
signal_source_adapters signal_source_adapters
signal_source_gr_blocks
signal_source_lib
datatype_adapters datatype_adapters
input_filter_adapters input_filter_adapters
channel_adapters channel_adapters
gnss_rx
gnss_sp_libs gnss_sp_libs
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)
@ -601,13 +618,18 @@ target_include_directories(gnss_block_test PUBLIC ${CMAKE_SOURCE_DIR}/src/algori
add_test(gnss_block_test gnss_block_test) add_test(gnss_block_test gnss_block_test)
set_property(TEST gnss_block_test PROPERTY TIMEOUT 60) set_property(TEST gnss_block_test PROPERTY TIMEOUT 60)
endif()
######################################################### #########################################################
if(NOT ENABLE_PACKAGING)
add_executable(gnuradio_block_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc add_executable(gnuradio_block_test
${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/sources/unpack_2bit_samples_test.cc ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/sources/unpack_2bit_samples_test.cc
) )
target_link_libraries(gnuradio_block_test PUBLIC
target_link_libraries(gnuradio_block_test
PUBLIC
Boost::filesystem Boost::filesystem
Boost::system Boost::system
Boost::thread Boost::thread
@ -620,21 +642,25 @@ target_link_libraries(gnuradio_block_test PUBLIC
GTest::GTest GTest::GTest
GTest::Main GTest::Main
Volkgnsssdr::volkgnsssdr Volkgnsssdr::volkgnsssdr
gnss_sp_libs
signal_source_gr_blocks signal_source_gr_blocks
gnss_system_parameters signal_source_lib
gnss_rx gnss_rx
gnss_sp_libs
gnss_system_parameters
) )
add_test(gnuradio_block_test gnuradio_block_test) add_test(gnuradio_block_test gnuradio_block_test)
set_property(TEST gnuradio_block_test PROPERTY TIMEOUT 30) set_property(TEST gnuradio_block_test PROPERTY TIMEOUT 30)
endif()
######################################################### #########################################################
add_executable(matio_test
add_executable(matio_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/arithmetic/matio_test.cc ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/arithmetic/matio_test.cc
) )
target_link_libraries(matio_test target_link_libraries(matio_test
PUBLIC PUBLIC
Gflags::gflags Gflags::gflags
@ -642,19 +668,22 @@ target_link_libraries(matio_test
GTest::GTest GTest::GTest
GTest::Main GTest::Main
Matio::matio Matio::matio
gnss_system_parameters
gnss_rx gnss_rx
gnss_system_parameters
) )
add_test(matio_test matio_test) add_test(matio_test matio_test)
set_property(TEST matio_test PROPERTY TIMEOUT 30) set_property(TEST matio_test PROPERTY TIMEOUT 30)
#########################################################
#########################################################
if(NOT ENABLE_PACKAGING)
add_executable(acq_test add_executable(acq_test
${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc) ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
)
target_link_libraries(acq_test target_link_libraries(acq_test
PUBLIC PUBLIC
Boost::filesystem Boost::filesystem
@ -670,21 +699,26 @@ target_link_libraries(acq_test
GTest::Main GTest::Main
Volkgnsssdr::volkgnsssdr Volkgnsssdr::volkgnsssdr
signal_generator_blocks signal_generator_blocks
signal_source_gr_blocks
signal_source_lib
acq_adapters acq_adapters
acq_gr_blocks acq_gr_blocks
gnss_sp_libs gnss_sp_libs
signal_processing_testing_lib signal_processing_testing_lib
gnss_system_parameters
gnss_rx gnss_rx
gnss_system_parameters
) )
add_test(acq_test acq_test) add_test(acq_test acq_test)
set_property(TEST acq_test PROPERTY TIMEOUT 30) set_property(TEST acq_test PROPERTY TIMEOUT 30)
endif()
######################################################### #########################################################
if(NOT ENABLE_PACKAGING)
add_executable(trk_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc add_executable(trk_test
${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc
${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/tracking_loop_filter_test.cc ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/tracking_loop_filter_test.cc
${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_real_codes_test.cc ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_real_codes_test.cc
@ -705,26 +739,31 @@ target_link_libraries(trk_test
GTest::GTest GTest::GTest
GTest::Main GTest::Main
Volkgnsssdr::volkgnsssdr Volkgnsssdr::volkgnsssdr
signal_source_gr_blocks
signal_source_lib
gnss_sp_libs gnss_sp_libs
tracking_adapters tracking_adapters
signal_generator_blocks signal_generator_blocks
gnss_system_parameters
gnss_rx gnss_rx
gnss_system_parameters
) )
add_test(trk_test trk_test) add_test(trk_test trk_test)
set_property(TEST trk_test PROPERTY TIMEOUT 30) set_property(TEST trk_test PROPERTY TIMEOUT 30)
endif()
######################################################### #########################################################
if(NOT ENABLE_PACKAGING) if(NOT ENABLE_PACKAGING)
add_executable(control_thread_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc add_executable(control_thread_test
${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/control_message_factory_test.cc ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/control_message_factory_test.cc
${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/control_thread_test.cc ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/control_thread_test.cc
) )
target_link_libraries(control_thread_test PUBLIC target_link_libraries(control_thread_test
PUBLIC
Boost::filesystem Boost::filesystem
Boost::system Boost::system
Boost::thread Boost::thread
@ -733,9 +772,11 @@ if(NOT ENABLE_PACKAGING)
GTest::GTest GTest::GTest
GTest::Main GTest::Main
signal_source_adapters signal_source_adapters
signal_source_gr_blocks
signal_source_lib
gnss_sp_libs gnss_sp_libs
gnss_system_parameters
gnss_rx gnss_rx
gnss_system_parameters
) )
add_test(control_thread_test control_thread_test) add_test(control_thread_test control_thread_test)