mirror of
				https://github.com/gnss-sdr/gnss-sdr
				synced 2025-10-31 15:23:04 +00:00 
			
		
		
		
	Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into next
This commit is contained in:
		| @@ -18,33 +18,39 @@ | |||||||
|  |  | ||||||
|  |  | ||||||
| if(Boost_VERSION LESS 105800) | if(Boost_VERSION LESS 105800) | ||||||
|      add_definitions(-DOLD_BOOST=1) |     add_definitions(-DOLD_BOOST=1) | ||||||
| endif(Boost_VERSION LESS 105800) | endif(Boost_VERSION LESS 105800) | ||||||
|  |  | ||||||
| set(PVT_ADAPTER_SOURCES | set(PVT_ADAPTER_SOURCES | ||||||
| 	rtklib_pvt.cc |     rtklib_pvt.cc | ||||||
| ) | ) | ||||||
|  |  | ||||||
| set(PVT_ADAPTER_HEADERS | set(PVT_ADAPTER_HEADERS | ||||||
| 	rtklib_pvt.h |     rtklib_pvt.h | ||||||
| ) | ) | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/system_parameters |     ${CMAKE_SOURCE_DIR}/src/core/system_parameters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/interfaces |     ${CMAKE_SOURCE_DIR}/src/core/interfaces | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/receiver |     ${CMAKE_SOURCE_DIR}/src/core/receiver | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/gnuradio_blocks |     ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/gnuradio_blocks | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib |     ${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/libs | ||||||
|      ${ARMADILLO_INCLUDE_DIRS} |     ${ARMADILLO_INCLUDE_DIRS} | ||||||
|      ${Boost_INCLUDE_DIRS} |     ${Boost_INCLUDE_DIRS} | ||||||
|      ${GLOG_INCLUDE_DIRS} |     ${GLOG_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
|      ${GNURADIO_RUNTIME_INCLUDE_DIRS} |     ${GNURADIO_RUNTIME_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| add_library(pvt_adapters ${PVT_ADAPTER_SOURCES} ${PVT_ADAPTER_HEADERS}) | add_library(pvt_adapters ${PVT_ADAPTER_SOURCES} ${PVT_ADAPTER_HEADERS}) | ||||||
|  |  | ||||||
| source_group(Headers FILES ${PVT_ADAPTER_HEADERS}) | source_group(Headers FILES ${PVT_ADAPTER_HEADERS}) | ||||||
| target_link_libraries(pvt_adapters pvt_gr_blocks ${ARMADILLO_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES}) |  | ||||||
|  | target_link_libraries(pvt_adapters | ||||||
|  |     pvt_gr_blocks | ||||||
|  |     ${ARMADILLO_LIBRARIES} | ||||||
|  |     ${GNURADIO_RUNTIME_LIBRARIES} | ||||||
|  | ) | ||||||
|   | |||||||
| @@ -18,30 +18,30 @@ | |||||||
|  |  | ||||||
|  |  | ||||||
| if(Boost_VERSION LESS 105800) | if(Boost_VERSION LESS 105800) | ||||||
|      add_definitions(-DOLD_BOOST=1) |     add_definitions(-DOLD_BOOST=1) | ||||||
| endif(Boost_VERSION LESS 105800) | endif(Boost_VERSION LESS 105800) | ||||||
|  |  | ||||||
| set(PVT_GR_BLOCKS_SOURCES | set(PVT_GR_BLOCKS_SOURCES | ||||||
| 	rtklib_pvt_cc.cc |     rtklib_pvt_cc.cc | ||||||
| ) | ) | ||||||
|  |  | ||||||
| set(PVT_GR_BLOCKS_HEADERS | set(PVT_GR_BLOCKS_HEADERS | ||||||
| 	rtklib_pvt_cc.h |     rtklib_pvt_cc.h | ||||||
| ) | ) | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/system_parameters |     ${CMAKE_SOURCE_DIR}/src/core/system_parameters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/interfaces |     ${CMAKE_SOURCE_DIR}/src/core/interfaces | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/receiver |     ${CMAKE_SOURCE_DIR}/src/core/receiver | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib |     ${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/libs | ||||||
|      ${ARMADILLO_INCLUDE_DIRS} |     ${ARMADILLO_INCLUDE_DIRS} | ||||||
|      ${Boost_INCLUDE_DIRS} |     ${Boost_INCLUDE_DIRS} | ||||||
|      ${GLOG_INCLUDE_DIRS} |     ${GLOG_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
|      ${GNURADIO_RUNTIME_INCLUDE_DIRS} |     ${GNURADIO_RUNTIME_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| add_library(pvt_gr_blocks ${PVT_GR_BLOCKS_SOURCES} ${PVT_GR_BLOCKS_HEADERS}) | add_library(pvt_gr_blocks ${PVT_GR_BLOCKS_SOURCES} ${PVT_GR_BLOCKS_HEADERS}) | ||||||
|   | |||||||
| @@ -19,47 +19,46 @@ | |||||||
| add_definitions( -DGNSS_SDR_VERSION="${VERSION}" ) | add_definitions( -DGNSS_SDR_VERSION="${VERSION}" ) | ||||||
|  |  | ||||||
| set(PVT_LIB_SOURCES | set(PVT_LIB_SOURCES | ||||||
|      pvt_solution.cc |     pvt_solution.cc | ||||||
|      ls_pvt.cc |     ls_pvt.cc | ||||||
|      hybrid_ls_pvt.cc |     hybrid_ls_pvt.cc | ||||||
|      kml_printer.cc |     kml_printer.cc | ||||||
|      gpx_printer.cc |     gpx_printer.cc | ||||||
|      rinex_printer.cc |     rinex_printer.cc | ||||||
|      nmea_printer.cc |     nmea_printer.cc | ||||||
|      rtcm_printer.cc |     rtcm_printer.cc | ||||||
|      geojson_printer.cc |     geojson_printer.cc | ||||||
|      rtklib_solver.cc |     rtklib_solver.cc | ||||||
|      pvt_conf.cc |     pvt_conf.cc | ||||||
| ) | ) | ||||||
|  |  | ||||||
| set(PVT_LIB_HEADERS | set(PVT_LIB_HEADERS | ||||||
|      pvt_solution.h |     pvt_solution.h | ||||||
|      ls_pvt.h |     ls_pvt.h | ||||||
|      hybrid_ls_pvt.h |     hybrid_ls_pvt.h | ||||||
|      kml_printer.h |     kml_printer.h | ||||||
|      gpx_printer.h |     gpx_printer.h | ||||||
|      rinex_printer.h |     rinex_printer.h | ||||||
|      nmea_printer.h |     nmea_printer.h | ||||||
|      rtcm_printer.h |     rtcm_printer.h | ||||||
|      geojson_printer.h |     geojson_printer.h | ||||||
|      rtklib_solver.h |     rtklib_solver.h | ||||||
|      pvt_conf.h |     pvt_conf.h | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/system_parameters |     ${CMAKE_SOURCE_DIR}/src/core/system_parameters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/interfaces |     ${CMAKE_SOURCE_DIR}/src/core/interfaces | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/receiver |     ${CMAKE_SOURCE_DIR}/src/core/receiver | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/adapters |     ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/adapters | ||||||
|      ${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 | ||||||
|      ${Boost_INCLUDE_DIRS} |     ${Boost_INCLUDE_DIRS} | ||||||
|      ${ARMADILLO_INCLUDE_DIRS} |     ${ARMADILLO_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
|      ${GLOG_INCLUDE_DIRS} |     ${GLOG_INCLUDE_DIRS} | ||||||
|      ${MATIO_INCLUDE_DIRS} |     ${MATIO_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| list(SORT PVT_LIB_HEADERS) | list(SORT PVT_LIB_HEADERS) | ||||||
| @@ -69,9 +68,16 @@ add_library(pvt_lib ${PVT_LIB_SOURCES} ${PVT_LIB_HEADERS}) | |||||||
| source_group(Headers FILES ${PVT_LIB_HEADERS}) | source_group(Headers FILES ${PVT_LIB_HEADERS}) | ||||||
|  |  | ||||||
| if(MATIO_FOUND) | if(MATIO_FOUND) | ||||||
|     add_dependencies(pvt_lib glog-${glog_RELEASE} armadillo-${armadillo_RELEASE}) |     add_dependencies(pvt_lib | ||||||
|  |         glog-${glog_RELEASE} | ||||||
|  |         armadillo-${armadillo_RELEASE} | ||||||
|  |     ) | ||||||
| else(MATIO_FOUND) | else(MATIO_FOUND) | ||||||
|     add_dependencies(pvt_lib glog-${glog_RELEASE} armadillo-${armadillo_RELEASE} matio-${GNSSSDR_MATIO_LOCAL_VERSION}) |     add_dependencies(pvt_lib | ||||||
|  |         glog-${glog_RELEASE} | ||||||
|  |         armadillo-${armadillo_RELEASE} | ||||||
|  |         matio-${GNSSSDR_MATIO_LOCAL_VERSION} | ||||||
|  |     ) | ||||||
| endif(MATIO_FOUND) | endif(MATIO_FOUND) | ||||||
|  |  | ||||||
| target_link_libraries( | target_link_libraries( | ||||||
|   | |||||||
| @@ -55,45 +55,60 @@ set(ACQ_ADAPTER_HEADERS | |||||||
|     glonass_l2_ca_pcps_acquisition.h |     glonass_l2_ca_pcps_acquisition.h | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  |  | ||||||
| if(ENABLE_FPGA) | if(ENABLE_FPGA) | ||||||
|     set(ACQ_ADAPTER_SOURCES ${ACQ_ADAPTER_SOURCES} gps_l1_ca_pcps_acquisition_fpga.cc |     set(ACQ_ADAPTER_SOURCES ${ACQ_ADAPTER_SOURCES} | ||||||
|                                                    gps_l2_m_pcps_acquisition_fpga.cc |         gps_l1_ca_pcps_acquisition_fpga.cc | ||||||
|                                                    galileo_e1_pcps_ambiguous_acquisition_fpga.cc |         gps_l2_m_pcps_acquisition_fpga.cc | ||||||
|                                                    galileo_e5a_pcps_acquisition_fpga.cc |         galileo_e1_pcps_ambiguous_acquisition_fpga.cc | ||||||
|                                                    gps_l5i_pcps_acquisition_fpga.cc) |         galileo_e5a_pcps_acquisition_fpga.cc | ||||||
|  |         gps_l5i_pcps_acquisition_fpga.cc | ||||||
|     set(ACQ_ADAPTER_HEADERS ${ACQ_ADAPTER_HEADERS} gps_l1_ca_pcps_acquisition_fpga.h |     ) | ||||||
|                                                    gps_l2_m_pcps_acquisition_fpga.h |     set(ACQ_ADAPTER_HEADERS ${ACQ_ADAPTER_HEADERS} | ||||||
|                                                    galileo_e1_pcps_ambiguous_acquisition_fpga.h |         gps_l1_ca_pcps_acquisition_fpga.h | ||||||
|                                                    galileo_e5a_pcps_acquisition_fpga.h |         gps_l2_m_pcps_acquisition_fpga.h | ||||||
|                                                    gps_l5i_pcps_acquisition_fpga.h) |         galileo_e1_pcps_ambiguous_acquisition_fpga.h | ||||||
|  |         galileo_e5a_pcps_acquisition_fpga.h | ||||||
|  |         gps_l5i_pcps_acquisition_fpga.h | ||||||
|  |     ) | ||||||
| endif(ENABLE_FPGA) | endif(ENABLE_FPGA) | ||||||
|  |  | ||||||
| if(OPENCL_FOUND) | if(OPENCL_FOUND) | ||||||
|     set(ACQ_ADAPTER_SOURCES ${ACQ_ADAPTER_SOURCES} gps_l1_ca_pcps_opencl_acquisition.cc) |     set(ACQ_ADAPTER_SOURCES | ||||||
|     set(ACQ_ADAPTER_HEADERS ${ACQ_ADAPTER_HEADERS} gps_l1_ca_pcps_opencl_acquisition.h) |         ${ACQ_ADAPTER_SOURCES} | ||||||
|  |         gps_l1_ca_pcps_opencl_acquisition.cc | ||||||
|  |     ) | ||||||
|  |     set(ACQ_ADAPTER_HEADERS ${ACQ_ADAPTER_HEADERS} | ||||||
|  |         gps_l1_ca_pcps_opencl_acquisition.h | ||||||
|  |     ) | ||||||
| endif(OPENCL_FOUND) | endif(OPENCL_FOUND) | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/system_parameters |     ${CMAKE_SOURCE_DIR}/src/core/system_parameters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/interfaces |     ${CMAKE_SOURCE_DIR}/src/core/interfaces | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/receiver |     ${CMAKE_SOURCE_DIR}/src/core/receiver | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/gnuradio_blocks |     ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/gnuradio_blocks | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/libs | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/libs | ||||||
|      ${Boost_INCLUDE_DIRS} |     ${Boost_INCLUDE_DIRS} | ||||||
|      ${GLOG_INCLUDE_DIRS} |     ${GLOG_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
|      ${ARMADILLO_INCLUDE_DIRS} |     ${ARMADILLO_INCLUDE_DIRS} | ||||||
|      ${GNURADIO_RUNTIME_INCLUDE_DIRS} |     ${GNURADIO_RUNTIME_INCLUDE_DIRS} | ||||||
|      ${GNURADIO_BLOCKS_INCLUDE_DIRS} |     ${GNURADIO_BLOCKS_INCLUDE_DIRS} | ||||||
|      ${VOLK_GNSSSDR_INCLUDE_DIRS} |     ${VOLK_GNSSSDR_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| list(SORT ACQ_ADAPTER_HEADERS) | list(SORT ACQ_ADAPTER_HEADERS) | ||||||
| list(SORT ACQ_ADAPTER_SOURCES) | list(SORT ACQ_ADAPTER_SOURCES) | ||||||
| add_library(acq_adapters ${ACQ_ADAPTER_SOURCES} ${ACQ_ADAPTER_HEADERS}) | add_library(acq_adapters ${ACQ_ADAPTER_SOURCES} ${ACQ_ADAPTER_HEADERS}) | ||||||
| source_group(Headers FILES ${ACQ_ADAPTER_HEADERS}) | source_group(Headers FILES ${ACQ_ADAPTER_HEADERS}) | ||||||
| target_link_libraries(acq_adapters acquisition_lib gnss_sp_libs gnss_sdr_flags acq_gr_blocks ${Boost_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES}) | target_link_libraries(acq_adapters | ||||||
|  |     acquisition_lib | ||||||
|  |     gnss_sp_libs | ||||||
|  |     gnss_sdr_flags | ||||||
|  |     acq_gr_blocks | ||||||
|  |     ${Boost_LIBRARIES} | ||||||
|  |     ${GNURADIO_RUNTIME_LIBRARIES} | ||||||
|  |     ${GNURADIO_BLOCKS_LIBRARIES} | ||||||
|  | ) | ||||||
|   | |||||||
| @@ -50,28 +50,27 @@ if(OPENCL_FOUND) | |||||||
| endif(OPENCL_FOUND) | endif(OPENCL_FOUND) | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/system_parameters |     ${CMAKE_SOURCE_DIR}/src/core/system_parameters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/interfaces |     ${CMAKE_SOURCE_DIR}/src/core/interfaces | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/receiver |     ${CMAKE_SOURCE_DIR}/src/core/receiver | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/libs | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/libs | ||||||
|      ${Boost_INCLUDE_DIRS} |     ${Boost_INCLUDE_DIRS} | ||||||
|      ${GLOG_INCLUDE_DIRS} |     ${GLOG_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
|      ${ARMADILLO_INCLUDE_DIRS} |     ${ARMADILLO_INCLUDE_DIRS} | ||||||
|      ${GNURADIO_RUNTIME_INCLUDE_DIRS} |     ${GNURADIO_RUNTIME_INCLUDE_DIRS} | ||||||
|      ${VOLK_GNSSSDR_INCLUDE_DIRS} |     ${VOLK_GNSSSDR_INCLUDE_DIRS} | ||||||
|      ${MATIO_INCLUDE_DIRS} |     ${MATIO_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  |  | ||||||
| if(OPENCL_FOUND) | if(OPENCL_FOUND) | ||||||
|     include_directories( ${OPENCL_INCLUDE_DIRS} ) |     include_directories(${OPENCL_INCLUDE_DIRS}) | ||||||
|     if(OS_IS_MACOSX) |     if(OS_IS_MACOSX) | ||||||
|          set(OPT_LIBRARIES ${OPT_LIBRARIES} "-framework OpenCL") |         set(OPT_LIBRARIES ${OPT_LIBRARIES} "-framework OpenCL") | ||||||
|     else(OS_IS_MACOSX) |     else(OS_IS_MACOSX) | ||||||
|          set(OPT_LIBRARIES ${OPT_LIBRARIES} ${OPENCL_LIBRARIES}) |         set(OPT_LIBRARIES ${OPT_LIBRARIES} ${OPENCL_LIBRARIES}) | ||||||
|     endif(OS_IS_MACOSX) |     endif(OS_IS_MACOSX) | ||||||
| endif(OPENCL_FOUND) | endif(OPENCL_FOUND) | ||||||
|  |  | ||||||
| @@ -81,9 +80,29 @@ add_library(acq_gr_blocks ${ACQ_GR_BLOCKS_SOURCES} ${ACQ_GR_BLOCKS_HEADERS}) | |||||||
| source_group(Headers FILES ${ACQ_GR_BLOCKS_HEADERS}) | source_group(Headers FILES ${ACQ_GR_BLOCKS_HEADERS}) | ||||||
|  |  | ||||||
| if(ENABLE_FPGA) | if(ENABLE_FPGA) | ||||||
| 	target_link_libraries(acq_gr_blocks acquisition_lib gnss_sp_libs gnss_system_parameters ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_FFT_LIBRARIES} ${VOLK_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${OPT_LIBRARIES} ${OPT_ACQUISITION_LIBRARIES}) |     target_link_libraries(acq_gr_blocks | ||||||
|  |         acquisition_lib | ||||||
|  |         gnss_sp_libs | ||||||
|  |         gnss_system_parameters | ||||||
|  |         ${GNURADIO_RUNTIME_LIBRARIES} | ||||||
|  |         ${GNURADIO_FFT_LIBRARIES} | ||||||
|  |         ${VOLK_LIBRARIES} | ||||||
|  |         ${VOLK_GNSSSDR_LIBRARIES} | ||||||
|  |         ${OPT_LIBRARIES} | ||||||
|  |         ${OPT_ACQUISITION_LIBRARIES} | ||||||
|  |     ) | ||||||
| else(ENABLE_FPGA) | else(ENABLE_FPGA) | ||||||
| 	target_link_libraries(acq_gr_blocks gnss_sp_libs gnss_system_parameters ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_FFT_LIBRARIES} ${VOLK_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${OPT_LIBRARIES} ${OPT_ACQUISITION_LIBRARIES} ${MATIO_LIBRARIES}) |     target_link_libraries(acq_gr_blocks | ||||||
|  |         gnss_sp_libs | ||||||
|  |         gnss_system_parameters | ||||||
|  |         ${GNURADIO_RUNTIME_LIBRARIES} | ||||||
|  |         ${GNURADIO_FFT_LIBRARIES} | ||||||
|  |         ${VOLK_LIBRARIES} | ||||||
|  |         ${VOLK_GNSSSDR_LIBRARIES} | ||||||
|  |         ${OPT_LIBRARIES} | ||||||
|  |         ${MATIO_LIBRARIES} | ||||||
|  |         ${OPT_ACQUISITION_LIBRARIES} | ||||||
|  |     ) | ||||||
| endif(ENABLE_FPGA) | endif(ENABLE_FPGA) | ||||||
|  |  | ||||||
| if(NOT VOLK_GNSSSDR_FOUND) | if(NOT VOLK_GNSSSDR_FOUND) | ||||||
|   | |||||||
| @@ -17,19 +17,19 @@ | |||||||
| # | # | ||||||
|  |  | ||||||
| if(ENABLE_FPGA) | if(ENABLE_FPGA) | ||||||
|    set(ACQUISITION_LIB_SOURCES fpga_acquisition.cc ) |     set(ACQUISITION_LIB_SOURCES fpga_acquisition.cc) | ||||||
|    set(ACQUISITION_LIB_HEADERS fpga_acquisition.h ) |     set(ACQUISITION_LIB_HEADERS fpga_acquisition.h) | ||||||
|    include_directories( |     include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |         ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/system_parameters |         ${CMAKE_SOURCE_DIR}/src/core/system_parameters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/interfaces |         ${CMAKE_SOURCE_DIR}/src/core/interfaces | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/receiver |         ${CMAKE_SOURCE_DIR}/src/core/receiver | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/libs |         ${CMAKE_SOURCE_DIR}/src/algorithms/libs | ||||||
|      ${VOLK_INCLUDE_DIRS} |         ${VOLK_INCLUDE_DIRS} | ||||||
|      ${GLOG_INCLUDE_DIRS} |         ${GLOG_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |         ${GFlags_INCLUDE_DIRS} | ||||||
|      ${VOLK_GNSSSDR_INCLUDE_DIRS} |         ${VOLK_GNSSSDR_INCLUDE_DIRS} | ||||||
|    ) |     ) | ||||||
| endif(ENABLE_FPGA) | endif(ENABLE_FPGA) | ||||||
|  |  | ||||||
| set(ACQUISITION_LIB_HEADERS ${ACQUISITION_LIB_HEADERS} acq_conf.h) | set(ACQUISITION_LIB_HEADERS ${ACQUISITION_LIB_HEADERS} acq_conf.h) | ||||||
| @@ -38,9 +38,19 @@ set(ACQUISITION_LIB_SOURCES ${ACQUISITION_LIB_SOURCES} acq_conf.cc) | |||||||
| list(SORT ACQUISITION_LIB_HEADERS) | list(SORT ACQUISITION_LIB_HEADERS) | ||||||
| list(SORT ACQUISITION_LIB_SOURCES) | list(SORT ACQUISITION_LIB_SOURCES) | ||||||
|  |  | ||||||
| add_library(acquisition_lib ${ACQUISITION_LIB_SOURCES} ${ACQUISITION_LIB_HEADERS}) | add_library(acquisition_lib | ||||||
|  |     ${ACQUISITION_LIB_SOURCES} | ||||||
|  |     ${ACQUISITION_LIB_HEADERS} | ||||||
|  | ) | ||||||
|  |  | ||||||
| source_group(Headers FILES ${ACQUISITION_LIB_HEADERS}) | source_group(Headers FILES ${ACQUISITION_LIB_HEADERS}) | ||||||
| target_link_libraries(acquisition_lib ${VOLK_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES}) |  | ||||||
|  | target_link_libraries(acquisition_lib | ||||||
|  |     ${VOLK_LIBRARIES} | ||||||
|  |     ${VOLK_GNSSSDR_LIBRARIES} | ||||||
|  |     ${GNURADIO_RUNTIME_LIBRARIES} | ||||||
|  | ) | ||||||
|  |  | ||||||
| if(VOLK_GNSSSDR_FOUND) | if(VOLK_GNSSSDR_FOUND) | ||||||
|     add_dependencies(acquisition_lib glog-${glog_RELEASE}) |     add_dependencies(acquisition_lib glog-${glog_RELEASE}) | ||||||
| else(VOLK_GNSSSDR_FOUND) | else(VOLK_GNSSSDR_FOUND) | ||||||
|   | |||||||
| @@ -20,18 +20,28 @@ set(CHANNEL_ADAPTER_SOURCES channel.cc) | |||||||
| set(CHANNEL_ADAPTER_HEADERS channel.h) | set(CHANNEL_ADAPTER_HEADERS channel.h) | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/system_parameters |     ${CMAKE_SOURCE_DIR}/src/core/system_parameters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/interfaces |     ${CMAKE_SOURCE_DIR}/src/core/interfaces | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/receiver |     ${CMAKE_SOURCE_DIR}/src/core/receiver | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/channel/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/channel/libs | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/libs | ||||||
|      ${GLOG_INCLUDE_DIRS} |     ${GLOG_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
|      ${Boost_INCLUDE_DIRS} |     ${Boost_INCLUDE_DIRS} | ||||||
|      ${GNURADIO_RUNTIME_INCLUDE_DIRS} |     ${GNURADIO_RUNTIME_INCLUDE_DIRS} | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | add_library(channel_adapters | ||||||
|  |     ${CHANNEL_ADAPTER_SOURCES} | ||||||
|  |     ${CHANNEL_ADAPTER_HEADERS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| add_library(channel_adapters ${CHANNEL_ADAPTER_SOURCES} ${CHANNEL_ADAPTER_HEADERS}) |  | ||||||
| source_group(Headers FILES ${CHANNEL_ADAPTER_HEADERS}) | source_group(Headers FILES ${CHANNEL_ADAPTER_HEADERS}) | ||||||
| target_link_libraries(channel_adapters channel_fsm ${GNURADIO_RUNTIME_LIBRARIES} ${Boost_LIBRARIES} gnss_sdr_flags) |  | ||||||
|  | target_link_libraries(channel_adapters | ||||||
|  |     channel_fsm | ||||||
|  |     ${GNURADIO_RUNTIME_LIBRARIES} | ||||||
|  |     ${Boost_LIBRARIES} | ||||||
|  |     gnss_sdr_flags | ||||||
|  | ) | ||||||
|   | |||||||
| @@ -19,23 +19,23 @@ | |||||||
| set(CHANNEL_FSM_SOURCES | set(CHANNEL_FSM_SOURCES | ||||||
|     channel_fsm.cc |     channel_fsm.cc | ||||||
|     channel_msg_receiver_cc.cc |     channel_msg_receiver_cc.cc | ||||||
|     ) | ) | ||||||
|  |  | ||||||
| set(CHANNEL_FSM_HEADERS | set(CHANNEL_FSM_HEADERS | ||||||
|     channel_fsm.h |     channel_fsm.h | ||||||
|     channel_msg_receiver_cc.h |     channel_msg_receiver_cc.h | ||||||
|     ) | ) | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/system_parameters |     ${CMAKE_SOURCE_DIR}/src/core/system_parameters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/interfaces |     ${CMAKE_SOURCE_DIR}/src/core/interfaces | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/receiver |     ${CMAKE_SOURCE_DIR}/src/core/receiver | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/channel/adapters |     ${CMAKE_SOURCE_DIR}/src/algorithms/channel/adapters | ||||||
|      ${Boost_INCLUDE_DIRS} |     ${Boost_INCLUDE_DIRS} | ||||||
|      ${GLOG_INCLUDE_DIRS} |     ${GLOG_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
|      ${GNURADIO_RUNTIME_INCLUDE_DIRS} |     ${GNURADIO_RUNTIME_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| list(SORT CHANNEL_FSM_HEADERS) | list(SORT CHANNEL_FSM_HEADERS) | ||||||
|   | |||||||
| @@ -18,25 +18,25 @@ | |||||||
|  |  | ||||||
|  |  | ||||||
| set(COND_ADAPTER_SOURCES | set(COND_ADAPTER_SOURCES | ||||||
| 	signal_conditioner.cc |     signal_conditioner.cc | ||||||
| 	array_signal_conditioner.cc |     array_signal_conditioner.cc | ||||||
| ) | ) | ||||||
|  |  | ||||||
| set(COND_ADAPTER_HEADERS | set(COND_ADAPTER_HEADERS | ||||||
| 	signal_conditioner.h |     signal_conditioner.h | ||||||
| 	array_signal_conditioner.h |     array_signal_conditioner.h | ||||||
| ) | ) | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/system_parameters |     ${CMAKE_SOURCE_DIR}/src/core/system_parameters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/interfaces |     ${CMAKE_SOURCE_DIR}/src/core/interfaces | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/receiver |     ${CMAKE_SOURCE_DIR}/src/core/receiver | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/gnuradio_blocks |     ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/gnuradio_blocks | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/libs | ||||||
|      ${GLOG_INCLUDE_DIRS} |     ${GLOG_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
|      ${GNURADIO_RUNTIME_INCLUDE_DIRS} |     ${GNURADIO_RUNTIME_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| list(SORT COND_ADAPTER_HEADERS) | list(SORT COND_ADAPTER_HEADERS) | ||||||
|   | |||||||
| @@ -23,7 +23,7 @@ set(DATATYPE_ADAPTER_SOURCES | |||||||
|     ibyte_to_complex.cc |     ibyte_to_complex.cc | ||||||
|     ibyte_to_cshort.cc |     ibyte_to_cshort.cc | ||||||
|     ishort_to_cshort.cc |     ishort_to_cshort.cc | ||||||
| 	ishort_to_complex.cc |     ishort_to_complex.cc | ||||||
| ) | ) | ||||||
|  |  | ||||||
| set(DATATYPE_ADAPTER_HEADERS | set(DATATYPE_ADAPTER_HEADERS | ||||||
| @@ -32,25 +32,33 @@ set(DATATYPE_ADAPTER_HEADERS | |||||||
|     ibyte_to_complex.h |     ibyte_to_complex.h | ||||||
|     ibyte_to_cshort.h |     ibyte_to_cshort.h | ||||||
|     ishort_to_cshort.h |     ishort_to_cshort.h | ||||||
| 	ishort_to_complex.h |     ishort_to_complex.h | ||||||
| ) | ) | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/system_parameters |     ${CMAKE_SOURCE_DIR}/src/core/system_parameters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/interfaces |     ${CMAKE_SOURCE_DIR}/src/core/interfaces | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/data_type_adapter/gnuradio_blocks |     ${CMAKE_SOURCE_DIR}/src/algorithms/data_type_adapter/gnuradio_blocks | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/libs | ||||||
|      ${GLOG_INCLUDE_DIRS} |     ${GLOG_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
|      ${GNURADIO_RUNTIME_INCLUDE_DIRS} |     ${GNURADIO_RUNTIME_INCLUDE_DIRS} | ||||||
|      ${VOLK_INCLUDE_DIRS} |     ${VOLK_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| list(SORT DATATYPE_ADAPTER_HEADERS) | list(SORT DATATYPE_ADAPTER_HEADERS) | ||||||
| list(SORT DATATYPE_ADAPTER_SOURCES) | list(SORT DATATYPE_ADAPTER_SOURCES) | ||||||
|  |  | ||||||
| add_library(datatype_adapters ${DATATYPE_ADAPTER_SOURCES} ${DATATYPE_ADAPTER_HEADERS}) | add_library(datatype_adapters | ||||||
|  |     ${DATATYPE_ADAPTER_SOURCES} | ||||||
|  |     ${DATATYPE_ADAPTER_HEADERS} | ||||||
|  | ) | ||||||
|  |  | ||||||
| source_group(Headers FILES ${DATATYPE_ADAPTER_HEADERS}) | source_group(Headers FILES ${DATATYPE_ADAPTER_HEADERS}) | ||||||
| add_dependencies(datatype_adapters glog-${glog_RELEASE}) | add_dependencies(datatype_adapters glog-${glog_RELEASE}) | ||||||
| target_link_libraries(datatype_adapters data_type_gr_blocks ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES}) | target_link_libraries(datatype_adapters | ||||||
|  |     data_type_gr_blocks | ||||||
|  |     ${GNURADIO_RUNTIME_LIBRARIES} | ||||||
|  |     ${GNURADIO_BLOCKS_LIBRARIES} | ||||||
|  | ) | ||||||
|   | |||||||
| @@ -18,26 +18,34 @@ | |||||||
|  |  | ||||||
|  |  | ||||||
| set(DATA_TYPE_GR_BLOCKS_SOURCES | set(DATA_TYPE_GR_BLOCKS_SOURCES | ||||||
|      interleaved_byte_to_complex_byte.cc |     interleaved_byte_to_complex_byte.cc | ||||||
|      interleaved_short_to_complex_short.cc |     interleaved_short_to_complex_short.cc | ||||||
|      interleaved_byte_to_complex_short.cc |     interleaved_byte_to_complex_short.cc | ||||||
| ) | ) | ||||||
|  |  | ||||||
| set(DATA_TYPE_GR_BLOCKS_HEADERS | set(DATA_TYPE_GR_BLOCKS_HEADERS | ||||||
|      interleaved_byte_to_complex_byte.h |     interleaved_byte_to_complex_byte.h | ||||||
|      interleaved_short_to_complex_short.h |     interleaved_short_to_complex_short.h | ||||||
|      interleaved_byte_to_complex_short.h |     interleaved_byte_to_complex_short.h | ||||||
| ) | ) | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${GNURADIO_RUNTIME_INCLUDE_DIRS} |     ${GNURADIO_RUNTIME_INCLUDE_DIRS} | ||||||
|      ${VOLK_INCLUDE_DIRS} |     ${VOLK_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| list(SORT DATA_TYPE_GR_BLOCKS_HEADERS) | list(SORT DATA_TYPE_GR_BLOCKS_HEADERS) | ||||||
| list(SORT DATA_TYPE_GR_BLOCKS_SOURCES) | list(SORT DATA_TYPE_GR_BLOCKS_SOURCES) | ||||||
|  |  | ||||||
| add_library(data_type_gr_blocks ${DATA_TYPE_GR_BLOCKS_SOURCES} ${DATA_TYPE_GR_BLOCKS_HEADERS}) | add_library(data_type_gr_blocks | ||||||
|  |     ${DATA_TYPE_GR_BLOCKS_SOURCES} | ||||||
|  |     ${DATA_TYPE_GR_BLOCKS_HEADERS} | ||||||
|  | ) | ||||||
|  |  | ||||||
| source_group(Headers FILES ${DATA_TYPE_GR_BLOCKS_HEADERS}) | source_group(Headers FILES ${DATA_TYPE_GR_BLOCKS_HEADERS}) | ||||||
| target_link_libraries(data_type_gr_blocks ${GNURADIO_RUNTIME_LIBRARIES} ${VOLK_LIBRARIES}) |  | ||||||
|  | target_link_libraries(data_type_gr_blocks | ||||||
|  |     ${GNURADIO_RUNTIME_LIBRARIES} | ||||||
|  |     ${VOLK_LIBRARIES} | ||||||
|  | ) | ||||||
|   | |||||||
| @@ -17,43 +17,53 @@ | |||||||
| # | # | ||||||
|  |  | ||||||
| set(INPUT_FILTER_ADAPTER_SOURCES | set(INPUT_FILTER_ADAPTER_SOURCES | ||||||
|      fir_filter.cc |     fir_filter.cc | ||||||
|      freq_xlating_fir_filter.cc |     freq_xlating_fir_filter.cc | ||||||
|      beamformer_filter.cc |     beamformer_filter.cc | ||||||
|      pulse_blanking_filter.cc |     pulse_blanking_filter.cc | ||||||
|      notch_filter.cc |     notch_filter.cc | ||||||
|      notch_filter_lite.cc |     notch_filter_lite.cc | ||||||
| ) | ) | ||||||
|  |  | ||||||
| set(INPUT_FILTER_ADAPTER_HEADERS | set(INPUT_FILTER_ADAPTER_HEADERS | ||||||
|      fir_filter.h |     fir_filter.h | ||||||
|      freq_xlating_fir_filter.h |     freq_xlating_fir_filter.h | ||||||
|      beamformer_filter.h |     beamformer_filter.h | ||||||
|      pulse_blanking_filter.h |     pulse_blanking_filter.h | ||||||
|      notch_filter.h |     notch_filter.h | ||||||
|      notch_filter_lite.h |     notch_filter_lite.h | ||||||
| ) | ) | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/system_parameters |     ${CMAKE_SOURCE_DIR}/src/core/system_parameters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/interfaces |     ${CMAKE_SOURCE_DIR}/src/core/interfaces | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/input_filter/gnuradio_blocks |     ${CMAKE_SOURCE_DIR}/src/algorithms/input_filter/gnuradio_blocks | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/libs | ||||||
|      ${GLOG_INCLUDE_DIRS} |     ${GLOG_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
|      ${GNURADIO_RUNTIME_INCLUDE_DIRS} |     ${GNURADIO_RUNTIME_INCLUDE_DIRS} | ||||||
|      ${VOLK_INCLUDE_DIRS} |     ${VOLK_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4" ) | if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4") | ||||||
|      add_definitions( -DGR_GREATER_38=1 ) |     add_definitions(-DGR_GREATER_38=1) | ||||||
| endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4" ) | endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4") | ||||||
|  |  | ||||||
| list(SORT INPUT_FILTER_ADAPTER_HEADERS) | list(SORT INPUT_FILTER_ADAPTER_HEADERS) | ||||||
| list(SORT INPUT_FILTER_ADAPTER_SOURCES) | list(SORT INPUT_FILTER_ADAPTER_SOURCES) | ||||||
|  |  | ||||||
| add_library(input_filter_adapters ${INPUT_FILTER_ADAPTER_SOURCES} ${INPUT_FILTER_ADAPTER_HEADERS}) | add_library(input_filter_adapters | ||||||
|  |     ${INPUT_FILTER_ADAPTER_SOURCES} | ||||||
|  |     ${INPUT_FILTER_ADAPTER_HEADERS} | ||||||
|  | ) | ||||||
|  |  | ||||||
| source_group(Headers FILES ${INPUT_FILTER_ADAPTER_HEADERS}) | source_group(Headers FILES ${INPUT_FILTER_ADAPTER_HEADERS}) | ||||||
| add_dependencies(input_filter_adapters glog-${glog_RELEASE} gnss_sp_libs) | add_dependencies(input_filter_adapters glog-${glog_RELEASE} gnss_sp_libs) | ||||||
| target_link_libraries(input_filter_adapters input_filter_gr_blocks ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES} ${GNURADIO_FILTER_LIBRARIES} gnss_sp_libs) | target_link_libraries(input_filter_adapters | ||||||
|  |     input_filter_gr_blocks | ||||||
|  |     ${GNURADIO_RUNTIME_LIBRARIES} | ||||||
|  |     ${GNURADIO_BLOCKS_LIBRARIES} | ||||||
|  |     ${GNURADIO_FILTER_LIBRARIES} | ||||||
|  |     gnss_sp_libs | ||||||
|  | ) | ||||||
|   | |||||||
| @@ -18,35 +18,41 @@ | |||||||
|  |  | ||||||
|  |  | ||||||
| set(INPUT_FILTER_GR_BLOCKS_SOURCES | set(INPUT_FILTER_GR_BLOCKS_SOURCES | ||||||
|      beamformer.cc |     beamformer.cc | ||||||
|      pulse_blanking_cc.cc |     pulse_blanking_cc.cc | ||||||
|      notch_cc.cc |     notch_cc.cc | ||||||
|      notch_lite_cc.cc |     notch_lite_cc.cc | ||||||
| ) | ) | ||||||
|  |  | ||||||
| set(INPUT_FILTER_GR_BLOCKS_HEADERS | set(INPUT_FILTER_GR_BLOCKS_HEADERS | ||||||
|      beamformer.h |     beamformer.h | ||||||
|      pulse_blanking_cc.h |     pulse_blanking_cc.h | ||||||
|      notch_cc.h |     notch_cc.h | ||||||
|      notch_lite_cc.h |     notch_lite_cc.h | ||||||
| ) | ) | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${GNURADIO_RUNTIME_INCLUDE_DIRS} |     ${GNURADIO_RUNTIME_INCLUDE_DIRS} | ||||||
|      ${GNURADIO_BLOCKS_INCLUDE_DIRS} |     ${GNURADIO_BLOCKS_INCLUDE_DIRS} | ||||||
|      ${VOLK_GNSSSDR_INCLUDE_DIRS} |     ${VOLK_GNSSSDR_INCLUDE_DIRS} | ||||||
|      ${GLOG_INCLUDE_DIRS} |     ${GLOG_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| list(SORT INPUT_FILTER_GR_BLOCKS_HEADERS) | list(SORT INPUT_FILTER_GR_BLOCKS_HEADERS) | ||||||
| list(SORT INPUT_FILTER_GR_BLOCKS_SOURCES) | list(SORT INPUT_FILTER_GR_BLOCKS_SOURCES) | ||||||
|  |  | ||||||
| add_library(input_filter_gr_blocks ${INPUT_FILTER_GR_BLOCKS_SOURCES} ${INPUT_FILTER_GR_BLOCKS_HEADERS}) | add_library(input_filter_gr_blocks | ||||||
|  |     ${INPUT_FILTER_GR_BLOCKS_SOURCES} | ||||||
|  |     ${INPUT_FILTER_GR_BLOCKS_HEADERS}) | ||||||
|  |  | ||||||
| source_group(Headers FILES ${INPUT_FILTER_GR_BLOCKS_HEADERS}) | source_group(Headers FILES ${INPUT_FILTER_GR_BLOCKS_HEADERS}) | ||||||
|  |  | ||||||
| target_link_libraries(input_filter_gr_blocks ${GNURADIO_FILTER_LIBRARIES}  ${VOLK_GNSSSDR_LIBRARIES} ${LOG4CPP_LIBRARIES}) | target_link_libraries(input_filter_gr_blocks | ||||||
|  |     ${GNURADIO_FILTER_LIBRARIES} | ||||||
|  |     ${VOLK_GNSSSDR_LIBRARIES} | ||||||
|  |     ${LOG4CPP_LIBRARIES}) | ||||||
|  |  | ||||||
| if(NOT VOLK_GNSSSDR_FOUND) | if(NOT VOLK_GNSSSDR_FOUND) | ||||||
|     add_dependencies(input_filter_gr_blocks volk_gnsssdr_module glog-${glog_RELEASE}) |     add_dependencies(input_filter_gr_blocks volk_gnsssdr_module glog-${glog_RELEASE}) | ||||||
|   | |||||||
| @@ -19,79 +19,77 @@ | |||||||
| add_subdirectory(rtklib) | add_subdirectory(rtklib) | ||||||
|  |  | ||||||
| set(GNSS_SPLIBS_SOURCES | 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_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 | ||||||
|         glonass_l1_signal_processing.cc |     glonass_l1_signal_processing.cc | ||||||
|         glonass_l2_signal_processing.cc |     glonass_l2_signal_processing.cc | ||||||
|         pass_through.cc |     pass_through.cc | ||||||
|         galileo_e5_signal_processing.cc |     galileo_e5_signal_processing.cc | ||||||
|         complex_byte_to_float_x2.cc |     complex_byte_to_float_x2.cc | ||||||
|         byte_x2_to_complex_byte.cc |     byte_x2_to_complex_byte.cc | ||||||
|         cshort_to_float_x2.cc |     cshort_to_float_x2.cc | ||||||
|         short_x2_to_cshort.cc |     short_x2_to_cshort.cc | ||||||
|         complex_float_to_complex_byte.cc |     complex_float_to_complex_byte.cc | ||||||
|         conjugate_cc.cc |     conjugate_cc.cc | ||||||
|         conjugate_sc.cc |     conjugate_sc.cc | ||||||
|         conjugate_ic.cc |     conjugate_ic.cc | ||||||
|         gnss_sdr_create_directory.cc |     gnss_sdr_create_directory.cc | ||||||
|         geofunctions.cc |     geofunctions.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_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 | ||||||
|         glonass_l1_signal_processing.h |     glonass_l1_signal_processing.h | ||||||
|         glonass_l2_signal_processing.h |     glonass_l2_signal_processing.h | ||||||
|         pass_through.h |     pass_through.h | ||||||
|         galileo_e5_signal_processing.h |     galileo_e5_signal_processing.h | ||||||
|         complex_byte_to_float_x2.h |     complex_byte_to_float_x2.h | ||||||
|         byte_x2_to_complex_byte.h |     byte_x2_to_complex_byte.h | ||||||
|         cshort_to_float_x2.h |     cshort_to_float_x2.h | ||||||
|         short_x2_to_cshort.h |     short_x2_to_cshort.h | ||||||
|         complex_float_to_complex_byte.h |     complex_float_to_complex_byte.h | ||||||
|         conjugate_cc.h |     conjugate_cc.h | ||||||
|         conjugate_sc.h |     conjugate_sc.h | ||||||
|         conjugate_ic.h |     conjugate_ic.h | ||||||
|         gnss_sdr_create_directory.h |     gnss_sdr_create_directory.h | ||||||
|         gnss_circular_deque.h |     gnss_circular_deque.h | ||||||
|         geofunctions.h |     geofunctions.h | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  |  | ||||||
| if(ENABLE_FPGA) | if(ENABLE_FPGA) | ||||||
|     set(GNSS_SPLIBS_SOURCES ${GNSS_SPLIBS_SOURCES} |     set(GNSS_SPLIBS_SOURCES | ||||||
|  |         ${GNSS_SPLIBS_SOURCES} | ||||||
|         gnss_sdr_time_counter.cc |         gnss_sdr_time_counter.cc | ||||||
|         gnss_sdr_fpga_sample_counter.cc |         gnss_sdr_fpga_sample_counter.cc | ||||||
| 	) |     ) | ||||||
|  |     set(GNSS_SPLIBS_HEADERS | ||||||
|     set(GNSS_SPLIBS_HEADERS ${GNSS_SPLIBS_HEADERS} |         ${GNSS_SPLIBS_HEADERS} | ||||||
|         gnss_sdr_time_counter.h |         gnss_sdr_time_counter.h | ||||||
|         gnss_sdr_fpga_sample_counter.h |         gnss_sdr_fpga_sample_counter.h | ||||||
| 	) |     ) | ||||||
|  |  | ||||||
| endif(ENABLE_FPGA) | endif(ENABLE_FPGA) | ||||||
|  |  | ||||||
| if(OPENCL_FOUND) | if(OPENCL_FOUND) | ||||||
|     set(GNSS_SPLIBS_SOURCES ${GNSS_SPLIBS_SOURCES} |     set(GNSS_SPLIBS_SOURCES ${GNSS_SPLIBS_SOURCES} | ||||||
|                             opencl/fft_execute.cc # Needs OpenCL |         opencl/fft_execute.cc # Needs OpenCL | ||||||
|                             opencl/fft_setup.cc # Needs OpenCL |         opencl/fft_setup.cc # Needs OpenCL | ||||||
|                             opencl/fft_kernelstring.cc # Needs OpenCL |         opencl/fft_kernelstring.cc # Needs OpenCL | ||||||
|     ) |     ) | ||||||
|  |  | ||||||
|     set(GNSS_SPLIBS_HEADERS ${GNSS_SPLIBS_HEADERS} |     set(GNSS_SPLIBS_HEADERS ${GNSS_SPLIBS_HEADERS} | ||||||
|                             opencl/fft_execute.h # Needs OpenCL |         opencl/fft_execute.h # Needs OpenCL | ||||||
|                             opencl/fft_setup.h # Needs OpenCL |         opencl/fft_setup.h # Needs OpenCL | ||||||
|                             opencl/fft_kernelstring.h # Needs OpenCL |         opencl/fft_kernelstring.h # Needs OpenCL | ||||||
|     ) |     ) | ||||||
| endif(OPENCL_FOUND) | endif(OPENCL_FOUND) | ||||||
|  |  | ||||||
| @@ -111,7 +109,7 @@ include_directories( | |||||||
| ) | ) | ||||||
|  |  | ||||||
| if(OPENCL_FOUND) | if(OPENCL_FOUND) | ||||||
|     include_directories( ${OPENCL_INCLUDE_DIRS} ) |     include_directories(${OPENCL_INCLUDE_DIRS}) | ||||||
|     if(OS_IS_MACOSX) |     if(OS_IS_MACOSX) | ||||||
|         set(OPT_LIBRARIES ${OPT_LIBRARIES} "-framework OpenCL") |         set(OPT_LIBRARIES ${OPT_LIBRARIES} "-framework OpenCL") | ||||||
|     else(OS_IS_MACOSX) |     else(OS_IS_MACOSX) | ||||||
| @@ -127,7 +125,8 @@ list(SORT GNSS_SPLIBS_SOURCES) | |||||||
| add_library(gnss_sp_libs ${GNSS_SPLIBS_SOURCES} ${GNSS_SPLIBS_HEADERS}) | add_library(gnss_sp_libs ${GNSS_SPLIBS_SOURCES} ${GNSS_SPLIBS_HEADERS}) | ||||||
| source_group(Headers FILES ${GNSS_SPLIBS_HEADERS}) | source_group(Headers FILES ${GNSS_SPLIBS_HEADERS}) | ||||||
|  |  | ||||||
| target_link_libraries(gnss_sp_libs ${GNURADIO_RUNTIME_LIBRARIES} | target_link_libraries(gnss_sp_libs | ||||||
|  |     ${GNURADIO_RUNTIME_LIBRARIES} | ||||||
|     ${VOLK_LIBRARIES} ${ORC_LIBRARIES} |     ${VOLK_LIBRARIES} ${ORC_LIBRARIES} | ||||||
|     ${VOLK_GNSSSDR_LIBRARIES}  ${ORC_LIBRARIES} |     ${VOLK_GNSSSDR_LIBRARIES}  ${ORC_LIBRARIES} | ||||||
|     ${GFlags_LIBS} |     ${GFlags_LIBS} | ||||||
| @@ -140,7 +139,8 @@ target_link_libraries(gnss_sp_libs ${GNURADIO_RUNTIME_LIBRARIES} | |||||||
| ) | ) | ||||||
|  |  | ||||||
| if(NOT VOLK_GNSSSDR_FOUND) | if(NOT VOLK_GNSSSDR_FOUND) | ||||||
|     add_dependencies(gnss_sp_libs volk_gnsssdr_module armadillo-${armadillo_RELEASE}) |     add_dependencies(gnss_sp_libs volk_gnsssdr_module | ||||||
|  |         armadillo-${armadillo_RELEASE}) | ||||||
| else(NOT VOLK_GNSSSDR_FOUND) | else(NOT VOLK_GNSSSDR_FOUND) | ||||||
|     add_dependencies(gnss_sp_libs armadillo-${armadillo_RELEASE}) |     add_dependencies(gnss_sp_libs armadillo-${armadillo_RELEASE}) | ||||||
| endif(NOT VOLK_GNSSSDR_FOUND) | endif(NOT VOLK_GNSSSDR_FOUND) | ||||||
|   | |||||||
| @@ -16,60 +16,59 @@ | |||||||
| # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>. | # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>. | ||||||
| # | # | ||||||
|  |  | ||||||
| add_definitions( -DGNSS_SDR_VERSION="${VERSION}" ) | add_definitions(-DGNSS_SDR_VERSION="${VERSION}") | ||||||
|  |  | ||||||
| set(RTKLIB_LIB_SOURCES | set(RTKLIB_LIB_SOURCES | ||||||
|      rtklib_rtkcmn.cc |     rtklib_rtkcmn.cc | ||||||
|      rtklib_ephemeris.cc |     rtklib_ephemeris.cc | ||||||
|      rtklib_preceph.cc |     rtklib_preceph.cc | ||||||
|      rtklib_sbas.cc |     rtklib_sbas.cc | ||||||
|      rtklib_ionex.cc |     rtklib_ionex.cc | ||||||
|      rtklib_pntpos.cc |     rtklib_pntpos.cc | ||||||
|      rtklib_ppp.cc |     rtklib_ppp.cc | ||||||
|      rtklib_tides.cc |     rtklib_tides.cc | ||||||
|      rtklib_lambda.cc |     rtklib_lambda.cc | ||||||
|      rtklib_rtkpos.cc |     rtklib_rtkpos.cc | ||||||
|      rtklib_conversions.cc |     rtklib_conversions.cc | ||||||
|      rtklib_stream.cc |     rtklib_stream.cc | ||||||
|      rtklib_rtksvr.cc |     rtklib_rtksvr.cc | ||||||
|      rtklib_solution.cc |     rtklib_solution.cc | ||||||
|      rtklib_rtcm.cc |     rtklib_rtcm.cc | ||||||
|      rtklib_rtcm2.cc |     rtklib_rtcm2.cc | ||||||
|      rtklib_rtcm3.cc |     rtklib_rtcm3.cc | ||||||
| ) | ) | ||||||
|  |  | ||||||
| set(RTKLIB_LIB_HEADERS | set(RTKLIB_LIB_HEADERS | ||||||
|      rtklib_rtkcmn.h |     rtklib_rtkcmn.h | ||||||
|      rtklib_ephemeris.h |     rtklib_ephemeris.h | ||||||
|      rtklib_preceph.h |     rtklib_preceph.h | ||||||
|      rtklib_sbas.h |     rtklib_sbas.h | ||||||
|      rtklib_ionex.h |     rtklib_ionex.h | ||||||
|      rtklib_pntpos.h |     rtklib_pntpos.h | ||||||
|      rtklib_ppp.h |     rtklib_ppp.h | ||||||
|      rtklib_tides.h |     rtklib_tides.h | ||||||
|      rtklib_lambda.h |     rtklib_lambda.h | ||||||
|      rtklib_rtkpos.h |     rtklib_rtkpos.h | ||||||
|      rtklib_conversions.h |     rtklib_conversions.h | ||||||
|      rtklib_stream.h |     rtklib_stream.h | ||||||
|      rtklib_rtksvr.h |     rtklib_rtksvr.h | ||||||
|      rtklib_solution.h |     rtklib_solution.h | ||||||
|      rtklib_rtcm.h |     rtklib_rtcm.h | ||||||
|      rtklib_rtcm2.h |     rtklib_rtcm2.h | ||||||
|      rtklib_rtcm3.h |     rtklib_rtcm3.h | ||||||
|      rtklib.h |     rtklib.h | ||||||
| ) | ) | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/system_parameters |     ${CMAKE_SOURCE_DIR}/src/core/system_parameters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/interfaces |     ${CMAKE_SOURCE_DIR}/src/core/interfaces | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/receiver |     ${CMAKE_SOURCE_DIR}/src/core/receiver | ||||||
|      ${Boost_INCLUDE_DIRS} |     ${Boost_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
|      ${GLOG_INCLUDE_DIRS} |     ${GLOG_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  |  | ||||||
| list(SORT RTKLIB_LIB_HEADERS) | list(SORT RTKLIB_LIB_HEADERS) | ||||||
| list(SORT RTKLIB_LIB_SOURCES) | list(SORT RTKLIB_LIB_SOURCES) | ||||||
|  |  | ||||||
|   | |||||||
| @@ -17,24 +17,24 @@ | |||||||
| # | # | ||||||
|  |  | ||||||
| set(OBS_ADAPTER_SOURCES | set(OBS_ADAPTER_SOURCES | ||||||
| 	hybrid_observables.cc |     hybrid_observables.cc | ||||||
| ) | ) | ||||||
|  |  | ||||||
| set(OBS_ADAPTER_HEADERS | set(OBS_ADAPTER_HEADERS | ||||||
| 	hybrid_observables.h |     hybrid_observables.h | ||||||
| ) | ) | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/system_parameters |     ${CMAKE_SOURCE_DIR}/src/core/system_parameters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/interfaces |     ${CMAKE_SOURCE_DIR}/src/core/interfaces | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/receiver |     ${CMAKE_SOURCE_DIR}/src/core/receiver | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/observables/gnuradio_blocks |     ${CMAKE_SOURCE_DIR}/src/algorithms/observables/gnuradio_blocks | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/libs | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs | ||||||
|      ${GLOG_INCLUDE_DIRS} |     ${GLOG_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
|      ${GNURADIO_RUNTIME_INCLUDE_DIRS} |     ${GNURADIO_RUNTIME_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| add_library(obs_adapters ${OBS_ADAPTER_SOURCES} ${OBS_ADAPTER_HEADERS}) | add_library(obs_adapters ${OBS_ADAPTER_SOURCES} ${OBS_ADAPTER_HEADERS}) | ||||||
|   | |||||||
| @@ -17,32 +17,49 @@ | |||||||
| # | # | ||||||
|  |  | ||||||
| set(OBS_GR_BLOCKS_SOURCES | set(OBS_GR_BLOCKS_SOURCES | ||||||
| 	hybrid_observables_cc.cc |     hybrid_observables_cc.cc | ||||||
| ) | ) | ||||||
|  |  | ||||||
| set(OBS_GR_BLOCKS_HEADERS | set(OBS_GR_BLOCKS_HEADERS | ||||||
| 	hybrid_observables_cc.h |     hybrid_observables_cc.h | ||||||
| ) | ) | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/system_parameters |     ${CMAKE_SOURCE_DIR}/src/core/system_parameters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/interfaces |     ${CMAKE_SOURCE_DIR}/src/core/interfaces | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/receiver |     ${CMAKE_SOURCE_DIR}/src/core/receiver | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/libs | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs | ||||||
|      ${GNURADIO_RUNTIME_INCLUDE_DIRS} |     ${GNURADIO_RUNTIME_INCLUDE_DIRS} | ||||||
|      ${ARMADILLO_INCLUDE_DIRS} |     ${ARMADILLO_INCLUDE_DIRS} | ||||||
|      ${GLOG_INCLUDE_DIRS} |     ${GLOG_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
|      ${MATIO_INCLUDE_DIRS} |     ${MATIO_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| add_library(obs_gr_blocks ${OBS_GR_BLOCKS_SOURCES} ${OBS_GR_BLOCKS_HEADERS}) | add_library(obs_gr_blocks ${OBS_GR_BLOCKS_SOURCES} ${OBS_GR_BLOCKS_HEADERS}) | ||||||
|  |  | ||||||
| source_group(Headers FILES ${OBS_GR_BLOCKS_HEADERS}) | source_group(Headers FILES ${OBS_GR_BLOCKS_HEADERS}) | ||||||
|  |  | ||||||
| if(MATIO_FOUND) | if(MATIO_FOUND) | ||||||
|     add_dependencies(obs_gr_blocks gnss_sp_libs glog-${glog_RELEASE} armadillo-${armadillo_RELEASE}) |     add_dependencies(obs_gr_blocks | ||||||
|  |         gnss_sp_libs | ||||||
|  |         glog-${glog_RELEASE} | ||||||
|  |         armadillo-${armadillo_RELEASE} | ||||||
|  |     ) | ||||||
| else(MATIO_FOUND) | else(MATIO_FOUND) | ||||||
|     add_dependencies(obs_gr_blocks gnss_sp_libs glog-${glog_RELEASE} armadillo-${armadillo_RELEASE} matio-${GNSSSDR_MATIO_LOCAL_VERSION}) |     add_dependencies(obs_gr_blocks | ||||||
|  |         gnss_sp_libs | ||||||
|  |         glog-${glog_RELEASE} | ||||||
|  |         armadillo-${armadillo_RELEASE} | ||||||
|  |         matio-${GNSSSDR_MATIO_LOCAL_VERSION} | ||||||
|  |     ) | ||||||
| endif(MATIO_FOUND) | endif(MATIO_FOUND) | ||||||
| target_link_libraries(obs_gr_blocks gnss_sp_libs ${GNURADIO_RUNTIME_LIBRARIES} ${ARMADILLO_LIBRARIES} ${MATIO_LIBRARIES}) |  | ||||||
|  | target_link_libraries(obs_gr_blocks | ||||||
|  |     gnss_sp_libs | ||||||
|  |     ${GNURADIO_RUNTIME_LIBRARIES} | ||||||
|  |     ${ARMADILLO_LIBRARIES} | ||||||
|  |     ${MATIO_LIBRARIES} | ||||||
|  | ) | ||||||
|   | |||||||
| @@ -16,35 +16,39 @@ | |||||||
| # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>. | # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>. | ||||||
| # | # | ||||||
|  |  | ||||||
|  |  | ||||||
| set(RESAMPLER_ADAPTER_SOURCES | set(RESAMPLER_ADAPTER_SOURCES | ||||||
|         direct_resampler_conditioner.cc |     direct_resampler_conditioner.cc | ||||||
|         mmse_resampler_conditioner.cc |     mmse_resampler_conditioner.cc | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  |  | ||||||
| set(RESAMPLER_ADAPTER_HEADERS | set(RESAMPLER_ADAPTER_HEADERS | ||||||
|         direct_resampler_conditioner.h |     direct_resampler_conditioner.h | ||||||
|         mmse_resampler_conditioner.h |     mmse_resampler_conditioner.h | ||||||
| ) | ) | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/interfaces |     ${CMAKE_SOURCE_DIR}/src/core/interfaces | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/resampler/gnuradio_blocks |     ${CMAKE_SOURCE_DIR}/src/algorithms/resampler/gnuradio_blocks | ||||||
|      ${GLOG_INCLUDE_DIRS} |     ${GLOG_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
|      ${GNURADIO_RUNTIME_INCLUDE_DIRS} |     ${GNURADIO_RUNTIME_INCLUDE_DIRS} | ||||||
|      ${VOLK_INCLUDE_DIRS} |     ${VOLK_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  | if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4") | ||||||
| if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4" ) |     add_definitions(-DGR_GREATER_38=1) | ||||||
|      add_definitions( -DGR_GREATER_38=1 ) | endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4") | ||||||
| endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4" ) |  | ||||||
|  |  | ||||||
| list(SORT RESAMPLER_ADAPTER_HEADERS) | list(SORT RESAMPLER_ADAPTER_HEADERS) | ||||||
| list(SORT RESAMPLER_ADAPTER_SOURCES) | list(SORT RESAMPLER_ADAPTER_SOURCES) | ||||||
|  |  | ||||||
| add_library(resampler_adapters ${RESAMPLER_ADAPTER_SOURCES} ${RESAMPLER_ADAPTER_HEADERS}) | add_library(resampler_adapters | ||||||
|  |     ${RESAMPLER_ADAPTER_SOURCES} | ||||||
|  |     ${RESAMPLER_ADAPTER_HEADERS} | ||||||
|  | ) | ||||||
|  |  | ||||||
| source_group(Headers FILES ${RESAMPLER_ADAPTER_HEADERS}) | source_group(Headers FILES ${RESAMPLER_ADAPTER_HEADERS}) | ||||||
|  |  | ||||||
| target_link_libraries(resampler_adapters resampler_gr_blocks) | target_link_libraries(resampler_adapters resampler_gr_blocks) | ||||||
|   | |||||||
| @@ -18,28 +18,33 @@ | |||||||
|  |  | ||||||
|  |  | ||||||
| set(RESAMPLER_GR_BLOCKS_SOURCES | set(RESAMPLER_GR_BLOCKS_SOURCES | ||||||
|      direct_resampler_conditioner_cc.cc |     direct_resampler_conditioner_cc.cc | ||||||
|      direct_resampler_conditioner_cs.cc |     direct_resampler_conditioner_cs.cc | ||||||
|      direct_resampler_conditioner_cb.cc |     direct_resampler_conditioner_cb.cc | ||||||
| ) | ) | ||||||
|  |  | ||||||
| set(RESAMPLER_GR_BLOCKS_HEADERS | set(RESAMPLER_GR_BLOCKS_HEADERS | ||||||
|      direct_resampler_conditioner_cc.h |     direct_resampler_conditioner_cc.h | ||||||
|      direct_resampler_conditioner_cs.h |     direct_resampler_conditioner_cs.h | ||||||
|      direct_resampler_conditioner_cb.h |     direct_resampler_conditioner_cb.h | ||||||
| ) | ) | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${GLOG_INCLUDE_DIRS} |     ${GLOG_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
|      ${GNURADIO_RUNTIME_INCLUDE_DIRS} |     ${GNURADIO_RUNTIME_INCLUDE_DIRS} | ||||||
|      ${VOLK_INCLUDE_DIRS} |     ${VOLK_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| list(SORT RESAMPLER_GR_BLOCKS_HEADERS) | list(SORT RESAMPLER_GR_BLOCKS_HEADERS) | ||||||
| list(SORT RESAMPLER_GR_BLOCKS_SOURCES) | list(SORT RESAMPLER_GR_BLOCKS_SOURCES) | ||||||
|  |  | ||||||
| add_library(resampler_gr_blocks ${RESAMPLER_GR_BLOCKS_SOURCES} ${RESAMPLER_GR_BLOCKS_HEADERS}) | add_library(resampler_gr_blocks | ||||||
|  |     ${RESAMPLER_GR_BLOCKS_SOURCES} | ||||||
|  |     ${RESAMPLER_GR_BLOCKS_HEADERS} | ||||||
|  | ) | ||||||
|  |  | ||||||
| source_group(Headers FILES ${RESAMPLER_GR_BLOCKS_HEADERS}) | source_group(Headers FILES ${RESAMPLER_GR_BLOCKS_HEADERS}) | ||||||
|  |  | ||||||
| add_dependencies(resampler_gr_blocks glog-${glog_RELEASE}) | add_dependencies(resampler_gr_blocks glog-${glog_RELEASE}) | ||||||
|   | |||||||
| @@ -20,22 +20,28 @@ set(SIGNAL_GENERATOR_ADAPTER_SOURCES signal_generator.cc) | |||||||
| set(SIGNAL_GENERATOR_ADAPTER_HEADERS signal_generator.h) | set(SIGNAL_GENERATOR_ADAPTER_HEADERS signal_generator.h) | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/system_parameters |     ${CMAKE_SOURCE_DIR}/src/core/system_parameters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/interfaces |     ${CMAKE_SOURCE_DIR}/src/core/interfaces | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/receiver |     ${CMAKE_SOURCE_DIR}/src/core/receiver | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/signal_generator/gnuradio_blocks |     ${CMAKE_SOURCE_DIR}/src/algorithms/signal_generator/gnuradio_blocks | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/libs | ||||||
|      ${GLOG_INCLUDE_DIRS} |     ${GLOG_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
|      ${GNURADIO_RUNTIME_INCLUDE_DIRS} |     ${GNURADIO_RUNTIME_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| add_library(signal_generator_adapters ${SIGNAL_GENERATOR_ADAPTER_SOURCES} ${SIGNAL_GENERATOR_ADAPTER_HEADERS}) | add_library(signal_generator_adapters | ||||||
| source_group(Headers FILES ${SIGNAL_GENERATOR_ADAPTER_HEADERS}) |     ${SIGNAL_GENERATOR_ADAPTER_SOURCES} | ||||||
| target_link_libraries(signal_generator_adapters gnss_sp_libs |     ${SIGNAL_GENERATOR_ADAPTER_HEADERS} | ||||||
|                                                 signal_generator_blocks | ) | ||||||
|                                                 ${GNURADIO_RUNTIME_LIBRARIES} |  | ||||||
|                                                 ${GNURADIO_BLOCKS_LIBRARIES} | source_group(Headers FILES ${SIGNAL_GENERATOR_ADAPTER_HEADERS}) | ||||||
|                                                 ${GNURADIO_FILTER_LIBRARIES} |  | ||||||
|  | target_link_libraries(signal_generator_adapters | ||||||
|  |     gnss_sp_libs | ||||||
|  |     signal_generator_blocks | ||||||
|  |     ${GNURADIO_RUNTIME_LIBRARIES} | ||||||
|  |     ${GNURADIO_BLOCKS_LIBRARIES} | ||||||
|  |     ${GNURADIO_FILTER_LIBRARIES} | ||||||
| ) | ) | ||||||
|   | |||||||
| @@ -20,23 +20,31 @@ set(SIGNAL_GENERATOR_BLOCK_SOURCES signal_generator_c.cc) | |||||||
| set(SIGNAL_GENERATOR_BLOCK_HEADERS signal_generator_c.h) | set(SIGNAL_GENERATOR_BLOCK_HEADERS signal_generator_c.h) | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/system_parameters |     ${CMAKE_SOURCE_DIR}/src/core/system_parameters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/interfaces |     ${CMAKE_SOURCE_DIR}/src/core/interfaces | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/receiver |     ${CMAKE_SOURCE_DIR}/src/core/receiver | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/libs | ||||||
|      ${GLOG_INCLUDE_DIRS} |     ${GLOG_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
|      ${GNURADIO_RUNTIME_INCLUDE_DIRS} |     ${GNURADIO_RUNTIME_INCLUDE_DIRS} | ||||||
|      ${VOLK_GNSSSDR_INCLUDE_DIRS} |     ${VOLK_GNSSSDR_INCLUDE_DIRS} | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | add_library(signal_generator_blocks | ||||||
|  |     ${SIGNAL_GENERATOR_BLOCK_SOURCES} | ||||||
|  |     ${SIGNAL_GENERATOR_BLOCK_HEADERS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| add_library(signal_generator_blocks ${SIGNAL_GENERATOR_BLOCK_SOURCES} ${SIGNAL_GENERATOR_BLOCK_HEADERS}) |  | ||||||
| source_group(Headers FILES ${SIGNAL_GENERATOR_BLOCK_HEADERS}) | source_group(Headers FILES ${SIGNAL_GENERATOR_BLOCK_HEADERS}) | ||||||
| target_link_libraries(signal_generator_blocks gnss_system_parameters gnss_sp_libs |  | ||||||
|                                               ${GNURADIO_RUNTIME_LIBRARIES} | target_link_libraries(signal_generator_blocks | ||||||
|                                               ${GNURADIO_FFT_LIBRARIES} |     gnss_system_parameters | ||||||
|                                               ${VOLK_GNSSSDR_LIBRARIES} ${ORC_LIBRARIES} |     gnss_sp_libs | ||||||
|  |     ${GNURADIO_RUNTIME_LIBRARIES} | ||||||
|  |     ${GNURADIO_FFT_LIBRARIES} | ||||||
|  |     ${VOLK_GNSSSDR_LIBRARIES} | ||||||
|  |     ${ORC_LIBRARIES} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| if(VOLK_GNSSSDR_FOUND) | if(VOLK_GNSSSDR_FOUND) | ||||||
|   | |||||||
| @@ -81,6 +81,7 @@ if(ENABLE_FMCOMMS2) | |||||||
|     endif(GRIIO_FOUND) |     endif(GRIIO_FOUND) | ||||||
| endif(ENABLE_FMCOMMS2) | endif(ENABLE_FMCOMMS2) | ||||||
|  |  | ||||||
|  |  | ||||||
| if(ENABLE_AD9361) | if(ENABLE_AD9361) | ||||||
|     ############################################### |     ############################################### | ||||||
|     # AD9361 DIRECT TO FPGA Hardware |     # AD9361 DIRECT TO FPGA Hardware | ||||||
| @@ -92,57 +93,55 @@ if(ENABLE_AD9361) | |||||||
| endif(ENABLE_AD9361) | endif(ENABLE_AD9361) | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
| if(ENABLE_GN3S) | if(ENABLE_GN3S) | ||||||
|      ############################################## |     ############################################## | ||||||
|      # GN3S (USB dongle) |     # GN3S (USB dongle) | ||||||
|      ############################################## |     ############################################## | ||||||
|      find_package(GRGN3S REQUIRED) |     find_package(GRGN3S REQUIRED) | ||||||
|      if(NOT GRGN3S_FOUND) |     if(NOT GRGN3S_FOUND) | ||||||
|          message(" gr-gn3s not found, install it from https://github.com/gnss-sdr/gr-gn3s ") |         message(" gr-gn3s not found, install it from https://github.com/gnss-sdr/gr-gn3s ") | ||||||
|          message(FATAL_ERROR "gr-gn3s required for building gnss-sdr with this option enabled") |         message(FATAL_ERROR "gr-gn3s required for building gnss-sdr with this option enabled") | ||||||
|      endif(NOT GRGN3S_FOUND) |     endif(NOT GRGN3S_FOUND) | ||||||
|      set(OPT_LIBRARIES ${OPT_LIBRARIES} ${GR_GN3S_LIBRARIES}) |     set(OPT_LIBRARIES ${OPT_LIBRARIES} ${GR_GN3S_LIBRARIES}) | ||||||
|      set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${GR_GN3S_INCLUDE_DIRS}) |     set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${GR_GN3S_INCLUDE_DIRS}) | ||||||
|      set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} gn3s_signal_source.cc) |     set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} gn3s_signal_source.cc) | ||||||
|      set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} gn3s_signal_source.h) |     set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} gn3s_signal_source.h) | ||||||
| endif(ENABLE_GN3S) | endif(ENABLE_GN3S) | ||||||
|  |  | ||||||
|  |  | ||||||
| if(ENABLE_FLEXIBAND) | if(ENABLE_FLEXIBAND) | ||||||
|      ############################################## |     ############################################## | ||||||
|      # TELEORBIT FLEXIBAND FRONTEND ADAPTER |     # TELEORBIT FLEXIBAND FRONTEND ADAPTER | ||||||
|      ############################################## |     ############################################## | ||||||
|      find_package(TELEORBIT REQUIRED) |     find_package(TELEORBIT REQUIRED) | ||||||
|      if(NOT TELEORBIT_FOUND) |     if(NOT TELEORBIT_FOUND) | ||||||
|          message(FATAL_ERROR "Teleorbit Flexiband GNU Radio driver required to build gnss-sdr with the optional FLEXIBAND adapter") |         message(FATAL_ERROR "Teleorbit Flexiband GNU Radio driver required to build gnss-sdr with the optional FLEXIBAND adapter") | ||||||
|      endif(NOT TELEORBIT_FOUND) |     endif(NOT TELEORBIT_FOUND) | ||||||
|  |     # Set up variables | ||||||
|      # Set up variables |     set(FLEXIBAND_DRIVER_INCLUDE_DIRS | ||||||
|      set(FLEXIBAND_DRIVER_INCLUDE_DIRS |         ${OPT_DRIVER_INCLUDE_DIRS} | ||||||
|          ${OPT_DRIVER_INCLUDE_DIRS} |         ${TELEORBIT_INCLUDE_DIR}/teleorbit | ||||||
|          ${TELEORBIT_INCLUDE_DIR}/teleorbit |     ) | ||||||
|      ) |     set(OPT_LIBRARIES ${OPT_LIBRARIES} ${TELEORBIT_LIBRARIES}) | ||||||
|      set(OPT_LIBRARIES ${OPT_LIBRARIES} ${TELEORBIT_LIBRARIES}) |     set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${FLEXIBAND_DRIVER_INCLUDE_DIRS}) | ||||||
|      set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${FLEXIBAND_DRIVER_INCLUDE_DIRS}) |     set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} flexiband_signal_source.cc) | ||||||
|      set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} flexiband_signal_source.cc) |     set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} flexiband_signal_source.h) | ||||||
|      set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} flexiband_signal_source.h) |  | ||||||
| endif(ENABLE_FLEXIBAND) | endif(ENABLE_FLEXIBAND) | ||||||
|  |  | ||||||
|  |  | ||||||
| if(ENABLE_ARRAY) | if(ENABLE_ARRAY) | ||||||
|      ############################################## |     ############################################## | ||||||
|      # DBFCTTC GNSS EXPERIMENTAL ARRAY PROTOTYPE |     # DBFCTTC GNSS EXPERIMENTAL ARRAY PROTOTYPE | ||||||
|      ############################################## |     ############################################## | ||||||
|      find_package(GRDBFCTTC REQUIRED) |     find_package(GRDBFCTTC REQUIRED) | ||||||
|      if(NOT GRDBFCTTC_FOUND) |     if(NOT GRDBFCTTC_FOUND) | ||||||
|          message(" gr-dbfcttc not found, install it from https://github.com/gnss-sdr/gr-dbfcttc ") |         message(" gr-dbfcttc not found, install it from https://github.com/gnss-sdr/gr-dbfcttc ") | ||||||
|          message(FATAL_ERROR "gr-dbfcttc required for building gnss-sdr with this option enabled") |         message(FATAL_ERROR "gr-dbfcttc required for building gnss-sdr with this option enabled") | ||||||
|      endif(NOT GRDBFCTTC_FOUND) |     endif(NOT GRDBFCTTC_FOUND) | ||||||
|      set(OPT_LIBRARIES ${OPT_LIBRARIES} ${GR_DBFCTTC_LIBRARIES}) |     set(OPT_LIBRARIES ${OPT_LIBRARIES} ${GR_DBFCTTC_LIBRARIES}) | ||||||
|      set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${GR_DBFCTTC_INCLUDE_DIRS}) |     set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${GR_DBFCTTC_INCLUDE_DIRS}) | ||||||
|      set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} raw_array_signal_source.cc) |     set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} raw_array_signal_source.cc) | ||||||
|      set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} raw_array_signal_source.h) |     set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} raw_array_signal_source.h) | ||||||
| endif(ENABLE_ARRAY) | endif(ENABLE_ARRAY) | ||||||
|  |  | ||||||
|  |  | ||||||
| @@ -167,6 +166,7 @@ if(ENABLE_OSMOSDR) | |||||||
|     endif(NOT GROSMOSDR_FOUND) |     endif(NOT GROSMOSDR_FOUND) | ||||||
| endif(ENABLE_OSMOSDR) | endif(ENABLE_OSMOSDR) | ||||||
|  |  | ||||||
|  |  | ||||||
| if(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd) | if(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd) | ||||||
|     set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} uhd_signal_source.cc) |     set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} uhd_signal_source.cc) | ||||||
|     set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} uhd_signal_source.h) |     set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} uhd_signal_source.h) | ||||||
| @@ -197,27 +197,27 @@ set(SIGNAL_SOURCE_ADAPTER_HEADERS file_signal_source.h | |||||||
|  |  | ||||||
|  |  | ||||||
| if(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.3) | if(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.3) | ||||||
|      set(SIGNAL_SOURCE_ADAPTER_SOURCES ${SIGNAL_SOURCE_ADAPTER_SOURCES} |     set(SIGNAL_SOURCE_ADAPTER_SOURCES ${SIGNAL_SOURCE_ADAPTER_SOURCES} | ||||||
|          two_bit_cpx_file_signal_source.cc |         two_bit_cpx_file_signal_source.cc | ||||||
|          two_bit_packed_file_signal_source.cc ) |         two_bit_packed_file_signal_source.cc) | ||||||
|      set(SIGNAL_SOURCE_ADAPTER_HEADERS ${SIGNAL_SOURCE_ADAPTER_HEADERS} |     set(SIGNAL_SOURCE_ADAPTER_HEADERS ${SIGNAL_SOURCE_ADAPTER_HEADERS} | ||||||
|          two_bit_cpx_file_signal_source.h |         two_bit_cpx_file_signal_source.h | ||||||
|          two_bit_packed_file_signal_source.h ) |         two_bit_packed_file_signal_source.h) | ||||||
| endif(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.3) | endif(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.3) | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${OPT_DRIVER_INCLUDE_DIRS} |     ${OPT_DRIVER_INCLUDE_DIRS} | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/system_parameters |     ${CMAKE_SOURCE_DIR}/src/core/system_parameters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/interfaces |     ${CMAKE_SOURCE_DIR}/src/core/interfaces | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/libs | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/libs | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/gnuradio_blocks |     ${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/gnuradio_blocks | ||||||
|      ${GLOG_INCLUDE_DIRS} |     ${GLOG_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
|      ${Boost_INCLUDE_DIRS} |     ${Boost_INCLUDE_DIRS} | ||||||
|      ${GNURADIO_RUNTIME_INCLUDE_DIRS} |     ${GNURADIO_RUNTIME_INCLUDE_DIRS} | ||||||
|      ${VOLK_INCLUDE_DIRS} |     ${VOLK_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| if(ARCH_64BITS) | if(ARCH_64BITS) | ||||||
| @@ -232,9 +232,9 @@ list(SORT SIGNAL_SOURCE_ADAPTER_SOURCES) | |||||||
| add_library(signal_source_adapters ${SIGNAL_SOURCE_ADAPTER_SOURCES} ${SIGNAL_SOURCE_ADAPTER_HEADERS}) | add_library(signal_source_adapters ${SIGNAL_SOURCE_ADAPTER_SOURCES} ${SIGNAL_SOURCE_ADAPTER_HEADERS}) | ||||||
| source_group(Headers FILES ${SIGNAL_SOURCE_ADAPTER_HEADERS}) | source_group(Headers FILES ${SIGNAL_SOURCE_ADAPTER_HEADERS}) | ||||||
| target_link_libraries(signal_source_adapters signal_source_gr_blocks | target_link_libraries(signal_source_adapters signal_source_gr_blocks | ||||||
|                                              ${Boost_LIBRARIES} |     ${Boost_LIBRARIES} | ||||||
|                                              ${GNURADIO_PMT_LIBRARIES} |     ${GNURADIO_PMT_LIBRARIES} | ||||||
|                                              ${GNURADIO_BLOCKS_LIBRARIES} |     ${GNURADIO_BLOCKS_LIBRARIES} | ||||||
|                                              ${OPT_LIBRARIES} |     ${OPT_LIBRARIES} | ||||||
|                                              gnss_sp_libs |     gnss_sp_libs | ||||||
| ) | ) | ||||||
|   | |||||||
| @@ -31,38 +31,39 @@ endif(ENABLE_RAW_UDP) | |||||||
|  |  | ||||||
|  |  | ||||||
| set(SIGNAL_SOURCE_GR_BLOCKS_SOURCES | set(SIGNAL_SOURCE_GR_BLOCKS_SOURCES | ||||||
|      unpack_byte_2bit_samples.cc |     unpack_byte_2bit_samples.cc | ||||||
|      unpack_byte_2bit_cpx_samples.cc |     unpack_byte_2bit_cpx_samples.cc | ||||||
|      unpack_byte_4bit_samples.cc |     unpack_byte_4bit_samples.cc | ||||||
|      unpack_intspir_1bit_samples.cc |     unpack_intspir_1bit_samples.cc | ||||||
|      rtl_tcp_signal_source_c.cc |     rtl_tcp_signal_source_c.cc | ||||||
|      unpack_2bit_samples.cc |     unpack_2bit_samples.cc | ||||||
|      unpack_spir_gss6450_samples.cc |     unpack_spir_gss6450_samples.cc | ||||||
|      labsat23_source.cc |     labsat23_source.cc | ||||||
|      ${OPT_DRIVER_SOURCES} |     ${OPT_DRIVER_SOURCES} | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  |  | ||||||
| set(SIGNAL_SOURCE_GR_BLOCKS_HEADERS | set(SIGNAL_SOURCE_GR_BLOCKS_HEADERS | ||||||
|      unpack_byte_2bit_samples.h |     unpack_byte_2bit_samples.h | ||||||
|      unpack_byte_2bit_cpx_samples.h |     unpack_byte_2bit_cpx_samples.h | ||||||
|      unpack_byte_4bit_samples.h |     unpack_byte_4bit_samples.h | ||||||
|      unpack_intspir_1bit_samples.h |     unpack_intspir_1bit_samples.h | ||||||
|      rtl_tcp_signal_source_c.h |     rtl_tcp_signal_source_c.h | ||||||
|      unpack_2bit_samples.h |     unpack_2bit_samples.h | ||||||
|      unpack_spir_gss6450_samples.h |     unpack_spir_gss6450_samples.h | ||||||
|      labsat23_source.h |     labsat23_source.h | ||||||
|      ${OPT_DRIVER_HEADERS} |     ${OPT_DRIVER_HEADERS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/libs | ||||||
|      ${GLOG_INCLUDE_DIRS} |     ${GLOG_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
|      ${GNURADIO_RUNTIME_INCLUDE_DIRS} |     ${GNURADIO_RUNTIME_INCLUDE_DIRS} | ||||||
|      ${Boost_INCLUDE_DIRS} |     ${Boost_INCLUDE_DIRS} | ||||||
|      ${OPT_DRIVER_INCLUDE_DIRS} |     ${OPT_DRIVER_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| list(SORT SIGNAL_SOURCE_GR_BLOCKS_HEADERS) | list(SORT SIGNAL_SOURCE_GR_BLOCKS_HEADERS) | ||||||
|   | |||||||
| @@ -17,64 +17,64 @@ | |||||||
| # | # | ||||||
|  |  | ||||||
| if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2) | if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2) | ||||||
|      find_package(GRIIO REQUIRED) |     find_package(GRIIO REQUIRED) | ||||||
|           if(NOT GRIIO_FOUND) |         if(NOT GRIIO_FOUND) | ||||||
|                message(STATUS "gnuradio-iio not found, its installation is required.") |             message(STATUS "gnuradio-iio not found, its installation is required.") | ||||||
|                message(STATUS "Please build and install the following projects:") |             message(STATUS "Please build and install the following projects:") | ||||||
|                message(STATUS " * libiio from https://github.com/analogdevicesinc/libiio") |             message(STATUS " * libiio from https://github.com/analogdevicesinc/libiio") | ||||||
|                message(STATUS " * libad9361-iio from https://github.com/analogdevicesinc/libad9361-iio") |             message(STATUS " * libad9361-iio from https://github.com/analogdevicesinc/libad9361-iio") | ||||||
|                message(STATUS " * gnuradio-iio from https://github.com/analogdevicesinc/gr-iio") |             message(STATUS " * gnuradio-iio from https://github.com/analogdevicesinc/gr-iio") | ||||||
|                message(FATAL_ERROR "gnuradio-iio is required for building gnss-sdr with this option enabled") |             message(FATAL_ERROR "gnuradio-iio is required for building gnss-sdr with this option enabled") | ||||||
|           endif(NOT GRIIO_FOUND) |         endif(NOT GRIIO_FOUND) | ||||||
|      set(OPT_LIBRARIES ${OPT_LIBRARIES} ${IIO_LIBRARIES}) |     set(OPT_LIBRARIES ${OPT_LIBRARIES} ${IIO_LIBRARIES}) | ||||||
|      set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS}) |     set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS}) | ||||||
| endif(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2) | endif(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2) | ||||||
|  |  | ||||||
| if(ENABLE_FMCOMMS2 OR ENABLE_AD9361) | if(ENABLE_FMCOMMS2 OR ENABLE_AD9361) | ||||||
|      find_package(LIBIIO REQUIRED) |     find_package(LIBIIO REQUIRED) | ||||||
|           if(NOT LIBIIO_FOUND) |         if(NOT LIBIIO_FOUND) | ||||||
|                message(STATUS "libiio not found, its installation is required.") |             message(STATUS "libiio not found, its installation is required.") | ||||||
|                message(STATUS "Please build and install the following projects:") |             message(STATUS "Please build and install the following projects:") | ||||||
|                message(STATUS " * libiio from https://github.com/analogdevicesinc/libiio") |             message(STATUS " * libiio from https://github.com/analogdevicesinc/libiio") | ||||||
|                message(STATUS " * libad9361-iio from https://github.com/analogdevicesinc/libad9361-iio") |             message(STATUS " * libad9361-iio from https://github.com/analogdevicesinc/libad9361-iio") | ||||||
|                message(STATUS " * gnuradio-iio from https://github.com/analogdevicesinc/gr-iio") |             message(STATUS " * gnuradio-iio from https://github.com/analogdevicesinc/gr-iio") | ||||||
|                message(FATAL_ERROR "libiio is required for building gnss-sdr with this option enabled") |             message(FATAL_ERROR "libiio is required for building gnss-sdr with this option enabled") | ||||||
|           endif(NOT LIBIIO_FOUND) |         endif(NOT LIBIIO_FOUND) | ||||||
|      set(OPT_LIBRARIES ${OPT_LIBRARIES} ${LIBIIO_LIBRARIES}) |     set(OPT_LIBRARIES ${OPT_LIBRARIES} ${LIBIIO_LIBRARIES}) | ||||||
|      set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${LIBIIO_INCLUDE_DIRS}) |     set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${LIBIIO_INCLUDE_DIRS}) | ||||||
|  |  | ||||||
|      ############################################### |     ############################################### | ||||||
|      # FMCOMMS2 based SDR Hardware |     # FMCOMMS2 based SDR Hardware | ||||||
|      ############################################### |     ############################################### | ||||||
|      if(LIBIIO_FOUND) |     if(LIBIIO_FOUND) | ||||||
|           set(OPT_SIGNAL_SOURCE_LIB_SOURCES ad9361_manager.cc) |         set(OPT_SIGNAL_SOURCE_LIB_SOURCES ad9361_manager.cc) | ||||||
|           set(OPT_SIGNAL_SOURCE_LIB_HEADERS ad9361_manager.h) |         set(OPT_SIGNAL_SOURCE_LIB_HEADERS ad9361_manager.h) | ||||||
|      endif(LIBIIO_FOUND) |     endif(LIBIIO_FOUND) | ||||||
| endif(ENABLE_FMCOMMS2 OR ENABLE_AD9361) | endif(ENABLE_FMCOMMS2 OR ENABLE_AD9361) | ||||||
|  |  | ||||||
| if(ENABLE_FPGA OR ENABLE_AD9361) | if(ENABLE_FPGA OR ENABLE_AD9361) | ||||||
|      set(OPT_SIGNAL_SOURCE_LIB_SOURCES ${OPT_SIGNAL_SOURCE_LIB_SOURCES} fpga_switch.cc) |     set(OPT_SIGNAL_SOURCE_LIB_SOURCES ${OPT_SIGNAL_SOURCE_LIB_SOURCES} fpga_switch.cc) | ||||||
|      set(OPT_SIGNAL_SOURCE_LIB_HEADERS ${OPT_SIGNAL_SOURCE_LIB_HEADERS} fpga_switch.h) |     set(OPT_SIGNAL_SOURCE_LIB_HEADERS ${OPT_SIGNAL_SOURCE_LIB_HEADERS} fpga_switch.h) | ||||||
| endif(ENABLE_FPGA OR ENABLE_AD9361) | endif(ENABLE_FPGA OR ENABLE_AD9361) | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${Boost_INCLUDE_DIRS} |     ${Boost_INCLUDE_DIRS} | ||||||
|      ${GLOG_INCLUDE_DIRS} |     ${GLOG_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
|      ${OPT_DRIVER_INCLUDE_DIRS} |     ${OPT_DRIVER_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| 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 | ||||||
|      ${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 | ||||||
|      ${OPT_SIGNAL_SOURCE_LIB_HEADERS} |     ${OPT_SIGNAL_SOURCE_LIB_HEADERS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| list(SORT SIGNAL_SOURCE_LIB_HEADERS) | list(SORT SIGNAL_SOURCE_LIB_HEADERS) | ||||||
|   | |||||||
| @@ -40,22 +40,31 @@ set(TELEMETRY_DECODER_ADAPTER_HEADERS | |||||||
| ) | ) | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/system_parameters |     ${CMAKE_SOURCE_DIR}/src/core/system_parameters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/interfaces |     ${CMAKE_SOURCE_DIR}/src/core/interfaces | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/receiver |     ${CMAKE_SOURCE_DIR}/src/core/receiver | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/gnuradio_blocks |     ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/gnuradio_blocks | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/libs | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/libs/libswiftcnav |     ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/libs/libswiftcnav | ||||||
|      ${Boost_INCLUDE_DIRS} |     ${Boost_INCLUDE_DIRS} | ||||||
|      ${GLOG_INCLUDE_DIRS} |     ${GLOG_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
|      ${GNURADIO_RUNTIME_INCLUDE_DIRS} |     ${GNURADIO_RUNTIME_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| list(SORT TELEMETRY_DECODER_ADAPTER_HEADERS) | list(SORT TELEMETRY_DECODER_ADAPTER_HEADERS) | ||||||
| list(SORT TELEMETRY_DECODER_ADAPTER_SOURCES) | list(SORT TELEMETRY_DECODER_ADAPTER_SOURCES) | ||||||
|  |  | ||||||
| add_library(telemetry_decoder_adapters ${TELEMETRY_DECODER_ADAPTER_SOURCES} ${TELEMETRY_DECODER_ADAPTER_HEADERS}) | add_library(telemetry_decoder_adapters | ||||||
|  |     ${TELEMETRY_DECODER_ADAPTER_SOURCES} | ||||||
|  |     ${TELEMETRY_DECODER_ADAPTER_HEADERS} | ||||||
|  | ) | ||||||
|  |  | ||||||
| source_group(Headers FILES ${TELEMETRY_DECODER_ADAPTER_HEADERS}) | source_group(Headers FILES ${TELEMETRY_DECODER_ADAPTER_HEADERS}) | ||||||
| target_link_libraries(telemetry_decoder_adapters telemetry_decoder_gr_blocks gnss_system_parameters ${GNURADIO_RUNTIME_LIBRARIES}) |  | ||||||
|  | target_link_libraries(telemetry_decoder_adapters | ||||||
|  |     telemetry_decoder_gr_blocks | ||||||
|  |     gnss_system_parameters | ||||||
|  |     ${GNURADIO_RUNTIME_LIBRARIES} | ||||||
|  | ) | ||||||
|   | |||||||
| @@ -17,45 +17,56 @@ | |||||||
| # | # | ||||||
|  |  | ||||||
| set(TELEMETRY_DECODER_GR_BLOCKS_SOURCES | set(TELEMETRY_DECODER_GR_BLOCKS_SOURCES | ||||||
|      gps_l1_ca_telemetry_decoder_cc.cc |     gps_l1_ca_telemetry_decoder_cc.cc | ||||||
|      gps_l2c_telemetry_decoder_cc.cc |     gps_l2c_telemetry_decoder_cc.cc | ||||||
|      gps_l5_telemetry_decoder_cc.cc |     gps_l5_telemetry_decoder_cc.cc | ||||||
|      sbas_l1_telemetry_decoder_cc.cc |     sbas_l1_telemetry_decoder_cc.cc | ||||||
|      glonass_l1_ca_telemetry_decoder_cc.cc |     glonass_l1_ca_telemetry_decoder_cc.cc | ||||||
|      glonass_l2_ca_telemetry_decoder_cc.cc |     glonass_l2_ca_telemetry_decoder_cc.cc | ||||||
|      galileo_telemetry_decoder_cc.cc |     galileo_telemetry_decoder_cc.cc | ||||||
| ) | ) | ||||||
|  |  | ||||||
| set(TELEMETRY_DECODER_GR_BLOCKS_HEADERS | set(TELEMETRY_DECODER_GR_BLOCKS_HEADERS | ||||||
|      gps_l1_ca_telemetry_decoder_cc.h |     gps_l1_ca_telemetry_decoder_cc.h | ||||||
|      gps_l2c_telemetry_decoder_cc.h |     gps_l2c_telemetry_decoder_cc.h | ||||||
|      gps_l5_telemetry_decoder_cc.h |     gps_l5_telemetry_decoder_cc.h | ||||||
|      sbas_l1_telemetry_decoder_cc.h |     sbas_l1_telemetry_decoder_cc.h | ||||||
|      glonass_l1_ca_telemetry_decoder_cc.h |     glonass_l1_ca_telemetry_decoder_cc.h | ||||||
|      glonass_l2_ca_telemetry_decoder_cc.h |     glonass_l2_ca_telemetry_decoder_cc.h | ||||||
|      galileo_telemetry_decoder_cc.h |     galileo_telemetry_decoder_cc.h | ||||||
| ) | ) | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/system_parameters |     ${CMAKE_SOURCE_DIR}/src/core/system_parameters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/receiver |     ${CMAKE_SOURCE_DIR}/src/core/receiver | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/libs | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/libs/libswiftcnav |     ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/libs/libswiftcnav | ||||||
|      ${GLOG_INCLUDE_DIRS} |     ${GLOG_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
|      ${Boost_INCLUDE_DIRS} |     ${Boost_INCLUDE_DIRS} | ||||||
|      ${GNURADIO_RUNTIME_INCLUDE_DIRS} |     ${GNURADIO_RUNTIME_INCLUDE_DIRS} | ||||||
|      ${VOLK_GNSSSDR_INCLUDE_DIRS} |     ${VOLK_GNSSSDR_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| list(SORT TELEMETRY_DECODER_GR_BLOCKS_HEADERS) | list(SORT TELEMETRY_DECODER_GR_BLOCKS_HEADERS) | ||||||
| list(SORT TELEMETRY_DECODER_GR_BLOCKS_SOURCES) | list(SORT TELEMETRY_DECODER_GR_BLOCKS_SOURCES) | ||||||
|  |  | ||||||
| add_library(telemetry_decoder_gr_blocks ${TELEMETRY_DECODER_GR_BLOCKS_SOURCES} ${TELEMETRY_DECODER_GR_BLOCKS_HEADERS}) | add_library(telemetry_decoder_gr_blocks | ||||||
|  |     ${TELEMETRY_DECODER_GR_BLOCKS_SOURCES} | ||||||
|  |     ${TELEMETRY_DECODER_GR_BLOCKS_HEADERS} | ||||||
|  | ) | ||||||
|  |  | ||||||
| source_group(Headers FILES ${TELEMETRY_DECODER_GR_BLOCKS_HEADERS}) | source_group(Headers FILES ${TELEMETRY_DECODER_GR_BLOCKS_HEADERS}) | ||||||
| target_link_libraries(telemetry_decoder_gr_blocks telemetry_decoder_libswiftcnav telemetry_decoder_lib gnss_system_parameters ${GNURADIO_RUNTIME_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES}) |  | ||||||
|  | target_link_libraries(telemetry_decoder_gr_blocks | ||||||
|  |     telemetry_decoder_libswiftcnav | ||||||
|  |     telemetry_decoder_lib | ||||||
|  |     gnss_system_parameters | ||||||
|  |     ${GNURADIO_RUNTIME_LIBRARIES} | ||||||
|  |     ${VOLK_GNSSSDR_LIBRARIES} | ||||||
|  | ) | ||||||
|  |  | ||||||
| if(NOT VOLK_GNSSSDR_FOUND) | if(NOT VOLK_GNSSSDR_FOUND) | ||||||
|      add_dependencies(telemetry_decoder_gr_blocks volk_gnsssdr_module) |     add_dependencies(telemetry_decoder_gr_blocks volk_gnsssdr_module) | ||||||
| endif(NOT VOLK_GNSSSDR_FOUND) | endif(NOT VOLK_GNSSSDR_FOUND) | ||||||
|   | |||||||
| @@ -16,31 +16,36 @@ | |||||||
| # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>. | # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>. | ||||||
| # | # | ||||||
|  |  | ||||||
|  |  | ||||||
| add_subdirectory(libswiftcnav) | add_subdirectory(libswiftcnav) | ||||||
|  |  | ||||||
| set(TELEMETRY_DECODER_LIB_SOURCES | set(TELEMETRY_DECODER_LIB_SOURCES | ||||||
|      viterbi_decoder.cc |     viterbi_decoder.cc | ||||||
| ) | ) | ||||||
|  |  | ||||||
| set(TELEMETRY_DECODER_LIB_HEADERS | set(TELEMETRY_DECODER_LIB_HEADERS | ||||||
|      viterbi_decoder.h |     viterbi_decoder.h | ||||||
|      convolutional.h |     convolutional.h | ||||||
| ) | ) | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/system_parameters |     ${CMAKE_SOURCE_DIR}/src/core/system_parameters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/interfaces |     ${CMAKE_SOURCE_DIR}/src/core/interfaces | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/receiver |     ${CMAKE_SOURCE_DIR}/src/core/receiver | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/adapters |     ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/adapters | ||||||
|      ${Boost_INCLUDE_DIRS} |     ${Boost_INCLUDE_DIRS} | ||||||
|      ${GLOG_INCLUDE_DIRS} |     ${GLOG_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| list(SORT TELEMETRY_DECODER_LIB_HEADERS) | list(SORT TELEMETRY_DECODER_LIB_HEADERS) | ||||||
| list(SORT TELEMETRY_DECODER_LIB_SOURCES) | list(SORT TELEMETRY_DECODER_LIB_SOURCES) | ||||||
|  |  | ||||||
| add_library(telemetry_decoder_lib ${TELEMETRY_DECODER_LIB_SOURCES} ${TELEMETRY_DECODER_LIB_HEADERS}) | add_library(telemetry_decoder_lib | ||||||
|  |     ${TELEMETRY_DECODER_LIB_SOURCES} | ||||||
|  |     ${TELEMETRY_DECODER_LIB_HEADERS} | ||||||
|  | ) | ||||||
| source_group(Headers FILES ${TELEMETRY_DECODER_LIB_HEADERS}) | source_group(Headers FILES ${TELEMETRY_DECODER_LIB_HEADERS}) | ||||||
|  |  | ||||||
| target_link_libraries(telemetry_decoder_lib gnss_system_parameters) | target_link_libraries(telemetry_decoder_lib gnss_system_parameters) | ||||||
|   | |||||||
| @@ -17,27 +17,33 @@ | |||||||
| # | # | ||||||
|  |  | ||||||
| set(TELEMETRY_DECODER_LIBSWIFTCNAV_SOURCES | set(TELEMETRY_DECODER_LIBSWIFTCNAV_SOURCES | ||||||
|      cnav_msg.c |     cnav_msg.c | ||||||
|      bits.c |     bits.c | ||||||
|      edc.c |     edc.c | ||||||
|      viterbi27.c |     viterbi27.c | ||||||
| ) | ) | ||||||
|  |  | ||||||
| set(TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS | set(TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS | ||||||
|      cnav_msg.h |     cnav_msg.h | ||||||
|      bits.h |     bits.h | ||||||
|      edc.h |     edc.h | ||||||
|      swift_common.h |     swift_common.h | ||||||
|      fec.h |     fec.h | ||||||
| ) | ) | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| list(SORT TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS) | list(SORT TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS) | ||||||
| list(SORT TELEMETRY_DECODER_LIBSWIFTCNAV_SOURCES) | list(SORT TELEMETRY_DECODER_LIBSWIFTCNAV_SOURCES) | ||||||
|  |  | ||||||
| add_library(telemetry_decoder_libswiftcnav STATIC ${TELEMETRY_DECODER_LIBSWIFTCNAV_SOURCES} ${TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS}) | add_library(telemetry_decoder_libswiftcnav STATIC | ||||||
|  |     ${TELEMETRY_DECODER_LIBSWIFTCNAV_SOURCES} | ||||||
|  |     ${TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS} | ||||||
|  | ) | ||||||
|  |  | ||||||
| source_group(Headers FILES ${TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS}) | source_group(Headers FILES ${TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS}) | ||||||
| set_target_properties(telemetry_decoder_libswiftcnav PROPERTIES LINKER_LANGUAGE C) |  | ||||||
|  | set_target_properties(telemetry_decoder_libswiftcnav | ||||||
|  |     PROPERTIES LINKER_LANGUAGE C) | ||||||
|   | |||||||
| @@ -16,81 +16,104 @@ | |||||||
| # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>. | # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>. | ||||||
| # | # | ||||||
|  |  | ||||||
|  |  | ||||||
| if(ENABLE_CUDA) | if(ENABLE_CUDA) | ||||||
|      set(OPT_TRACKING_ADAPTERS_SOURCES ${OPT_TRACKING_ADAPTERS_SOURCES} gps_l1_ca_dll_pll_tracking_gpu.cc) |     set(OPT_TRACKING_ADAPTERS_SOURCES | ||||||
|      set(OPT_TRACKING_ADAPTERS_HEADERS ${OPT_TRACKING_ADAPTERS_HEADERS} gps_l1_ca_dll_pll_tracking_gpu.h) |         ${OPT_TRACKING_ADAPTERS_SOURCES} | ||||||
|      set(OPT_TRACKING_INCLUDE_DIRS ${OPT_TRACKING_INCLUDE_DIRS} ${CUDA_INCLUDE_DIRS}) |         gps_l1_ca_dll_pll_tracking_gpu.cc | ||||||
|  |     ) | ||||||
|  |     set(OPT_TRACKING_ADAPTERS_HEADERS | ||||||
|  |         ${OPT_TRACKING_ADAPTERS_HEADERS} | ||||||
|  |         gps_l1_ca_dll_pll_tracking_gpu.h | ||||||
|  |     ) | ||||||
|  |     set(OPT_TRACKING_INCLUDE_DIRS | ||||||
|  |         ${OPT_TRACKING_INCLUDE_DIRS} | ||||||
|  |         ${CUDA_INCLUDE_DIRS} | ||||||
|  |     ) | ||||||
| endif(ENABLE_CUDA) | endif(ENABLE_CUDA) | ||||||
|  |  | ||||||
| if(ENABLE_FPGA) | if(ENABLE_FPGA) | ||||||
|      set(OPT_TRACKING_ADAPTERS_SOURCES ${OPT_TRACKING_ADAPTERS_SOURCES} |     set(OPT_TRACKING_ADAPTERS_SOURCES | ||||||
|                                        gps_l1_ca_dll_pll_tracking_fpga.cc |         ${OPT_TRACKING_ADAPTERS_SOURCES} | ||||||
|                                        gps_l2_m_dll_pll_tracking_fpga.cc |         gps_l1_ca_dll_pll_tracking_fpga.cc | ||||||
|                                        galileo_e1_dll_pll_veml_tracking_fpga.cc |         gps_l2_m_dll_pll_tracking_fpga.cc | ||||||
|                                        galileo_e5a_dll_pll_tracking_fpga.cc |         galileo_e1_dll_pll_veml_tracking_fpga.cc | ||||||
|                                        gps_l5_dll_pll_tracking_fpga.cc) |         galileo_e5a_dll_pll_tracking_fpga.cc | ||||||
|  |         gps_l5_dll_pll_tracking_fpga.cc | ||||||
|  |     ) | ||||||
|  |  | ||||||
|      set(OPT_TRACKING_ADAPTERS_HEADERS ${OPT_TRACKING_ADAPTERS_HEADERS} |     set(OPT_TRACKING_ADAPTERS_HEADERS | ||||||
|                                        gps_l1_ca_dll_pll_tracking_fpga.h |         ${OPT_TRACKING_ADAPTERS_HEADERS} | ||||||
|                                        gps_l2_m_dll_pll_tracking_fpga.h |         gps_l1_ca_dll_pll_tracking_fpga.h | ||||||
|                                        galileo_e1_dll_pll_veml_tracking_fpga.h |         gps_l2_m_dll_pll_tracking_fpga.h | ||||||
|                                        galileo_e5a_dll_pll_tracking_fpga.h |         galileo_e1_dll_pll_veml_tracking_fpga.h | ||||||
|                                        gps_l5_dll_pll_tracking_fpga.h) |         galileo_e5a_dll_pll_tracking_fpga.h | ||||||
|  |         gps_l5_dll_pll_tracking_fpga.h | ||||||
|  |     ) | ||||||
| endif(ENABLE_FPGA) | endif(ENABLE_FPGA) | ||||||
|  |  | ||||||
| set(TRACKING_ADAPTER_SOURCES | set(TRACKING_ADAPTER_SOURCES | ||||||
|      galileo_e1_dll_pll_veml_tracking.cc |     galileo_e1_dll_pll_veml_tracking.cc | ||||||
|      galileo_e1_tcp_connector_tracking.cc |     galileo_e1_tcp_connector_tracking.cc | ||||||
|      gps_l1_ca_dll_pll_tracking.cc |     gps_l1_ca_dll_pll_tracking.cc | ||||||
|      gps_l1_ca_dll_pll_c_aid_tracking.cc |     gps_l1_ca_dll_pll_c_aid_tracking.cc | ||||||
|      gps_l1_ca_tcp_connector_tracking.cc |     gps_l1_ca_tcp_connector_tracking.cc | ||||||
|      galileo_e5a_dll_pll_tracking.cc |     galileo_e5a_dll_pll_tracking.cc | ||||||
|      gps_l2_m_dll_pll_tracking.cc |     gps_l2_m_dll_pll_tracking.cc | ||||||
|      glonass_l1_ca_dll_pll_tracking.cc |     glonass_l1_ca_dll_pll_tracking.cc | ||||||
|      glonass_l1_ca_dll_pll_c_aid_tracking.cc |     glonass_l1_ca_dll_pll_c_aid_tracking.cc | ||||||
|      gps_l1_ca_kf_tracking.cc |     gps_l1_ca_kf_tracking.cc | ||||||
|      gps_l5_dll_pll_tracking.cc |     gps_l5_dll_pll_tracking.cc | ||||||
|      glonass_l2_ca_dll_pll_tracking.cc |     glonass_l2_ca_dll_pll_tracking.cc | ||||||
|      glonass_l2_ca_dll_pll_c_aid_tracking.cc |     glonass_l2_ca_dll_pll_c_aid_tracking.cc | ||||||
|      ${OPT_TRACKING_ADAPTERS_SOURCES} |     ${OPT_TRACKING_ADAPTERS_SOURCES} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| set(TRACKING_ADAPTER_HEADERS | set(TRACKING_ADAPTER_HEADERS | ||||||
|      galileo_e1_dll_pll_veml_tracking.h |     galileo_e1_dll_pll_veml_tracking.h | ||||||
|      galileo_e1_tcp_connector_tracking.h |     galileo_e1_tcp_connector_tracking.h | ||||||
|      gps_l1_ca_dll_pll_tracking.h |     gps_l1_ca_dll_pll_tracking.h | ||||||
|      gps_l1_ca_dll_pll_c_aid_tracking.h |     gps_l1_ca_dll_pll_c_aid_tracking.h | ||||||
|      gps_l1_ca_tcp_connector_tracking.h |     gps_l1_ca_tcp_connector_tracking.h | ||||||
|      galileo_e5a_dll_pll_tracking.h |     galileo_e5a_dll_pll_tracking.h | ||||||
|      gps_l2_m_dll_pll_tracking.h |     gps_l2_m_dll_pll_tracking.h | ||||||
|      glonass_l1_ca_dll_pll_tracking.h |     glonass_l1_ca_dll_pll_tracking.h | ||||||
|      glonass_l1_ca_dll_pll_c_aid_tracking.h |     glonass_l1_ca_dll_pll_c_aid_tracking.h | ||||||
|      gps_l1_ca_kf_tracking.h |     gps_l1_ca_kf_tracking.h | ||||||
|      gps_l5_dll_pll_tracking.h |     gps_l5_dll_pll_tracking.h | ||||||
|      glonass_l2_ca_dll_pll_tracking.h |     glonass_l2_ca_dll_pll_tracking.h | ||||||
|      glonass_l2_ca_dll_pll_c_aid_tracking.h |     glonass_l2_ca_dll_pll_c_aid_tracking.h | ||||||
|      ${OPT_TRACKING_ADAPTERS_HEADERS} |     ${OPT_TRACKING_ADAPTERS_HEADERS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/system_parameters |     ${CMAKE_SOURCE_DIR}/src/core/system_parameters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/interfaces |     ${CMAKE_SOURCE_DIR}/src/core/interfaces | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/receiver |     ${CMAKE_SOURCE_DIR}/src/core/receiver | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/tracking/gnuradio_blocks |     ${CMAKE_SOURCE_DIR}/src/algorithms/tracking/gnuradio_blocks | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/tracking/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/tracking/libs | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/libs | ||||||
|      ${ARMADILLO_INCLUDE_DIRS} |     ${ARMADILLO_INCLUDE_DIRS} | ||||||
|      ${GLOG_INCLUDE_DIRS} |     ${GLOG_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
|      ${GNURADIO_RUNTIME_INCLUDE_DIRS} |     ${GNURADIO_RUNTIME_INCLUDE_DIRS} | ||||||
|      ${VOLK_GNSSSDR_INCLUDE_DIRS} |     ${VOLK_GNSSSDR_INCLUDE_DIRS} | ||||||
|      ${OPT_TRACKING_INCLUDE_DIRS} |     ${OPT_TRACKING_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| list(SORT TRACKING_ADAPTER_HEADERS) | list(SORT TRACKING_ADAPTER_HEADERS) | ||||||
| list(SORT TRACKING_ADAPTER_SOURCES) | list(SORT TRACKING_ADAPTER_SOURCES) | ||||||
|  |  | ||||||
| add_library(tracking_adapters ${TRACKING_ADAPTER_SOURCES} ${TRACKING_ADAPTER_HEADERS}) | add_library(tracking_adapters | ||||||
|  |     ${TRACKING_ADAPTER_SOURCES} | ||||||
|  |     ${TRACKING_ADAPTER_HEADERS} | ||||||
|  | ) | ||||||
|  |  | ||||||
| source_group(Headers FILES ${TRACKING_ADAPTER_HEADERS}) | source_group(Headers FILES ${TRACKING_ADAPTER_HEADERS}) | ||||||
| target_link_libraries(tracking_adapters tracking_gr_blocks gnss_sp_libs gnss_sdr_flags) |  | ||||||
|  | target_link_libraries(tracking_adapters | ||||||
|  |     tracking_gr_blocks | ||||||
|  |     gnss_sp_libs | ||||||
|  |     gnss_sdr_flags | ||||||
|  | ) | ||||||
|   | |||||||
| @@ -17,77 +17,104 @@ | |||||||
| # | # | ||||||
|  |  | ||||||
| if(ENABLE_CUDA) | if(ENABLE_CUDA) | ||||||
|      set(OPT_TRACKING_BLOCKS_SOURCES ${OPT_TRACKING_BLOCKS_SOURCES} gps_l1_ca_dll_pll_tracking_gpu_cc.cc) |     set(OPT_TRACKING_BLOCKS_SOURCES | ||||||
|      set(OPT_TRACKING_BLOCKS_HEADERS ${OPT_TRACKING_BLOCKS_HEADERS} gps_l1_ca_dll_pll_tracking_gpu_cc.h) |         ${OPT_TRACKING_BLOCKS_SOURCES} | ||||||
|      set(OPT_TRACKING_INCLUDES ${OPT_TRACKING_INCLUDES} ${CUDA_INCLUDE_DIRS}) |         gps_l1_ca_dll_pll_tracking_gpu_cc.cc | ||||||
|      set(OPT_TRACKING_LIBRARIES ${OPT_TRACKING_LIBRARIES} ${CUDA_LIBRARIES}) |     ) | ||||||
|  |     set(OPT_TRACKING_BLOCKS_HEADERS | ||||||
|  |         ${OPT_TRACKING_BLOCKS_HEADERS} | ||||||
|  |         gps_l1_ca_dll_pll_tracking_gpu_cc.h | ||||||
|  |     ) | ||||||
|  |     set(OPT_TRACKING_INCLUDES | ||||||
|  |         ${OPT_TRACKING_INCLUDES} | ||||||
|  |         ${CUDA_INCLUDE_DIRS} | ||||||
|  |     ) | ||||||
|  |     set(OPT_TRACKING_LIBRARIES | ||||||
|  |         ${OPT_TRACKING_LIBRARIES} | ||||||
|  |         ${CUDA_LIBRARIES} | ||||||
|  |     ) | ||||||
| endif(ENABLE_CUDA) | endif(ENABLE_CUDA) | ||||||
|  |  | ||||||
| if(ENABLE_FPGA) | if(ENABLE_FPGA) | ||||||
|      set(OPT_TRACKING_BLOCKS_SOURCES ${OPT_TRACKING_BLOCKS_SOURCES} dll_pll_veml_tracking_fpga.cc) |     set(OPT_TRACKING_BLOCKS_SOURCES | ||||||
|      set(OPT_TRACKING_BLOCKS_HEADERS ${OPT_TRACKING_BLOCKS_HEADERS} dll_pll_veml_tracking_fpga.h) |         ${OPT_TRACKING_BLOCKS_SOURCES} | ||||||
|  |         dll_pll_veml_tracking_fpga.cc | ||||||
|  |     ) | ||||||
|  |     set(OPT_TRACKING_BLOCKS_HEADERS | ||||||
|  |         ${OPT_TRACKING_BLOCKS_HEADERS} | ||||||
|  |         dll_pll_veml_tracking_fpga.h | ||||||
|  |     ) | ||||||
| endif(ENABLE_FPGA) | endif(ENABLE_FPGA) | ||||||
|  |  | ||||||
| set(TRACKING_GR_BLOCKS_SOURCES | set(TRACKING_GR_BLOCKS_SOURCES | ||||||
|      galileo_e1_tcp_connector_tracking_cc.cc |     galileo_e1_tcp_connector_tracking_cc.cc | ||||||
|      gps_l1_ca_tcp_connector_tracking_cc.cc |     gps_l1_ca_tcp_connector_tracking_cc.cc | ||||||
|      gps_l1_ca_dll_pll_c_aid_tracking_cc.cc |     gps_l1_ca_dll_pll_c_aid_tracking_cc.cc | ||||||
|      gps_l1_ca_dll_pll_c_aid_tracking_sc.cc |     gps_l1_ca_dll_pll_c_aid_tracking_sc.cc | ||||||
|      glonass_l1_ca_dll_pll_tracking_cc.cc |     glonass_l1_ca_dll_pll_tracking_cc.cc | ||||||
|      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_tracking_cc.cc | ||||||
|      glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc |     glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc | ||||||
|      glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc |     glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc | ||||||
|      dll_pll_veml_tracking.cc |     dll_pll_veml_tracking.cc | ||||||
|      ${OPT_TRACKING_BLOCKS_SOURCES} |     ${OPT_TRACKING_BLOCKS_SOURCES} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| set(TRACKING_GR_BLOCKS_HEADERS | set(TRACKING_GR_BLOCKS_HEADERS | ||||||
|      galileo_e1_tcp_connector_tracking_cc.h |     galileo_e1_tcp_connector_tracking_cc.h | ||||||
|      gps_l1_ca_tcp_connector_tracking_cc.h |     gps_l1_ca_tcp_connector_tracking_cc.h | ||||||
|      gps_l1_ca_dll_pll_c_aid_tracking_cc.h |     gps_l1_ca_dll_pll_c_aid_tracking_cc.h | ||||||
|      gps_l1_ca_dll_pll_c_aid_tracking_sc.h |     gps_l1_ca_dll_pll_c_aid_tracking_sc.h | ||||||
|      glonass_l1_ca_dll_pll_tracking_cc.h |     glonass_l1_ca_dll_pll_tracking_cc.h | ||||||
|      glonass_l1_ca_dll_pll_c_aid_tracking_cc.h |     glonass_l1_ca_dll_pll_c_aid_tracking_cc.h | ||||||
|      glonass_l1_ca_dll_pll_c_aid_tracking_sc.h |     glonass_l1_ca_dll_pll_c_aid_tracking_sc.h | ||||||
|      gps_l1_ca_kf_tracking_cc.h |     gps_l1_ca_kf_tracking_cc.h | ||||||
|      glonass_l2_ca_dll_pll_tracking_cc.h |     glonass_l2_ca_dll_pll_tracking_cc.h | ||||||
|      glonass_l2_ca_dll_pll_c_aid_tracking_cc.h |     glonass_l2_ca_dll_pll_c_aid_tracking_cc.h | ||||||
|      glonass_l2_ca_dll_pll_c_aid_tracking_sc.h |     glonass_l2_ca_dll_pll_c_aid_tracking_sc.h | ||||||
|      dll_pll_veml_tracking.h |     dll_pll_veml_tracking.h | ||||||
|      ${OPT_TRACKING_BLOCKS_HEADERS} |     ${OPT_TRACKING_BLOCKS_HEADERS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/system_parameters |     ${CMAKE_SOURCE_DIR}/src/core/system_parameters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/interfaces |     ${CMAKE_SOURCE_DIR}/src/core/interfaces | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/receiver |     ${CMAKE_SOURCE_DIR}/src/core/receiver | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/tracking/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/tracking/libs | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/libs | ||||||
|      ${ARMADILLO_INCLUDE_DIRS} |     ${ARMADILLO_INCLUDE_DIRS} | ||||||
|      ${GLOG_INCLUDE_DIRS} |     ${GLOG_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
|      ${Boost_INCLUDE_DIRS} |     ${Boost_INCLUDE_DIRS} | ||||||
|      ${GNURADIO_RUNTIME_INCLUDE_DIRS} |     ${GNURADIO_RUNTIME_INCLUDE_DIRS} | ||||||
|      ${VOLK_GNSSSDR_INCLUDE_DIRS} |     ${VOLK_GNSSSDR_INCLUDE_DIRS} | ||||||
|      ${OPT_TRACKING_INCLUDES} |     ${OPT_TRACKING_INCLUDES} | ||||||
|      ${MATIO_INCLUDE_DIRS} |     ${MATIO_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| if(ENABLE_GENERIC_ARCH) | if(ENABLE_GENERIC_ARCH) | ||||||
|     add_definitions( -DGENERIC_ARCH=1 ) |     add_definitions(-DGENERIC_ARCH=1) | ||||||
| endif(ENABLE_GENERIC_ARCH) | endif(ENABLE_GENERIC_ARCH) | ||||||
|  |  | ||||||
| list(SORT TRACKING_GR_BLOCKS_HEADERS) | list(SORT TRACKING_GR_BLOCKS_HEADERS) | ||||||
| list(SORT TRACKING_GR_BLOCKS_SOURCES) | list(SORT TRACKING_GR_BLOCKS_SOURCES) | ||||||
|  |  | ||||||
| add_library(tracking_gr_blocks ${TRACKING_GR_BLOCKS_SOURCES} ${TRACKING_GR_BLOCKS_HEADERS}) | add_library(tracking_gr_blocks ${TRACKING_GR_BLOCKS_SOURCES} ${TRACKING_GR_BLOCKS_HEADERS}) | ||||||
|  |  | ||||||
| source_group(Headers FILES ${TRACKING_GR_BLOCKS_HEADERS}) | source_group(Headers FILES ${TRACKING_GR_BLOCKS_HEADERS}) | ||||||
|  |  | ||||||
| target_link_libraries(tracking_gr_blocks tracking_lib ${GNURADIO_RUNTIME_LIBRARIES} gnss_sdr_flags gnss_sp_libs ${Boost_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${MATIO_LIBRARIES} ${OPT_TRACKING_LIBRARIES}) | target_link_libraries(tracking_gr_blocks | ||||||
|  |     tracking_lib | ||||||
|  |     ${GNURADIO_RUNTIME_LIBRARIES} | ||||||
|  |     gnss_sdr_flags gnss_sp_libs | ||||||
|  |     ${Boost_LIBRARIES} | ||||||
|  |     ${VOLK_GNSSSDR_LIBRARIES} | ||||||
|  |     ${MATIO_LIBRARIES} | ||||||
|  |     ${OPT_TRACKING_LIBRARIES} | ||||||
|  | ) | ||||||
|  |  | ||||||
| if(NOT VOLK_GNSSSDR_FOUND) | if(NOT VOLK_GNSSSDR_FOUND) | ||||||
|     if(MATIO_FOUND) |     if(MATIO_FOUND) | ||||||
|   | |||||||
| @@ -22,44 +22,43 @@ if(ENABLE_CUDA) | |||||||
|     # set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} --gpu-architecture sm_30) |     # set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} --gpu-architecture sm_30) | ||||||
|     list(APPEND CUDA_NVCC_FLAGS "-gencode arch=compute_30,code=sm_30; -std=c++11;-O3; -use_fast_math -default-stream per-thread") |     list(APPEND CUDA_NVCC_FLAGS "-gencode arch=compute_30,code=sm_30; -std=c++11;-O3; -use_fast_math -default-stream per-thread") | ||||||
|     set(CUDA_PROPAGATE_HOST_FLAGS OFF) |     set(CUDA_PROPAGATE_HOST_FLAGS OFF) | ||||||
|     CUDA_INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}) |     cuda_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) | ||||||
|     set(LIB_TYPE STATIC) #set the lib type |     set(LIB_TYPE STATIC) #set the lib type | ||||||
|     CUDA_ADD_LIBRARY(CUDA_CORRELATOR_LIB ${LIB_TYPE} cuda_multicorrelator.h cuda_multicorrelator.cu) |     cuda_add_library(CUDA_CORRELATOR_LIB ${LIB_TYPE} cuda_multicorrelator.h cuda_multicorrelator.cu) | ||||||
|     set(OPT_TRACKING_LIBRARIES ${OPT_TRACKING_LIBRARIES} CUDA_CORRELATOR_LIB) |     set(OPT_TRACKING_LIBRARIES ${OPT_TRACKING_LIBRARIES} CUDA_CORRELATOR_LIB) | ||||||
|     set(OPT_TRACKING_INCLUDES ${OPT_TRACKING_INCLUDES} ${CUDA_INCLUDE_DIRS} ) |     set(OPT_TRACKING_INCLUDES ${OPT_TRACKING_INCLUDES} ${CUDA_INCLUDE_DIRS}) | ||||||
| endif(ENABLE_CUDA) | endif(ENABLE_CUDA) | ||||||
|  |  | ||||||
|  |  | ||||||
| set(TRACKING_LIB_SOURCES | set(TRACKING_LIB_SOURCES | ||||||
|      cpu_multicorrelator.cc |     cpu_multicorrelator.cc | ||||||
|      cpu_multicorrelator_real_codes.cc |     cpu_multicorrelator_real_codes.cc | ||||||
|      cpu_multicorrelator_16sc.cc |     cpu_multicorrelator_16sc.cc | ||||||
|      lock_detectors.cc |     lock_detectors.cc | ||||||
|      tcp_communication.cc |     tcp_communication.cc | ||||||
|      tcp_packet_data.cc |     tcp_packet_data.cc | ||||||
|      tracking_2nd_DLL_filter.cc |     tracking_2nd_DLL_filter.cc | ||||||
|      tracking_2nd_PLL_filter.cc |     tracking_2nd_PLL_filter.cc | ||||||
|      tracking_discriminators.cc |     tracking_discriminators.cc | ||||||
|      tracking_FLL_PLL_filter.cc |     tracking_FLL_PLL_filter.cc | ||||||
|      tracking_loop_filter.cc |     tracking_loop_filter.cc | ||||||
|      dll_pll_conf.cc |     dll_pll_conf.cc | ||||||
|      bayesian_estimation.cc |     bayesian_estimation.cc | ||||||
| ) | ) | ||||||
|  |  | ||||||
| set(TRACKING_LIB_HEADERS | set(TRACKING_LIB_HEADERS | ||||||
|      cpu_multicorrelator.h |     cpu_multicorrelator.h | ||||||
|      cpu_multicorrelator_real_codes.h |     cpu_multicorrelator_real_codes.h | ||||||
|      cpu_multicorrelator_16sc.h |     cpu_multicorrelator_16sc.h | ||||||
|      lock_detectors.h |     lock_detectors.h | ||||||
|      tcp_communication.h |     tcp_communication.h | ||||||
|      tcp_packet_data.h |     tcp_packet_data.h | ||||||
|      tracking_2nd_DLL_filter.h |     tracking_2nd_DLL_filter.h | ||||||
|      tracking_2nd_PLL_filter.h |     tracking_2nd_PLL_filter.h | ||||||
|      tracking_discriminators.h |     tracking_discriminators.h | ||||||
|      tracking_FLL_PLL_filter.h |     tracking_FLL_PLL_filter.h | ||||||
|      tracking_loop_filter.h |     tracking_loop_filter.h | ||||||
|      dll_pll_conf.h |     dll_pll_conf.h | ||||||
|      bayesian_estimation.h |     bayesian_estimation.h | ||||||
| ) | ) | ||||||
|  |  | ||||||
| if(ENABLE_FPGA) | if(ENABLE_FPGA) | ||||||
| @@ -68,34 +67,41 @@ if(ENABLE_FPGA) | |||||||
| endif(ENABLE_FPGA) | endif(ENABLE_FPGA) | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/system_parameters |     ${CMAKE_SOURCE_DIR}/src/core/system_parameters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/interfaces |     ${CMAKE_SOURCE_DIR}/src/core/interfaces | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/receiver |     ${CMAKE_SOURCE_DIR}/src/core/receiver | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/libs | ||||||
|      ${ARMADILLO_INCLUDE_DIRS} |     ${ARMADILLO_INCLUDE_DIRS} | ||||||
|      ${VOLK_INCLUDE_DIRS} |     ${VOLK_INCLUDE_DIRS} | ||||||
|      ${GLOG_INCLUDE_DIRS} |     ${GLOG_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
|      ${OPT_TRACKING_INCLUDES} |     ${OPT_TRACKING_INCLUDES} | ||||||
|      ${VOLK_GNSSSDR_INCLUDE_DIRS} |     ${VOLK_GNSSSDR_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| if(ENABLE_GENERIC_ARCH) | if(ENABLE_GENERIC_ARCH) | ||||||
|     add_definitions( -DGENERIC_ARCH=1 ) |     add_definitions(-DGENERIC_ARCH=1) | ||||||
| endif(ENABLE_GENERIC_ARCH) | endif(ENABLE_GENERIC_ARCH) | ||||||
|  |  | ||||||
| if (SSE3_AVAILABLE) | if(SSE3_AVAILABLE) | ||||||
|     add_definitions( -DHAVE_SSE3=1 ) |     add_definitions(-DHAVE_SSE3=1) | ||||||
| endif(SSE3_AVAILABLE) | endif(SSE3_AVAILABLE) | ||||||
|  |  | ||||||
|  |  | ||||||
| list(SORT TRACKING_LIB_HEADERS) | list(SORT TRACKING_LIB_HEADERS) | ||||||
| list(SORT TRACKING_LIB_SOURCES) | list(SORT TRACKING_LIB_SOURCES) | ||||||
|  |  | ||||||
| add_library(tracking_lib ${TRACKING_LIB_SOURCES} ${TRACKING_LIB_HEADERS}) | add_library(tracking_lib ${TRACKING_LIB_SOURCES} ${TRACKING_LIB_HEADERS}) | ||||||
|  |  | ||||||
| source_group(Headers FILES ${TRACKING_LIB_HEADERS}) | source_group(Headers FILES ${TRACKING_LIB_HEADERS}) | ||||||
| target_link_libraries(tracking_lib ${OPT_TRACKING_LIBRARIES} ${VOLK_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${Boost_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES}) |  | ||||||
|  | target_link_libraries(tracking_lib | ||||||
|  |     ${OPT_TRACKING_LIBRARIES} | ||||||
|  |     ${VOLK_LIBRARIES} | ||||||
|  |     ${VOLK_GNSSSDR_LIBRARIES} | ||||||
|  |     ${Boost_LIBRARIES} | ||||||
|  |     ${GNURADIO_RUNTIME_LIBRARIES} | ||||||
|  | ) | ||||||
|  |  | ||||||
| if(VOLK_GNSSSDR_FOUND) | if(VOLK_GNSSSDR_FOUND) | ||||||
|     add_dependencies(tracking_lib glog-${glog_RELEASE}) |     add_dependencies(tracking_lib glog-${glog_RELEASE}) | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ | |||||||
| add_subdirectory(supl) | add_subdirectory(supl) | ||||||
|  |  | ||||||
| if(OPENSSL_FOUND) | if(OPENSSL_FOUND) | ||||||
|     add_definitions( -DUSE_OPENSSL_FALLBACK=1 ) |     add_definitions(-DUSE_OPENSSL_FALLBACK=1) | ||||||
| endif(OPENSSL_FOUND) | endif(OPENSSL_FOUND) | ||||||
|  |  | ||||||
| set(CORE_LIBS_SOURCES | set(CORE_LIBS_SOURCES | ||||||
|   | |||||||
| @@ -21,12 +21,12 @@ list(SORT ASN_RRLP_SOURCES) | |||||||
| file(GLOB ASN_SUPL_SOURCES "${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl/*.c") | file(GLOB ASN_SUPL_SOURCES "${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl/*.c") | ||||||
| list(SORT ASN_SUPL_SOURCES) | list(SORT ASN_SUPL_SOURCES) | ||||||
|  |  | ||||||
| set (SUPL_SOURCES | set(SUPL_SOURCES | ||||||
| 	supl.c |     supl.c | ||||||
| 	) | ) | ||||||
|  |  | ||||||
| if(OPENSSL_FOUND) | if(OPENSSL_FOUND) | ||||||
|     add_definitions( -DUSE_OPENSSL_FALLBACK=1 ) |     add_definitions(-DUSE_OPENSSL_FALLBACK=1) | ||||||
| endif(OPENSSL_FOUND) | endif(OPENSSL_FOUND) | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
| @@ -35,7 +35,7 @@ include_directories( | |||||||
|     ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp |     ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp | ||||||
|     ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl |     ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl | ||||||
|     ${GNUTLS_INCLUDE_DIR} |     ${GNUTLS_INCLUDE_DIR} | ||||||
| 	) | ) | ||||||
|  |  | ||||||
| if(CMAKE_C_COMPILER_ID MATCHES "Clang") | if(CMAKE_C_COMPILER_ID MATCHES "Clang") | ||||||
|     if(CMAKE_BUILD_TYPE MATCHES "Release") |     if(CMAKE_BUILD_TYPE MATCHES "Release") | ||||||
| @@ -44,6 +44,6 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang") | |||||||
| endif(CMAKE_C_COMPILER_ID MATCHES "Clang") | endif(CMAKE_C_COMPILER_ID MATCHES "Clang") | ||||||
| set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_C_FLAGS}") | 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}) | ||||||
| target_link_libraries (supl_library ${GNUTLS_LIBRARIES} ${GNUTLS_OPENSSL_LIBRARY} gnss_system_parameters) | target_link_libraries(supl_library ${GNUTLS_LIBRARIES} ${GNUTLS_OPENSSL_LIBRARY} gnss_system_parameters) | ||||||
| set_target_properties(supl_library PROPERTIES LINKER_LANGUAGE C) | set_target_properties(supl_library PROPERTIES LINKER_LANGUAGE C) | ||||||
|   | |||||||
| @@ -18,16 +18,15 @@ | |||||||
|  |  | ||||||
|  |  | ||||||
| set(CORE_MONITOR_LIBS_SOURCES | set(CORE_MONITOR_LIBS_SOURCES | ||||||
| 	gnss_synchro_monitor.cc |     gnss_synchro_monitor.cc | ||||||
| 	gnss_synchro_udp_sink.cc |     gnss_synchro_udp_sink.cc | ||||||
| ) | ) | ||||||
|  |  | ||||||
| set(CORE_MONITOR_LIBS_HEADERS | set(CORE_MONITOR_LIBS_HEADERS | ||||||
| 	gnss_synchro_monitor.h |     gnss_synchro_monitor.h | ||||||
| 	gnss_synchro_udp_sink.h |     gnss_synchro_udp_sink.h | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|     ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|     ${CMAKE_SOURCE_DIR}/src/core/system_parameters |     ${CMAKE_SOURCE_DIR}/src/core/system_parameters | ||||||
| @@ -40,7 +39,13 @@ include_directories( | |||||||
| list(SORT CORE_MONITOR_LIBS_HEADERS) | list(SORT CORE_MONITOR_LIBS_HEADERS) | ||||||
| list(SORT CORE_MONITOR_LIBS_SOURCES) | list(SORT CORE_MONITOR_LIBS_SOURCES) | ||||||
|  |  | ||||||
| add_library(core_monitor_lib ${CORE_MONITOR_LIBS_SOURCES} ${CORE_MONITOR_LIBS_HEADERS}) | add_library(core_monitor_lib | ||||||
|  |     ${CORE_MONITOR_LIBS_SOURCES} | ||||||
|  |     ${CORE_MONITOR_LIBS_HEADERS} | ||||||
|  | ) | ||||||
|  |  | ||||||
| source_group(Headers FILES ${CORE_MONITOR_LIBS_HEADERS}) | source_group(Headers FILES ${CORE_MONITOR_LIBS_HEADERS}) | ||||||
|  |  | ||||||
| target_link_libraries(core_monitor_lib ${Boost_LIBRARIES}) | target_link_libraries(core_monitor_lib ${Boost_LIBRARIES}) | ||||||
|  |  | ||||||
| add_dependencies(core_monitor_lib glog-${glog_RELEASE}) | add_dependencies(core_monitor_lib glog-${glog_RELEASE}) | ||||||
|   | |||||||
| @@ -18,38 +18,38 @@ | |||||||
|  |  | ||||||
|  |  | ||||||
| set(GNSS_RECEIVER_SOURCES | set(GNSS_RECEIVER_SOURCES | ||||||
|      control_thread.cc |     control_thread.cc | ||||||
|      control_message_factory.cc |     control_message_factory.cc | ||||||
|      file_configuration.cc |     file_configuration.cc | ||||||
|      gnss_block_factory.cc |     gnss_block_factory.cc | ||||||
|      gnss_flowgraph.cc |     gnss_flowgraph.cc | ||||||
|      in_memory_configuration.cc |     in_memory_configuration.cc | ||||||
|      tcp_cmd_interface.cc |     tcp_cmd_interface.cc | ||||||
| ) | ) | ||||||
|  |  | ||||||
| set(GNSS_RECEIVER_HEADERS | set(GNSS_RECEIVER_HEADERS | ||||||
|      control_thread.h |     control_thread.h | ||||||
|      control_message_factory.h |     control_message_factory.h | ||||||
|      file_configuration.h |     file_configuration.h | ||||||
|      gnss_block_factory.h |     gnss_block_factory.h | ||||||
|      gnss_flowgraph.h |     gnss_flowgraph.h | ||||||
|      in_memory_configuration.h |     in_memory_configuration.h | ||||||
|      concurrent_map.h |     concurrent_map.h | ||||||
|      concurrent_queue.h |     concurrent_queue.h | ||||||
|      control_message.h |     control_message.h | ||||||
| ) | ) | ||||||
|  |  | ||||||
| if(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.3) | if(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.3) | ||||||
|      add_definitions(-DMODERN_GNURADIO=1) |     add_definitions(-DMODERN_GNURADIO=1) | ||||||
| endif(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.3) | endif(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.3) | ||||||
|  |  | ||||||
| if(ENABLE_CUDA) | if(ENABLE_CUDA) | ||||||
|      add_definitions(-DCUDA_GPU_ACCEL=1) |     add_definitions(-DCUDA_GPU_ACCEL=1) | ||||||
|      set(OPT_RECEIVER_INCLUDE_DIRS ${OPT_RECEIVER_INCLUDE_DIRS} ${CUDA_INCLUDE_DIRS}) |     set(OPT_RECEIVER_INCLUDE_DIRS ${OPT_RECEIVER_INCLUDE_DIRS} ${CUDA_INCLUDE_DIRS}) | ||||||
| endif(ENABLE_CUDA) | endif(ENABLE_CUDA) | ||||||
|  |  | ||||||
| if(ENABLE_FPGA) | if(ENABLE_FPGA) | ||||||
|      add_definitions(-DENABLE_FPGA=1) |     add_definitions(-DENABLE_FPGA=1) | ||||||
| endif(ENABLE_FPGA) | endif(ENABLE_FPGA) | ||||||
|  |  | ||||||
| if(ENABLE_RAW_UDP) | if(ENABLE_RAW_UDP) | ||||||
| @@ -57,7 +57,7 @@ if(ENABLE_RAW_UDP) | |||||||
| endif(ENABLE_RAW_UDP) | endif(ENABLE_RAW_UDP) | ||||||
|  |  | ||||||
| if(Boost_VERSION LESS 105000) | if(Boost_VERSION LESS 105000) | ||||||
|      add_definitions(-DOLD_BOOST=1) |     add_definitions(-DOLD_BOOST=1) | ||||||
| endif(Boost_VERSION LESS 105000) | endif(Boost_VERSION LESS 105000) | ||||||
|  |  | ||||||
| if(OPENSSL_FOUND) | if(OPENSSL_FOUND) | ||||||
| @@ -88,7 +88,7 @@ endif(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd) | |||||||
|  |  | ||||||
| #Enable OpenCL if found in the system | #Enable OpenCL if found in the system | ||||||
| if(OPENCL_FOUND) | if(OPENCL_FOUND) | ||||||
|     message(STATUS "Adding processing blocks implemented using OpenCL" ) |     message(STATUS "Adding processing blocks implemented using OpenCL") | ||||||
|     add_definitions(-DOPENCL_BLOCKS=1) |     add_definitions(-DOPENCL_BLOCKS=1) | ||||||
| else(OPENCL_FOUND) | else(OPENCL_FOUND) | ||||||
|     add_definitions(-DOPENCL_BLOCKS=0) |     add_definitions(-DOPENCL_BLOCKS=0) | ||||||
| @@ -96,13 +96,13 @@ endif(OPENCL_FOUND) | |||||||
|  |  | ||||||
| #enable SDR Hardware based on fmcomms2 | #enable SDR Hardware based on fmcomms2 | ||||||
| if(ENABLE_PLUTOSDR) | if(ENABLE_PLUTOSDR) | ||||||
| 	add_definitions(-DPLUTOSDR_DRIVER=1) |     add_definitions(-DPLUTOSDR_DRIVER=1) | ||||||
| 	set(OPT_RECEIVER_INCLUDE_DIRS ${OPT_RECEIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS}) |     set(OPT_RECEIVER_INCLUDE_DIRS ${OPT_RECEIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS}) | ||||||
| endif(ENABLE_PLUTOSDR) | endif(ENABLE_PLUTOSDR) | ||||||
|  |  | ||||||
| if(ENABLE_FMCOMMS2) | if(ENABLE_FMCOMMS2) | ||||||
| 	add_definitions(-DFMCOMMS2_DRIVER=1) |     add_definitions(-DFMCOMMS2_DRIVER=1) | ||||||
| 	set(OPT_RECEIVER_INCLUDE_DIRS ${OPT_RECEIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS}) |     set(OPT_RECEIVER_INCLUDE_DIRS ${OPT_RECEIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS}) | ||||||
| endif(ENABLE_FMCOMMS2) | endif(ENABLE_FMCOMMS2) | ||||||
|  |  | ||||||
| if(ENABLE_AD9361) | if(ENABLE_AD9361) | ||||||
| @@ -110,98 +110,105 @@ if(ENABLE_AD9361) | |||||||
|     set(OPT_RECEIVER_INCLUDE_DIRS ${OPT_RECEIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS}) |     set(OPT_RECEIVER_INCLUDE_DIRS ${OPT_RECEIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS}) | ||||||
| endif(ENABLE_AD9361) | endif(ENABLE_AD9361) | ||||||
|  |  | ||||||
| if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4" ) | if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4") | ||||||
|      add_definitions( -DGR_GREATER_38=1 ) |     add_definitions( -DGR_GREATER_38=1 ) | ||||||
| endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4" ) | endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4") | ||||||
|  |  | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/system_parameters |     ${CMAKE_SOURCE_DIR}/src/core/system_parameters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/interfaces |     ${CMAKE_SOURCE_DIR}/src/core/interfaces | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/libs |     ${CMAKE_SOURCE_DIR}/src/core/libs | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/libs/supl |     ${CMAKE_SOURCE_DIR}/src/core/libs/supl | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp |     ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl |     ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/monitor |     ${CMAKE_SOURCE_DIR}/src/core/monitor | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/libs | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/libs | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/adapters |     ${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/adapters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/gnuradio_blocks |     ${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/gnuradio_blocks | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/channel/adapters |     ${CMAKE_SOURCE_DIR}/src/algorithms/channel/adapters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/channel/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/channel/libs | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/conditioner/adapters |     ${CMAKE_SOURCE_DIR}/src/algorithms/conditioner/adapters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/data_type_adapter/adapters |     ${CMAKE_SOURCE_DIR}/src/algorithms/data_type_adapter/adapters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/data_type_adapter/gnuradio_blocks |     ${CMAKE_SOURCE_DIR}/src/algorithms/data_type_adapter/gnuradio_blocks | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/resampler/adapters |     ${CMAKE_SOURCE_DIR}/src/algorithms/resampler/adapters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/input_filter/adapters |     ${CMAKE_SOURCE_DIR}/src/algorithms/input_filter/adapters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/input_filter/gnuradio_blocks |     ${CMAKE_SOURCE_DIR}/src/algorithms/input_filter/gnuradio_blocks | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/adapters |     ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/adapters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/gnuradio_blocks |     ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/gnuradio_blocks | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/libs | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/tracking/adapters |     ${CMAKE_SOURCE_DIR}/src/algorithms/tracking/adapters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/tracking/gnuradio_blocks |     ${CMAKE_SOURCE_DIR}/src/algorithms/tracking/gnuradio_blocks | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/tracking/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/tracking/libs | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/adapters |     ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/adapters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/gnuradio_blocks |     ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/gnuradio_blocks | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/libs | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/libs/libswiftcnav |     ${CMAKE_SOURCE_DIR}/src/algorithms/telemetry_decoder/libs/libswiftcnav | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/observables/adapters |     ${CMAKE_SOURCE_DIR}/src/algorithms/observables/adapters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/observables/gnuradio_blocks |     ${CMAKE_SOURCE_DIR}/src/algorithms/observables/gnuradio_blocks | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/adapters |     ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/adapters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/gnuradio_blocks |     ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/gnuradio_blocks | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib |     ${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib | ||||||
|      ${ARMADILLO_INCLUDE_DIRS} |     ${ARMADILLO_INCLUDE_DIRS} | ||||||
|      ${GLOG_INCLUDE_DIRS} |     ${GLOG_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
|      ${Boost_INCLUDE_DIRS} |     ${Boost_INCLUDE_DIRS} | ||||||
|      ${GNURADIO_RUNTIME_INCLUDE_DIRS} |     ${GNURADIO_RUNTIME_INCLUDE_DIRS} | ||||||
|      ${PUGIXML_INCLUDE_DIR} |     ${PUGIXML_INCLUDE_DIR} | ||||||
|      ${OPT_RECEIVER_INCLUDE_DIRS} |     ${OPT_RECEIVER_INCLUDE_DIRS} | ||||||
|      ${VOLK_GNSSSDR_INCLUDE_DIRS} |     ${VOLK_GNSSSDR_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| list(SORT GNSS_RECEIVER_HEADERS) | list(SORT GNSS_RECEIVER_HEADERS) | ||||||
| list(SORT GNSS_RECEIVER_SOURCES) | list(SORT GNSS_RECEIVER_SOURCES) | ||||||
|  |  | ||||||
| set(GNSS_RECEIVER_INTERFACE_HEADERS ../interfaces/acquisition_interface.h | set(GNSS_RECEIVER_INTERFACE_HEADERS | ||||||
|                                     ../interfaces/channel_interface.h |     ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/acquisition_interface.h | ||||||
|                                     ../interfaces/configuration_interface.h |     ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/channel_interface.h | ||||||
|                                     ../interfaces/gnss_block_interface.h |     ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/configuration_interface.h | ||||||
|                                     ../interfaces/observables_interface.h |     ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/gnss_block_interface.h | ||||||
|                                     ../interfaces/pvt_interface.h |     ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/observables_interface.h | ||||||
|                                     ../interfaces/telemetry_decoder_interface.h |     ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/pvt_interface.h | ||||||
|                                     ../interfaces/tracking_interface.h |     ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/telemetry_decoder_interface.h | ||||||
|  |     ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/tracking_interface.h | ||||||
| ) | ) | ||||||
|  |  | ||||||
| list(SORT GNSS_RECEIVER_INTERFACE_HEADERS) | list(SORT GNSS_RECEIVER_INTERFACE_HEADERS) | ||||||
|  |  | ||||||
| add_library(gnss_rx ${GNSS_RECEIVER_SOURCES} ${GNSS_RECEIVER_HEADERS} ${GNSS_RECEIVER_INTERFACE_HEADERS}) | add_library(gnss_rx | ||||||
|  |     ${GNSS_RECEIVER_SOURCES} | ||||||
|  |     ${GNSS_RECEIVER_HEADERS} | ||||||
|  |     ${GNSS_RECEIVER_INTERFACE_HEADERS} | ||||||
|  | ) | ||||||
|  |  | ||||||
| source_group(Headers FILES ${GNSS_RECEIVER_HEADERS} ${GNSS_RECEIVER_INTERFACE_HEADERS}) | source_group(Headers FILES ${GNSS_RECEIVER_HEADERS} ${GNSS_RECEIVER_INTERFACE_HEADERS}) | ||||||
|  |  | ||||||
| target_link_libraries(gnss_rx ${Boost_LIBRARIES} | target_link_libraries(gnss_rx | ||||||
|                               ${ARMADILLO_LIBRARIES} |     ${Boost_LIBRARIES} | ||||||
|                               ${GNURADIO_RUNTIME_LIBRARIES} |     ${ARMADILLO_LIBRARIES} | ||||||
|                               ${GNURADIO_BLOCKS_LIBRARIES} |     ${GNURADIO_RUNTIME_LIBRARIES} | ||||||
|                               ${GNURADIO_FFT_LIBRARIES} |     ${GNURADIO_BLOCKS_LIBRARIES} | ||||||
|                               ${GNURADIO_FILTER_LIBRARIES} |     ${GNURADIO_FFT_LIBRARIES} | ||||||
|                               gnss_system_parameters |     ${GNURADIO_FILTER_LIBRARIES} | ||||||
|                               gnss_sp_libs |     gnss_system_parameters | ||||||
|                               signal_source_adapters |     gnss_sp_libs | ||||||
|                               datatype_adapters |     signal_source_adapters | ||||||
|                               input_filter_adapters |     datatype_adapters | ||||||
|                               conditioner_adapters |     input_filter_adapters | ||||||
|                               resampler_adapters |     conditioner_adapters | ||||||
|                               acq_adapters |     resampler_adapters | ||||||
|                               tracking_adapters |     acq_adapters | ||||||
|                               channel_adapters |     tracking_adapters | ||||||
|                               telemetry_decoder_libswiftcnav |     channel_adapters | ||||||
|                               telemetry_decoder_lib |     telemetry_decoder_libswiftcnav | ||||||
|                               telemetry_decoder_adapters |     telemetry_decoder_lib | ||||||
|                               obs_adapters |     telemetry_decoder_adapters | ||||||
|                               pvt_adapters |     obs_adapters | ||||||
|                               pvt_lib |     pvt_adapters | ||||||
|                               rx_core_lib |     pvt_lib | ||||||
|                               core_monitor_lib |     rx_core_lib | ||||||
|  |     core_monitor_lib | ||||||
| ) | ) | ||||||
|   | |||||||
| @@ -911,7 +911,6 @@ std::vector<std::pair<int, Gnss_Satellite>> ControlThread::get_visible_sats(time | |||||||
|             alm_t rtklib_alm = alm_to_rtklib(it->second); |             alm_t rtklib_alm = alm_to_rtklib(it->second); | ||||||
|             double r_sat[3]; |             double r_sat[3]; | ||||||
|             double clock_bias_s; |             double clock_bias_s; | ||||||
|             double sat_pos_variance_m2; |  | ||||||
|             alm2pos(gps_gtime, &rtklib_alm, &r_sat[0], &clock_bias_s); |             alm2pos(gps_gtime, &rtklib_alm, &r_sat[0], &clock_bias_s); | ||||||
|             double Az, El, dist_m; |             double Az, El, dist_m; | ||||||
|             arma::vec r_sat_eb_e = arma::vec{r_sat[0], r_sat[1], r_sat[2]}; |             arma::vec r_sat_eb_e = arma::vec{r_sat[0], r_sat[1], r_sat[2]}; | ||||||
| @@ -932,7 +931,6 @@ std::vector<std::pair<int, Gnss_Satellite>> ControlThread::get_visible_sats(time | |||||||
|             alm_t rtklib_alm = alm_to_rtklib(it->second); |             alm_t rtklib_alm = alm_to_rtklib(it->second); | ||||||
|             double r_sat[3]; |             double r_sat[3]; | ||||||
|             double clock_bias_s; |             double clock_bias_s; | ||||||
|             double sat_pos_variance_m2; |  | ||||||
|             alm2pos(gps_gtime, &rtklib_alm, &r_sat[0], &clock_bias_s); |             alm2pos(gps_gtime, &rtklib_alm, &r_sat[0], &clock_bias_s); | ||||||
|             double Az, El, dist_m; |             double Az, El, dist_m; | ||||||
|             arma::vec r_sat_eb_e = arma::vec{r_sat[0], r_sat[1], r_sat[2]}; |             arma::vec r_sat_eb_e = arma::vec{r_sat[0], r_sat[1], r_sat[2]}; | ||||||
|   | |||||||
| @@ -16,87 +16,87 @@ | |||||||
| # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>. | # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>. | ||||||
| # | # | ||||||
|  |  | ||||||
|  |  | ||||||
| set(SYSTEM_PARAMETERS_SOURCES | set(SYSTEM_PARAMETERS_SOURCES | ||||||
|      gnss_satellite.cc |     gnss_satellite.cc | ||||||
|      gnss_signal.cc |     gnss_signal.cc | ||||||
|      gps_navigation_message.cc |     gps_navigation_message.cc | ||||||
|      gps_ephemeris.cc |     gps_ephemeris.cc | ||||||
|      gps_iono.cc |     gps_iono.cc | ||||||
|      gps_almanac.cc |     gps_almanac.cc | ||||||
|      gps_utc_model.cc |     gps_utc_model.cc | ||||||
|      gps_acq_assist.cc |     gps_acq_assist.cc | ||||||
|      agnss_ref_time.cc |     agnss_ref_time.cc | ||||||
|      agnss_ref_location.cc |     agnss_ref_location.cc | ||||||
|      galileo_utc_model.cc |     galileo_utc_model.cc | ||||||
|      galileo_ephemeris.cc |     galileo_ephemeris.cc | ||||||
|      galileo_almanac.cc |     galileo_almanac.cc | ||||||
|      galileo_almanac_helper.cc |     galileo_almanac_helper.cc | ||||||
|      galileo_iono.cc |     galileo_iono.cc | ||||||
|      galileo_navigation_message.cc |     galileo_navigation_message.cc | ||||||
|      sbas_ephemeris.cc |     sbas_ephemeris.cc | ||||||
|      galileo_fnav_message.cc |     galileo_fnav_message.cc | ||||||
|      gps_cnav_ephemeris.cc |     gps_cnav_ephemeris.cc | ||||||
|      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 |     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 | ||||||
|      glonass_gnav_navigation_message.cc |     glonass_gnav_navigation_message.cc | ||||||
| ) | ) | ||||||
|  |  | ||||||
| set(SYSTEM_PARAMETERS_HEADERS | set(SYSTEM_PARAMETERS_HEADERS | ||||||
|      gnss_satellite.h |     gnss_satellite.h | ||||||
|      gnss_signal.h |     gnss_signal.h | ||||||
|      gps_navigation_message.h |     gps_navigation_message.h | ||||||
|      gps_ephemeris.h |     gps_ephemeris.h | ||||||
|      gps_iono.h |     gps_iono.h | ||||||
|      gps_almanac.h |     gps_almanac.h | ||||||
|      gps_utc_model.h |     gps_utc_model.h | ||||||
|      gps_acq_assist.h |     gps_acq_assist.h | ||||||
|      agnss_ref_time.h |     agnss_ref_time.h | ||||||
|      agnss_ref_location.h |     agnss_ref_location.h | ||||||
|      galileo_utc_model.h |     galileo_utc_model.h | ||||||
|      galileo_ephemeris.h |     galileo_ephemeris.h | ||||||
|      galileo_almanac.h |     galileo_almanac.h | ||||||
|      galileo_almanac_helper.h |     galileo_almanac_helper.h | ||||||
|      galileo_iono.h |     galileo_iono.h | ||||||
|      galileo_navigation_message.h |     galileo_navigation_message.h | ||||||
|      sbas_ephemeris.h |     sbas_ephemeris.h | ||||||
|      galileo_fnav_message.h |     galileo_fnav_message.h | ||||||
|      gps_cnav_ephemeris.h |     gps_cnav_ephemeris.h | ||||||
|      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 |     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 | ||||||
|      glonass_gnav_navigation_message.h |     glonass_gnav_navigation_message.h | ||||||
|      display.h |     display.h | ||||||
|      Galileo_E1.h |     Galileo_E1.h | ||||||
|      Galileo_E5a.h |     Galileo_E5a.h | ||||||
|      GLONASS_L1_L2_CA.h |     GLONASS_L1_L2_CA.h | ||||||
|      gnss_frequencies.h |     gnss_frequencies.h | ||||||
|      gnss_obs_codes.h |     gnss_obs_codes.h | ||||||
|      gnss_synchro.h |     gnss_synchro.h | ||||||
|      GPS_CNAV.h |     GPS_CNAV.h | ||||||
|      GPS_L1_CA.h |     GPS_L1_CA.h | ||||||
|      GPS_L2C.h |     GPS_L2C.h | ||||||
|      GPS_L5.h |     GPS_L5.h | ||||||
|      MATH_CONSTANTS.h |     MATH_CONSTANTS.h | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/receiver |     ${CMAKE_SOURCE_DIR}/src/core/receiver | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib |     ${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib | ||||||
|      ${GLOG_INCLUDE_DIRS} |     ${GLOG_INCLUDE_DIRS} | ||||||
|      ${Boost_INCLUDE_DIRS} |     ${Boost_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| link_directories(${Boost_LIBRARY_DIR}) | link_directories(${Boost_LIBRARY_DIR}) | ||||||
| @@ -104,7 +104,13 @@ link_directories(${Boost_LIBRARY_DIR}) | |||||||
| list(SORT SYSTEM_PARAMETERS_HEADERS) | list(SORT SYSTEM_PARAMETERS_HEADERS) | ||||||
| list(SORT SYSTEM_PARAMETERS_SOURCES) | list(SORT SYSTEM_PARAMETERS_SOURCES) | ||||||
|  |  | ||||||
| add_library(gnss_system_parameters ${SYSTEM_PARAMETERS_SOURCES} ${SYSTEM_PARAMETERS_HEADERS}) | add_library(gnss_system_parameters | ||||||
|  |     ${SYSTEM_PARAMETERS_SOURCES} | ||||||
|  |     ${SYSTEM_PARAMETERS_HEADERS} | ||||||
|  | ) | ||||||
|  |  | ||||||
| source_group(Headers FILES ${SYSTEM_PARAMETERS_HEADERS}) | source_group(Headers FILES ${SYSTEM_PARAMETERS_HEADERS}) | ||||||
|  |  | ||||||
| add_dependencies(gnss_system_parameters rtklib_lib glog-${glog_RELEASE}) | add_dependencies(gnss_system_parameters rtklib_lib glog-${glog_RELEASE}) | ||||||
|  |  | ||||||
| target_link_libraries(gnss_system_parameters rtklib_lib ${Boost_LIBRARIES}) | target_link_libraries(gnss_system_parameters rtklib_lib ${Boost_LIBRARIES}) | ||||||
|   | |||||||
| @@ -32,7 +32,7 @@ if(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd) | |||||||
| endif(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd) | endif(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd) | ||||||
|  |  | ||||||
| if(OPENSSL_FOUND) | if(OPENSSL_FOUND) | ||||||
|     add_definitions( -DUSE_OPENSSL_FALLBACK=1 ) |     add_definitions(-DUSE_OPENSSL_FALLBACK=1) | ||||||
| endif(OPENSSL_FOUND) | endif(OPENSSL_FOUND) | ||||||
|  |  | ||||||
| if(ENABLE_CUDA) | if(ENABLE_CUDA) | ||||||
| @@ -47,65 +47,68 @@ if(ORC_FOUND) | |||||||
| endif(ORC_FOUND) | endif(ORC_FOUND) | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/system_parameters |     ${CMAKE_SOURCE_DIR}/src/core/system_parameters | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/interfaces |     ${CMAKE_SOURCE_DIR}/src/core/interfaces | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/receiver |     ${CMAKE_SOURCE_DIR}/src/core/receiver | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/monitor |     ${CMAKE_SOURCE_DIR}/src/core/monitor | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/libs |     ${CMAKE_SOURCE_DIR}/src/core/libs | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/libs/supl |     ${CMAKE_SOURCE_DIR}/src/core/libs/supl | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp |     ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp | ||||||
|      ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl |     ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl | ||||||
|      ${CMAKE_SOURCE_DIR}/src/algorithms/libs |     ${CMAKE_SOURCE_DIR}/src/algorithms/libs | ||||||
|      ${GLOG_INCLUDE_DIRS} |     ${GLOG_INCLUDE_DIRS} | ||||||
|      ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
|      ${ARMADILLO_INCLUDE_DIRS} |     ${ARMADILLO_INCLUDE_DIRS} | ||||||
|      ${Boost_INCLUDE_DIRS} |     ${Boost_INCLUDE_DIRS} | ||||||
|      ${GNURADIO_RUNTIME_INCLUDE_DIRS} |     ${GNURADIO_RUNTIME_INCLUDE_DIRS} | ||||||
|      ${PUGIXML_INCLUDE_DIR} |     ${PUGIXML_INCLUDE_DIR} | ||||||
|      ${GNSS_SDR_OPTIONAL_HEADERS} |     ${GNSS_SDR_OPTIONAL_HEADERS} | ||||||
|      ${VOLK_GNSSSDR_INCLUDE_DIRS} |     ${VOLK_GNSSSDR_INCLUDE_DIRS} | ||||||
|      ${OPT_GNSSSDR_INCLUDE_DIRS} |     ${OPT_GNSSSDR_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| add_definitions( -DGNSS_SDR_VERSION="${VERSION}" ) | add_definitions(-DGNSS_SDR_VERSION="${VERSION}") | ||||||
|  |  | ||||||
| if(OS_IS_MACOSX) | if(OS_IS_MACOSX) | ||||||
|      if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") |     if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") | ||||||
|          set(MAC_LIBRARIES "-framework Accelerate -lc++") |         set(MAC_LIBRARIES "-framework Accelerate -lc++") | ||||||
|      endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") |     endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") | ||||||
| endif(OS_IS_MACOSX) | endif(OS_IS_MACOSX) | ||||||
|  |  | ||||||
| add_executable(gnss-sdr ${CMAKE_CURRENT_SOURCE_DIR}/main.cc) | add_executable(gnss-sdr ${CMAKE_CURRENT_SOURCE_DIR}/main.cc) | ||||||
|  |  | ||||||
| add_custom_command(TARGET gnss-sdr POST_BUILD | add_custom_command(TARGET gnss-sdr | ||||||
|                    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:gnss-sdr> |     POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:gnss-sdr> | ||||||
|                            ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:gnss-sdr> ) |         ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:gnss-sdr> | ||||||
|  | ) | ||||||
|  |  | ||||||
| target_link_libraries(gnss-sdr ${MAC_LIBRARIES} | target_link_libraries(gnss-sdr | ||||||
|                                ${THREAD_LIBRARIES} |     ${MAC_LIBRARIES} | ||||||
|                                ${Boost_LIBRARIES} |     ${THREAD_LIBRARIES} | ||||||
|                                ${GNURADIO_RUNTIME_LIBRARIES} |     ${Boost_LIBRARIES} | ||||||
|                                ${GNURADIO_BLOCKS_LIBRARIES} |     ${GNURADIO_RUNTIME_LIBRARIES} | ||||||
|                                ${GNURADIO_FFT_LIBRARIES} |     ${GNURADIO_BLOCKS_LIBRARIES} | ||||||
|                                ${GNURADIO_FILTER_LIBRARIES} |     ${GNURADIO_FFT_LIBRARIES} | ||||||
|                                ${GFlags_LIBS} |     ${GNURADIO_FILTER_LIBRARIES} | ||||||
|                                ${GLOG_LIBRARIES} |     ${GFlags_LIBS} | ||||||
|                                ${ARMADILLO_LIBRARIES} |     ${GLOG_LIBRARIES} | ||||||
|                                ${VOLK_GNSSSDR_LIBRARIES} |     ${ARMADILLO_LIBRARIES} | ||||||
|                                ${GNSS_SDR_OPTIONAL_LIBS} |     ${VOLK_GNSSSDR_LIBRARIES} | ||||||
|                                gnss_sp_libs |     ${GNSS_SDR_OPTIONAL_LIBS} | ||||||
|                                gnss_sdr_flags |     gnss_sp_libs | ||||||
|                                gnss_rx ) |     gnss_sdr_flags | ||||||
|  |     gnss_rx | ||||||
|  | ) | ||||||
|  |  | ||||||
| install(TARGETS gnss-sdr | install(TARGETS gnss-sdr | ||||||
|         RUNTIME DESTINATION bin |     RUNTIME DESTINATION bin | ||||||
|         COMPONENT "gnss-sdr" ) |     COMPONENT "gnss-sdr") | ||||||
|  |  | ||||||
| install(DIRECTORY ${CMAKE_SOURCE_DIR}/conf DESTINATION share/gnss-sdr | install(DIRECTORY ${CMAKE_SOURCE_DIR}/conf DESTINATION share/gnss-sdr | ||||||
|         FILES_MATCHING PATTERN "*.conf" ) |     FILES_MATCHING PATTERN "*.conf") | ||||||
|  |  | ||||||
| install(FILES ${CMAKE_SOURCE_DIR}/conf/gnss-sdr.conf DESTINATION share/gnss-sdr/conf | install(FILES ${CMAKE_SOURCE_DIR}/conf/gnss-sdr.conf DESTINATION share/gnss-sdr/conf | ||||||
|         RENAME default.conf) |     RENAME default.conf) | ||||||
|  |  | ||||||
| if(NOT VOLK_GNSSSDR_FOUND) | if(NOT VOLK_GNSSSDR_FOUND) | ||||||
|     install(PROGRAMS ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build/apps/volk_gnsssdr_profile DESTINATION bin COMPONENT "volk_gnsssdr") |     install(PROGRAMS ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build/apps/volk_gnsssdr_profile DESTINATION bin COMPONENT "volk_gnsssdr") | ||||||
| @@ -123,22 +126,21 @@ find_program(GZIP | |||||||
|  |  | ||||||
| if(NOT GZIP_NOTFOUND) | if(NOT GZIP_NOTFOUND) | ||||||
|     execute_process(COMMAND gzip -9 -c ${CMAKE_SOURCE_DIR}/docs/manpage/gnss-sdr-manpage |     execute_process(COMMAND gzip -9 -c ${CMAKE_SOURCE_DIR}/docs/manpage/gnss-sdr-manpage | ||||||
|                     WORKING_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_FILE "${CMAKE_BINARY_DIR}/gnss-sdr.1.gz") |         WORKING_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_FILE "${CMAKE_BINARY_DIR}/gnss-sdr.1.gz") | ||||||
|  |  | ||||||
|     install(FILES ${CMAKE_BINARY_DIR}/gnss-sdr.1.gz DESTINATION share/man/man1) |     install(FILES ${CMAKE_BINARY_DIR}/gnss-sdr.1.gz DESTINATION share/man/man1) | ||||||
|  |  | ||||||
|     execute_process(COMMAND gzip -9 -c ${CMAKE_SOURCE_DIR}/docs/changelog |     execute_process(COMMAND gzip -9 -c ${CMAKE_SOURCE_DIR}/docs/changelog | ||||||
|                     WORKING_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_FILE "${CMAKE_BINARY_DIR}/changelog.gz") |         WORKING_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_FILE "${CMAKE_BINARY_DIR}/changelog.gz") | ||||||
|  |  | ||||||
|     install(FILES ${CMAKE_BINARY_DIR}/changelog.gz DESTINATION share/doc/gnss-sdr) |     install(FILES ${CMAKE_BINARY_DIR}/changelog.gz DESTINATION share/doc/gnss-sdr) | ||||||
|  |  | ||||||
|     if(NOT VOLK_GNSSSDR_FOUND) |     if(NOT VOLK_GNSSSDR_FOUND) | ||||||
|          execute_process(COMMAND gzip -9 -c ${CMAKE_SOURCE_DIR}/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Packaging/volk_gnsssdr_profile-manpage |         execute_process(COMMAND gzip -9 -c ${CMAKE_SOURCE_DIR}/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Packaging/volk_gnsssdr_profile-manpage | ||||||
|                          WORKING_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_FILE "${CMAKE_BINARY_DIR}/volk_gnsssdr_profile.1.gz") |             WORKING_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_FILE "${CMAKE_BINARY_DIR}/volk_gnsssdr_profile.1.gz") | ||||||
|          execute_process(COMMAND gzip -9 -c ${CMAKE_SOURCE_DIR}/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Packaging/volk_gnsssdr-config-info-manpage |         execute_process(COMMAND gzip -9 -c ${CMAKE_SOURCE_DIR}/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Packaging/volk_gnsssdr-config-info-manpage | ||||||
|                          WORKING_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_FILE "${CMAKE_BINARY_DIR}/volk_gnsssdr-config-info.1.gz") |             WORKING_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_FILE "${CMAKE_BINARY_DIR}/volk_gnsssdr-config-info.1.gz") | ||||||
|  |         install(FILES ${CMAKE_BINARY_DIR}/volk_gnsssdr_profile.1.gz DESTINATION share/man/man1) | ||||||
|          install(FILES ${CMAKE_BINARY_DIR}/volk_gnsssdr_profile.1.gz DESTINATION share/man/man1) |         install(FILES ${CMAKE_BINARY_DIR}/volk_gnsssdr-config-info.1.gz DESTINATION share/man/man1) | ||||||
|          install(FILES ${CMAKE_BINARY_DIR}/volk_gnsssdr-config-info.1.gz DESTINATION share/man/man1) |  | ||||||
|     endif(NOT VOLK_GNSSSDR_FOUND) |     endif(NOT VOLK_GNSSSDR_FOUND) | ||||||
| endif(NOT GZIP_NOTFOUND) | endif(NOT GZIP_NOTFOUND) | ||||||
|   | |||||||
| @@ -234,6 +234,7 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA) | |||||||
|           set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated") |           set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated") | ||||||
|       endif("${TOOLCHAIN_ARG}" STREQUAL "") |       endif("${TOOLCHAIN_ARG}" STREQUAL "") | ||||||
|       include(GNUInstallDirs) |       include(GNUInstallDirs) | ||||||
|  |       string(REGEX REPLACE /[^/]*$ "" LIBDIR ${CMAKE_INSTALL_LIBDIR}) | ||||||
|       if(CMAKE_VERSION VERSION_LESS 3.2) |       if(CMAKE_VERSION VERSION_LESS 3.2) | ||||||
|           ExternalProject_Add( |           ExternalProject_Add( | ||||||
|             gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION} |             gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION} | ||||||
| @@ -253,13 +254,13 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA) | |||||||
|             SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION} |             SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION} | ||||||
|             BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION} |             BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION} | ||||||
|             CMAKE_ARGS ${GTEST_COMPILER} ${TOOLCHAIN_ARG} -DCMAKE_INSTALL_PREFIX=${CMAKE_SOURCE_DIR}/thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install -DBUILD_EXT=OFF -DBUILD_PYTHON=OFF |             CMAKE_ARGS ${GTEST_COMPILER} ${TOOLCHAIN_ARG} -DCMAKE_INSTALL_PREFIX=${CMAKE_SOURCE_DIR}/thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install -DBUILD_EXT=OFF -DBUILD_PYTHON=OFF | ||||||
|             BUILD_BYPRODUCTS ${CMAKE_SOURCE_DIR}/thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}gpstk${CMAKE_SHARED_LIBRARY_SUFFIX} |             BUILD_BYPRODUCTS ${CMAKE_SOURCE_DIR}/thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/${LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}gpstk${CMAKE_SHARED_LIBRARY_SUFFIX} | ||||||
|             UPDATE_COMMAND "" |             UPDATE_COMMAND "" | ||||||
|             PATCH_COMMAND "" |             PATCH_COMMAND "" | ||||||
|           ) |           ) | ||||||
|       endif(CMAKE_VERSION VERSION_LESS 3.2) |       endif(CMAKE_VERSION VERSION_LESS 3.2) | ||||||
|       set(GPSTK_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/include CACHE PATH "Local GPSTK headers") |       set(GPSTK_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/include CACHE PATH "Local GPSTK headers") | ||||||
|       set(GPSTK_LIBRARY ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}gpstk${CMAKE_SHARED_LIBRARY_SUFFIX}) |       set(GPSTK_LIBRARY ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/${LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}gpstk${CMAKE_SHARED_LIBRARY_SUFFIX}) | ||||||
|       set(GPSTK_BINDIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/bin/) |       set(GPSTK_BINDIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/bin/) | ||||||
|       add_definitions(-DGPSTK_BINDIR="${GPSTK_BINDIR}") |       add_definitions(-DGPSTK_BINDIR="${GPSTK_BINDIR}") | ||||||
|       set(OWN_GPSTK True) |       set(OWN_GPSTK True) | ||||||
|   | |||||||
| @@ -18,13 +18,12 @@ | |||||||
|  |  | ||||||
|  |  | ||||||
| if(OPENSSL_FOUND) | if(OPENSSL_FOUND) | ||||||
|     add_definitions( -DUSE_OPENSSL_FALLBACK=1 ) |     add_definitions(-DUSE_OPENSSL_FALLBACK=1) | ||||||
| endif(OPENSSL_FOUND) | endif(OPENSSL_FOUND) | ||||||
|  |  | ||||||
| set(FRONT_END_CAL_SOURCES front_end_cal.cc) | set(FRONT_END_CAL_SOURCES front_end_cal.cc) | ||||||
| set(FRONT_END_CAL_HEADERS front_end_cal.h) | set(FRONT_END_CAL_HEADERS front_end_cal.h) | ||||||
|  |  | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|     ${CMAKE_SOURCE_DIR}/src/core/system_parameters |     ${CMAKE_SOURCE_DIR}/src/core/system_parameters | ||||||
|     ${CMAKE_SOURCE_DIR}/src/core/interfaces |     ${CMAKE_SOURCE_DIR}/src/core/interfaces | ||||||
| @@ -50,69 +49,69 @@ include_directories( | |||||||
| add_library(front_end_cal_lib ${FRONT_END_CAL_SOURCES} ${FRONT_END_CAL_HEADERS}) | add_library(front_end_cal_lib ${FRONT_END_CAL_SOURCES} ${FRONT_END_CAL_HEADERS}) | ||||||
| source_group(Headers FILES ${FRONT_END_CAL_HEADERS}) | source_group(Headers FILES ${FRONT_END_CAL_HEADERS}) | ||||||
|  |  | ||||||
| target_link_libraries(front_end_cal_lib ${MAC_LIBRARIES} | target_link_libraries(front_end_cal_lib | ||||||
|                                         ${THREAD_LIBRARIES} |     ${MAC_LIBRARIES} | ||||||
|                                         ${Boost_LIBRARIES} |     ${THREAD_LIBRARIES} | ||||||
|                                         ${GNURADIO_RUNTIME_LIBRARIES} |     ${Boost_LIBRARIES} | ||||||
|                                         ${GNURADIO_BLOCKS_LIBRARIES} |     ${GNURADIO_RUNTIME_LIBRARIES} | ||||||
|                                         ${GNURADIO_FFT_LIBRARIES} |     ${GNURADIO_BLOCKS_LIBRARIES} | ||||||
|                                         ${GNURADIO_FILTER_LIBRARIES} |     ${GNURADIO_FFT_LIBRARIES} | ||||||
|                                         ${GFlags_LIBS} |     ${GNURADIO_FILTER_LIBRARIES} | ||||||
|                                         ${GLOG_LIBRARIES} |     ${GFlags_LIBS} | ||||||
|                                         ${ARMADILLO_LIBRARIES} |     ${GLOG_LIBRARIES} | ||||||
|                                         ${VOLK_GNSSSDR_LIBRARIES} ${ORC_LIBRARIES} |     ${ARMADILLO_LIBRARIES} | ||||||
|                                         ${GNSS_SDR_OPTIONAL_LIBS} |     ${VOLK_GNSSSDR_LIBRARIES} ${ORC_LIBRARIES} | ||||||
|                                         rx_core_lib |     ${GNSS_SDR_OPTIONAL_LIBS} | ||||||
|                                         gnss_sdr_flags |     rx_core_lib | ||||||
|                                         gnss_rx |     gnss_sdr_flags | ||||||
|                                         channel_fsm |     gnss_rx | ||||||
|  |     channel_fsm | ||||||
| ) | ) | ||||||
|  |  | ||||||
| add_dependencies(front_end_cal_lib glog-${glog_RELEASE} armadillo-${armadillo_RELEASE}) | add_dependencies(front_end_cal_lib glog-${glog_RELEASE} armadillo-${armadillo_RELEASE}) | ||||||
|  |  | ||||||
| add_definitions( -DGNSS_SDR_VERSION="${VERSION}" ) | add_definitions(-DGNSS_SDR_VERSION="${VERSION}") | ||||||
| add_definitions( -DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}" ) | add_definitions(-DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}") | ||||||
|  |  | ||||||
| add_executable(front-end-cal ${CMAKE_CURRENT_SOURCE_DIR}/main.cc) | add_executable(front-end-cal ${CMAKE_CURRENT_SOURCE_DIR}/main.cc) | ||||||
|  |  | ||||||
| add_custom_command(TARGET front-end-cal POST_BUILD | add_custom_command(TARGET front-end-cal POST_BUILD | ||||||
|                    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:front-end-cal> |     COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:front-end-cal> | ||||||
|                                    ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:front-end-cal>) |         ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:front-end-cal>) | ||||||
|  |  | ||||||
|  | target_link_libraries(front-end-cal | ||||||
| target_link_libraries(front-end-cal    ${MAC_LIBRARIES} |     ${MAC_LIBRARIES} | ||||||
|                                        ${Boost_LIBRARIES} |     ${Boost_LIBRARIES} | ||||||
|                                        ${GNURADIO_RUNTIME_LIBRARIES} |     ${GNURADIO_RUNTIME_LIBRARIES} | ||||||
|                                        ${GNURADIO_BLOCKS_LIBRARIES} |     ${GNURADIO_BLOCKS_LIBRARIES} | ||||||
|                                        ${GNURADIO_FFT_LIBRARIES} |     ${GNURADIO_FFT_LIBRARIES} | ||||||
|                                        ${GNURADIO_FILTER_LIBRARIES} |     ${GNURADIO_FILTER_LIBRARIES} | ||||||
|                                        ${GFlags_LIBS} |     ${GFlags_LIBS} | ||||||
|                                        ${GLOG_LIBRARIES} |     ${GLOG_LIBRARIES} | ||||||
|                                        ${ARMADILLO_LIBRARIES} |     ${ARMADILLO_LIBRARIES} | ||||||
|                                        ${VOLK_GNSSSDR_LIBRARIES} ${ORC_LIBRARIES} |     ${VOLK_GNSSSDR_LIBRARIES} ${ORC_LIBRARIES} | ||||||
|                                        ${GNSS_SDR_OPTIONAL_LIBS} |     ${GNSS_SDR_OPTIONAL_LIBS} | ||||||
|                                        rx_core_lib |     rx_core_lib | ||||||
|                                        gnss_rx |     gnss_rx | ||||||
|                                        front_end_cal_lib |     front_end_cal_lib | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  |  | ||||||
| install(TARGETS front-end-cal | install(TARGETS front-end-cal | ||||||
|         RUNTIME DESTINATION bin |     RUNTIME DESTINATION bin | ||||||
|         COMPONENT "front-end-cal" |     COMPONENT "front-end-cal" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| find_program(GZIP gzip | find_program(GZIP gzip | ||||||
|                  /bin |     /bin | ||||||
|                  /usr/bin |     /usr/bin | ||||||
|                  /usr/local/bin |     /usr/local/bin | ||||||
|                  /opt/local/bin |     /opt/local/bin | ||||||
|                  /sbin |     /sbin | ||||||
|                  ) | ) | ||||||
|  |  | ||||||
| if(NOT GZIP_NOTFOUND) | if(NOT GZIP_NOTFOUND) | ||||||
|     execute_process(COMMAND gzip -9 -c ${CMAKE_SOURCE_DIR}/docs/manpage/front-end-cal-manpage |     execute_process(COMMAND gzip -9 -c ${CMAKE_SOURCE_DIR}/docs/manpage/front-end-cal-manpage | ||||||
|                     WORKING_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_FILE "${CMAKE_BINARY_DIR}/front-end-cal.1.gz") |         WORKING_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_FILE "${CMAKE_BINARY_DIR}/front-end-cal.1.gz") | ||||||
|  |  | ||||||
|     install(FILES ${CMAKE_BINARY_DIR}/front-end-cal.1.gz DESTINATION share/man/man1) |     install(FILES ${CMAKE_BINARY_DIR}/front-end-cal.1.gz DESTINATION share/man/man1) | ||||||
| endif(NOT GZIP_NOTFOUND) | endif(NOT GZIP_NOTFOUND) | ||||||
|   | |||||||
| @@ -19,8 +19,9 @@ | |||||||
| find_package(GPSTK QUIET) | find_package(GPSTK QUIET) | ||||||
| if(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK) | if(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK) | ||||||
|     include(GNUInstallDirs) |     include(GNUInstallDirs) | ||||||
|     set(GPSTK_LIBRARY ${CMAKE_CURRENT_SOURCE_DIR}/../../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}gpstk${CMAKE_SHARED_LIBRARY_SUFFIX} ) |     string(REGEX REPLACE /[^/]*$ "" LIBDIR ${CMAKE_INSTALL_LIBDIR}) | ||||||
|     set(GPSTK_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/include ) |     set(GPSTK_LIBRARY ${CMAKE_CURRENT_SOURCE_DIR}/../../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/${LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}gpstk${CMAKE_SHARED_LIBRARY_SUFFIX}) | ||||||
|  |     set(GPSTK_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}/install/include) | ||||||
| endif(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK) | endif(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK) | ||||||
|  |  | ||||||
| set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} ${GPSTK_INCLUDE_DIR}/gpstk) | set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} ${GPSTK_INCLUDE_DIR}/gpstk) | ||||||
| @@ -42,17 +43,19 @@ target_link_libraries(rinex2assist | |||||||
|     ${GPSTK_LIBRARY} |     ${GPSTK_LIBRARY} | ||||||
|     ${GFlags_LIBS} |     ${GFlags_LIBS} | ||||||
|     gnss_sp_libs |     gnss_sp_libs | ||||||
|     gnss_rx) |     gnss_rx | ||||||
|  | ) | ||||||
|  |  | ||||||
| if(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK) | if(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK) | ||||||
|     add_dependencies(rinex2assist gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}) |     add_dependencies(rinex2assist gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}) | ||||||
| endif(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK) | endif(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK) | ||||||
|  |  | ||||||
| add_custom_command(TARGET rinex2assist POST_BUILD | add_custom_command(TARGET rinex2assist POST_BUILD | ||||||
|                    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:rinex2assist> |     COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:rinex2assist> | ||||||
|                    ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:rinex2assist>) |     ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:rinex2assist> | ||||||
|  | ) | ||||||
|  |  | ||||||
| install(TARGETS rinex2assist | install(TARGETS rinex2assist | ||||||
|                 RUNTIME DESTINATION bin |     RUNTIME DESTINATION bin | ||||||
|                 COMPONENT "rinex2assist" |     COMPONENT "rinex2assist" | ||||||
| ) | ) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Carles Fernandez
					Carles Fernandez