mirror of
				https://github.com/gnss-sdr/gnss-sdr
				synced 2025-10-31 07:13:03 +00:00 
			
		
		
		
	Make cmakelint happier
This commit is contained in:
		
							
								
								
									
										1100
									
								
								CMakeLists.txt
									
									
									
									
									
								
							
							
						
						
									
										1100
									
								
								CMakeLists.txt
									
									
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -21,5 +21,5 @@ add_subdirectory(core) | |||||||
| add_subdirectory(main) | add_subdirectory(main) | ||||||
| if(ENABLE_UNIT_TESTING OR ENABLE_SYSTEM_TESTING) | if(ENABLE_UNIT_TESTING OR ENABLE_SYSTEM_TESTING) | ||||||
|     add_subdirectory(tests) |     add_subdirectory(tests) | ||||||
| endif(ENABLE_UNIT_TESTING OR ENABLE_SYSTEM_TESTING) | endif() | ||||||
| add_subdirectory(utils) | add_subdirectory(utils) | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ | |||||||
|  |  | ||||||
| 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() | ||||||
|  |  | ||||||
| set(PVT_ADAPTER_SOURCES | set(PVT_ADAPTER_SOURCES | ||||||
|     rtklib_pvt.cc |     rtklib_pvt.cc | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ | |||||||
|  |  | ||||||
| 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() | ||||||
|  |  | ||||||
| set(PVT_GR_BLOCKS_SOURCES | set(PVT_GR_BLOCKS_SOURCES | ||||||
|     rtklib_pvt_cc.cc |     rtklib_pvt_cc.cc | ||||||
|   | |||||||
| @@ -16,7 +16,7 @@ | |||||||
| # 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(PVT_LIB_SOURCES | set(PVT_LIB_SOURCES | ||||||
|     pvt_solution.cc |     pvt_solution.cc | ||||||
| @@ -72,13 +72,13 @@ if(MATIO_FOUND) | |||||||
|         glog-${glog_RELEASE} |         glog-${glog_RELEASE} | ||||||
|         armadillo-${armadillo_RELEASE} |         armadillo-${armadillo_RELEASE} | ||||||
|     ) |     ) | ||||||
| else(MATIO_FOUND) | else() | ||||||
|     add_dependencies(pvt_lib |     add_dependencies(pvt_lib | ||||||
|         glog-${glog_RELEASE} |         glog-${glog_RELEASE} | ||||||
|         armadillo-${armadillo_RELEASE} |         armadillo-${armadillo_RELEASE} | ||||||
|         matio-${GNSSSDR_MATIO_LOCAL_VERSION} |         matio-${GNSSSDR_MATIO_LOCAL_VERSION} | ||||||
|     ) |     ) | ||||||
| endif(MATIO_FOUND) | endif() | ||||||
|  |  | ||||||
| target_link_libraries( | target_link_libraries( | ||||||
|     pvt_lib |     pvt_lib | ||||||
|   | |||||||
| @@ -70,7 +70,7 @@ if(ENABLE_FPGA) | |||||||
|         galileo_e5a_pcps_acquisition_fpga.h |         galileo_e5a_pcps_acquisition_fpga.h | ||||||
|         gps_l5i_pcps_acquisition_fpga.h |         gps_l5i_pcps_acquisition_fpga.h | ||||||
|     ) |     ) | ||||||
| endif(ENABLE_FPGA) | endif() | ||||||
|  |  | ||||||
| if(OPENCL_FOUND) | if(OPENCL_FOUND) | ||||||
|     set(ACQ_ADAPTER_SOURCES |     set(ACQ_ADAPTER_SOURCES | ||||||
| @@ -80,7 +80,7 @@ if(OPENCL_FOUND) | |||||||
|     set(ACQ_ADAPTER_HEADERS ${ACQ_ADAPTER_HEADERS} |     set(ACQ_ADAPTER_HEADERS ${ACQ_ADAPTER_HEADERS} | ||||||
|         gps_l1_ca_pcps_opencl_acquisition.h |         gps_l1_ca_pcps_opencl_acquisition.h | ||||||
|     ) |     ) | ||||||
| endif(OPENCL_FOUND) | endif() | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|     ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|   | |||||||
| @@ -42,12 +42,12 @@ set(ACQ_GR_BLOCKS_HEADERS | |||||||
| if(ENABLE_FPGA) | if(ENABLE_FPGA) | ||||||
|     set(ACQ_GR_BLOCKS_SOURCES ${ACQ_GR_BLOCKS_SOURCES} pcps_acquisition_fpga.cc) |     set(ACQ_GR_BLOCKS_SOURCES ${ACQ_GR_BLOCKS_SOURCES} pcps_acquisition_fpga.cc) | ||||||
|     set(ACQ_GR_BLOCKS_HEADERS ${ACQ_GR_BLOCKS_HEADERS} pcps_acquisition_fpga.h) |     set(ACQ_GR_BLOCKS_HEADERS ${ACQ_GR_BLOCKS_HEADERS} pcps_acquisition_fpga.h) | ||||||
| endif(ENABLE_FPGA) | endif() | ||||||
|  |  | ||||||
| if(OPENCL_FOUND) | if(OPENCL_FOUND) | ||||||
|     set(ACQ_GR_BLOCKS_SOURCES ${ACQ_GR_BLOCKS_SOURCES} pcps_opencl_acquisition_cc.cc) |     set(ACQ_GR_BLOCKS_SOURCES ${ACQ_GR_BLOCKS_SOURCES} pcps_opencl_acquisition_cc.cc) | ||||||
|     set(ACQ_GR_BLOCKS_HEADERS ${ACQ_GR_BLOCKS_HEADERS} pcps_opencl_acquisition_cc.h) |     set(ACQ_GR_BLOCKS_HEADERS ${ACQ_GR_BLOCKS_HEADERS} pcps_opencl_acquisition_cc.h) | ||||||
| endif(OPENCL_FOUND) | endif() | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|     ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
| @@ -69,10 +69,10 @@ 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() | ||||||
|         set(OPT_LIBRARIES ${OPT_LIBRARIES} ${OPENCL_LIBRARIES}) |         set(OPT_LIBRARIES ${OPT_LIBRARIES} ${OPENCL_LIBRARIES}) | ||||||
|     endif(OS_IS_MACOSX) |     endif() | ||||||
| endif(OPENCL_FOUND) | endif() | ||||||
|  |  | ||||||
| list(SORT ACQ_GR_BLOCKS_HEADERS) | list(SORT ACQ_GR_BLOCKS_HEADERS) | ||||||
| list(SORT ACQ_GR_BLOCKS_SOURCES) | list(SORT ACQ_GR_BLOCKS_SOURCES) | ||||||
| @@ -91,7 +91,7 @@ if(ENABLE_FPGA) | |||||||
|         ${OPT_LIBRARIES} |         ${OPT_LIBRARIES} | ||||||
|         ${OPT_ACQUISITION_LIBRARIES} |         ${OPT_ACQUISITION_LIBRARIES} | ||||||
|     ) |     ) | ||||||
| else(ENABLE_FPGA) | else() | ||||||
|     target_link_libraries(acq_gr_blocks |     target_link_libraries(acq_gr_blocks | ||||||
|         gnss_sp_libs |         gnss_sp_libs | ||||||
|         gnss_system_parameters |         gnss_system_parameters | ||||||
| @@ -103,8 +103,8 @@ else(ENABLE_FPGA) | |||||||
|         ${MATIO_LIBRARIES} |         ${MATIO_LIBRARIES} | ||||||
|         ${OPT_ACQUISITION_LIBRARIES} |         ${OPT_ACQUISITION_LIBRARIES} | ||||||
|     ) |     ) | ||||||
| endif(ENABLE_FPGA) | endif() | ||||||
|  |  | ||||||
| if(NOT VOLK_GNSSSDR_FOUND) | if(NOT VOLKGNSSSDR_FOUND) | ||||||
|     add_dependencies(acq_gr_blocks volk_gnsssdr_module) |     add_dependencies(acq_gr_blocks volk_gnsssdr_module) | ||||||
| endif(NOT VOLK_GNSSSDR_FOUND) | endif() | ||||||
|   | |||||||
| @@ -30,7 +30,7 @@ if(ENABLE_FPGA) | |||||||
|         ${GFlags_INCLUDE_DIRS} |         ${GFlags_INCLUDE_DIRS} | ||||||
|         ${VOLK_GNSSSDR_INCLUDE_DIRS} |         ${VOLK_GNSSSDR_INCLUDE_DIRS} | ||||||
|     ) |     ) | ||||||
| endif(ENABLE_FPGA) | endif() | ||||||
|  |  | ||||||
| set(ACQUISITION_LIB_HEADERS ${ACQUISITION_LIB_HEADERS} acq_conf.h) | set(ACQUISITION_LIB_HEADERS ${ACQUISITION_LIB_HEADERS} acq_conf.h) | ||||||
| set(ACQUISITION_LIB_SOURCES ${ACQUISITION_LIB_SOURCES} acq_conf.cc) | set(ACQUISITION_LIB_SOURCES ${ACQUISITION_LIB_SOURCES} acq_conf.cc) | ||||||
| @@ -51,8 +51,8 @@ target_link_libraries(acquisition_lib | |||||||
|     ${GNURADIO_RUNTIME_LIBRARIES} |     ${GNURADIO_RUNTIME_LIBRARIES} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| if(VOLK_GNSSSDR_FOUND) | if(VOLKGNSSSDR_FOUND) | ||||||
|     add_dependencies(acquisition_lib glog-${glog_RELEASE}) |     add_dependencies(acquisition_lib glog-${glog_RELEASE}) | ||||||
| else(VOLK_GNSSSDR_FOUND) | else() | ||||||
|     add_dependencies(acquisition_lib glog-${glog_RELEASE} volk_gnsssdr_module) |     add_dependencies(acquisition_lib glog-${glog_RELEASE} volk_gnsssdr_module) | ||||||
| endif() | endif() | ||||||
|   | |||||||
| @@ -48,7 +48,7 @@ include_directories( | |||||||
|  |  | ||||||
| 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() | ||||||
|  |  | ||||||
| list(SORT INPUT_FILTER_ADAPTER_HEADERS) | list(SORT INPUT_FILTER_ADAPTER_HEADERS) | ||||||
| list(SORT INPUT_FILTER_ADAPTER_SOURCES) | list(SORT INPUT_FILTER_ADAPTER_SOURCES) | ||||||
|   | |||||||
| @@ -54,8 +54,8 @@ target_link_libraries(input_filter_gr_blocks | |||||||
|     ${VOLK_GNSSSDR_LIBRARIES} |     ${VOLK_GNSSSDR_LIBRARIES} | ||||||
|     ${LOG4CPP_LIBRARIES}) |     ${LOG4CPP_LIBRARIES}) | ||||||
|  |  | ||||||
| if(NOT VOLK_GNSSSDR_FOUND) | if(NOT VOLKGNSSSDR_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}) | ||||||
| else(NOT VOLK_GNSSSDR_FOUND) | else() | ||||||
|     add_dependencies(input_filter_gr_blocks glog-${glog_RELEASE}) |     add_dependencies(input_filter_gr_blocks glog-${glog_RELEASE}) | ||||||
| endif(NOT VOLK_GNSSSDR_FOUND) | endif() | ||||||
|   | |||||||
| @@ -78,7 +78,7 @@ if(ENABLE_FPGA) | |||||||
|         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() | ||||||
|  |  | ||||||
| if(OPENCL_FOUND) | if(OPENCL_FOUND) | ||||||
|     set(GNSS_SPLIBS_SOURCES ${GNSS_SPLIBS_SOURCES} |     set(GNSS_SPLIBS_SOURCES ${GNSS_SPLIBS_SOURCES} | ||||||
| @@ -91,7 +91,7 @@ if(OPENCL_FOUND) | |||||||
|         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() | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|     ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
| @@ -112,10 +112,10 @@ 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() | ||||||
|         set(OPT_LIBRARIES ${OPT_LIBRARIES} ${OPENCL_LIBRARIES}) |         set(OPT_LIBRARIES ${OPT_LIBRARIES} ${OPENCL_LIBRARIES}) | ||||||
|     endif(OS_IS_MACOSX) |     endif() | ||||||
| endif(OPENCL_FOUND) | endif() | ||||||
|  |  | ||||||
| add_definitions(-DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}") | add_definitions(-DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}") | ||||||
|  |  | ||||||
| @@ -138,16 +138,16 @@ target_link_libraries(gnss_sp_libs | |||||||
|     gnss_rx |     gnss_rx | ||||||
| ) | ) | ||||||
|  |  | ||||||
| if(NOT VOLK_GNSSSDR_FOUND) | if(NOT VOLKGNSSSDR_FOUND) | ||||||
|     add_dependencies(gnss_sp_libs volk_gnsssdr_module |     add_dependencies(gnss_sp_libs volk_gnsssdr_module | ||||||
|         armadillo-${armadillo_RELEASE}) |         armadillo-${armadillo_RELEASE}) | ||||||
| else(NOT VOLK_GNSSSDR_FOUND) | else() | ||||||
|     add_dependencies(gnss_sp_libs armadillo-${armadillo_RELEASE}) |     add_dependencies(gnss_sp_libs armadillo-${armadillo_RELEASE}) | ||||||
| endif(NOT VOLK_GNSSSDR_FOUND) | endif() | ||||||
|  |  | ||||||
| if(${GFLAGS_GREATER_20}) | if(${GFLAGS_GREATER_20}) | ||||||
|     add_definitions(-DGFLAGS_GREATER_2_0=1) |     add_definitions(-DGFLAGS_GREATER_2_0=1) | ||||||
| endif(${GFLAGS_GREATER_20}) | endif() | ||||||
|  |  | ||||||
| add_library(gnss_sdr_flags gnss_sdr_flags.cc gnss_sdr_flags.h) | add_library(gnss_sdr_flags gnss_sdr_flags.cc gnss_sdr_flags.h) | ||||||
| source_group(Headers FILES gnss_sdr_flags.h) | source_group(Headers FILES gnss_sdr_flags.h) | ||||||
|   | |||||||
| @@ -78,7 +78,7 @@ add_dependencies(rtklib_lib glog-${glog_RELEASE}) | |||||||
|  |  | ||||||
| if(OS_IS_MACOSX) | if(OS_IS_MACOSX) | ||||||
|     set(MAC_LIBRARIES "-framework Accelerate") |     set(MAC_LIBRARIES "-framework Accelerate") | ||||||
| endif(OS_IS_MACOSX) | endif() | ||||||
|  |  | ||||||
| target_link_libraries( | target_link_libraries( | ||||||
|     rtklib_lib |     rtklib_lib | ||||||
|   | |||||||
| @@ -48,14 +48,14 @@ if(MATIO_FOUND) | |||||||
|         glog-${glog_RELEASE} |         glog-${glog_RELEASE} | ||||||
|         armadillo-${armadillo_RELEASE} |         armadillo-${armadillo_RELEASE} | ||||||
|     ) |     ) | ||||||
| else(MATIO_FOUND) | else() | ||||||
|     add_dependencies(obs_gr_blocks |     add_dependencies(obs_gr_blocks | ||||||
|         gnss_sp_libs |         gnss_sp_libs | ||||||
|         glog-${glog_RELEASE} |         glog-${glog_RELEASE} | ||||||
|         armadillo-${armadillo_RELEASE} |         armadillo-${armadillo_RELEASE} | ||||||
|         matio-${GNSSSDR_MATIO_LOCAL_VERSION} |         matio-${GNSSSDR_MATIO_LOCAL_VERSION} | ||||||
|     ) |     ) | ||||||
| endif(MATIO_FOUND) | endif() | ||||||
|  |  | ||||||
| target_link_libraries(obs_gr_blocks | target_link_libraries(obs_gr_blocks | ||||||
|     gnss_sp_libs |     gnss_sp_libs | ||||||
|   | |||||||
| @@ -39,7 +39,7 @@ include_directories( | |||||||
|  |  | ||||||
| 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() | ||||||
|  |  | ||||||
| list(SORT RESAMPLER_ADAPTER_HEADERS) | list(SORT RESAMPLER_ADAPTER_HEADERS) | ||||||
| list(SORT RESAMPLER_ADAPTER_SOURCES) | list(SORT RESAMPLER_ADAPTER_SOURCES) | ||||||
|   | |||||||
| @@ -47,8 +47,8 @@ target_link_libraries(signal_generator_blocks | |||||||
|     ${ORC_LIBRARIES} |     ${ORC_LIBRARIES} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| if(VOLK_GNSSSDR_FOUND) | if(VOLKGNSSSDR_FOUND) | ||||||
|     # add_dependencies(signal_generator_blocks glog-${glog_RELEASE}) |     # add_dependencies(signal_generator_blocks glog-${glog_RELEASE}) | ||||||
| else(VOLK_GNSSSDR_FOUND) | else() | ||||||
|     add_dependencies(signal_generator_blocks volk_gnsssdr_module) |     add_dependencies(signal_generator_blocks volk_gnsssdr_module) | ||||||
| endif(VOLK_GNSSSDR_FOUND) | endif() | ||||||
|   | |||||||
| @@ -23,13 +23,13 @@ if(ENABLE_RAW_UDP) | |||||||
|     find_package(PCAP) |     find_package(PCAP) | ||||||
|     if(NOT PCAP_FOUND) |     if(NOT PCAP_FOUND) | ||||||
|         message(FATAL_ERROR "PCAP required to compile custom UDP packet sample source (ENABLE_RAW_UDP)") |         message(FATAL_ERROR "PCAP required to compile custom UDP packet sample source (ENABLE_RAW_UDP)") | ||||||
|     endif(NOT PCAP_FOUND) |     endif() | ||||||
|     get_filename_component(PCAP_LIBRARY_DIRS ${PCAP_LIBRARY} DIRECTORY CACHE) |     get_filename_component(PCAP_LIBRARY_DIRS ${PCAP_LIBRARY} DIRECTORY CACHE) | ||||||
|     set(OPT_LIBRARIES ${OPT_LIBRARIES} ${PCAP_LIBRARIES}) |     set(OPT_LIBRARIES ${OPT_LIBRARIES} ${PCAP_LIBRARIES}) | ||||||
|     set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${PCAP_INCLUDE_DIRS}) |     set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${PCAP_INCLUDE_DIRS}) | ||||||
|     set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} custom_udp_signal_source.cc) |     set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} custom_udp_signal_source.cc) | ||||||
|     set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} custom_udp_signal_source.h) |     set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} custom_udp_signal_source.h) | ||||||
| endif(ENABLE_RAW_UDP) | endif() | ||||||
|  |  | ||||||
| if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2) | if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2) | ||||||
|     find_package(GRIIO REQUIRED) |     find_package(GRIIO REQUIRED) | ||||||
| @@ -40,10 +40,10 @@ if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2) | |||||||
|         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() | ||||||
|     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() | ||||||
|  |  | ||||||
| if(ENABLE_AD9361) | if(ENABLE_AD9361) | ||||||
|     find_package(LIBIIO REQUIRED) |     find_package(LIBIIO REQUIRED) | ||||||
| @@ -54,10 +54,10 @@ if(ENABLE_AD9361) | |||||||
|         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() | ||||||
|     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}) | ||||||
| endif(ENABLE_AD9361) | endif() | ||||||
|  |  | ||||||
|  |  | ||||||
| if(ENABLE_PLUTOSDR) | if(ENABLE_PLUTOSDR) | ||||||
| @@ -67,8 +67,8 @@ if(ENABLE_PLUTOSDR) | |||||||
|     if(GRIIO_FOUND) |     if(GRIIO_FOUND) | ||||||
|         set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} plutosdr_signal_source.cc) |         set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} plutosdr_signal_source.cc) | ||||||
|         set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} plutosdr_signal_source.h) |         set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} plutosdr_signal_source.h) | ||||||
|     endif(GRIIO_FOUND) |     endif() | ||||||
| endif(ENABLE_PLUTOSDR) | endif() | ||||||
|  |  | ||||||
|  |  | ||||||
| if(ENABLE_FMCOMMS2) | if(ENABLE_FMCOMMS2) | ||||||
| @@ -78,8 +78,8 @@ if(ENABLE_FMCOMMS2) | |||||||
|     if(GRIIO_FOUND) |     if(GRIIO_FOUND) | ||||||
|         set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} fmcomms2_signal_source.cc) |         set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} fmcomms2_signal_source.cc) | ||||||
|         set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} fmcomms2_signal_source.h) |         set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} fmcomms2_signal_source.h) | ||||||
|     endif(GRIIO_FOUND) |     endif() | ||||||
| endif(ENABLE_FMCOMMS2) | endif() | ||||||
|  |  | ||||||
|  |  | ||||||
| if(ENABLE_AD9361) | if(ENABLE_AD9361) | ||||||
| @@ -89,8 +89,8 @@ if(ENABLE_AD9361) | |||||||
|     if(LIBIIO_FOUND) |     if(LIBIIO_FOUND) | ||||||
|         set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} ad9361_fpga_signal_source.cc) |         set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} ad9361_fpga_signal_source.cc) | ||||||
|         set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} ad9361_fpga_signal_source.h) |         set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} ad9361_fpga_signal_source.h) | ||||||
|     endif(LIBIIO_FOUND) |     endif() | ||||||
| endif(ENABLE_AD9361) | endif() | ||||||
|  |  | ||||||
|  |  | ||||||
| if(ENABLE_GN3S) | if(ENABLE_GN3S) | ||||||
| @@ -101,12 +101,12 @@ if(ENABLE_GN3S) | |||||||
|     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() | ||||||
|     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() | ||||||
|  |  | ||||||
|  |  | ||||||
| if(ENABLE_FLEXIBAND) | if(ENABLE_FLEXIBAND) | ||||||
| @@ -116,7 +116,7 @@ if(ENABLE_FLEXIBAND) | |||||||
|     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() | ||||||
|     # Set up variables |     # Set up variables | ||||||
|     set(FLEXIBAND_DRIVER_INCLUDE_DIRS |     set(FLEXIBAND_DRIVER_INCLUDE_DIRS | ||||||
|         ${OPT_DRIVER_INCLUDE_DIRS} |         ${OPT_DRIVER_INCLUDE_DIRS} | ||||||
| @@ -126,7 +126,7 @@ if(ENABLE_FLEXIBAND) | |||||||
|     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() | ||||||
|  |  | ||||||
|  |  | ||||||
| if(ENABLE_ARRAY) | if(ENABLE_ARRAY) | ||||||
| @@ -137,12 +137,12 @@ if(ENABLE_ARRAY) | |||||||
|     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() | ||||||
|     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() | ||||||
|  |  | ||||||
|  |  | ||||||
| if(ENABLE_OSMOSDR) | if(ENABLE_OSMOSDR) | ||||||
| @@ -152,8 +152,8 @@ if(ENABLE_OSMOSDR) | |||||||
|     if(NOT GROSMOSDR_FOUND) |     if(NOT GROSMOSDR_FOUND) | ||||||
|         if(ENABLE_PACKAGING) |         if(ENABLE_PACKAGING) | ||||||
|             list(REMOVE_ITEM SIGNAL_SOURCE_ADAPTER_HEADERS ${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/adapters/osmosdr_signal_source.h) |             list(REMOVE_ITEM SIGNAL_SOURCE_ADAPTER_HEADERS ${CMAKE_SOURCE_DIR}/src/algorithms/signal_source/adapters/osmosdr_signal_source.h) | ||||||
|         endif(ENABLE_PACKAGING) |         endif() | ||||||
|     else(NOT GROSMOSDR_FOUND) |     else() | ||||||
|         # set OSMO include dirs |         # set OSMO include dirs | ||||||
|         set(OSMO_DRIVER_INCLUDE_DIRS |         set(OSMO_DRIVER_INCLUDE_DIRS | ||||||
|             ${OPT_DRIVER_INCLUDE_DIRS} |             ${OPT_DRIVER_INCLUDE_DIRS} | ||||||
| @@ -163,8 +163,8 @@ if(ENABLE_OSMOSDR) | |||||||
|         set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} osmosdr_signal_source.h) |         set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} osmosdr_signal_source.h) | ||||||
|         set(OPT_LIBRARIES ${OPT_LIBRARIES} ${GROSMOSDR_LIBRARIES}) |         set(OPT_LIBRARIES ${OPT_LIBRARIES} ${GROSMOSDR_LIBRARIES}) | ||||||
|         set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${OSMO_DRIVER_INCLUDE_DIRS}) |         set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${OSMO_DRIVER_INCLUDE_DIRS}) | ||||||
|     endif(NOT GROSMOSDR_FOUND) |     endif() | ||||||
| endif(ENABLE_OSMOSDR) | endif() | ||||||
|  |  | ||||||
|  |  | ||||||
| if(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd) | if(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd) | ||||||
| @@ -172,27 +172,29 @@ if(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd) | |||||||
|     set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} uhd_signal_source.h) |     set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} uhd_signal_source.h) | ||||||
|     set(OPT_LIBRARIES ${OPT_LIBRARIES} ${UHD_LIBRARIES} ${GNURADIO_UHD_LIBRARIES}) |     set(OPT_LIBRARIES ${OPT_LIBRARIES} ${UHD_LIBRARIES} ${GNURADIO_UHD_LIBRARIES}) | ||||||
|     set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${UHD_INCLUDE_DIRS}) |     set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${UHD_INCLUDE_DIRS}) | ||||||
| endif(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd) | endif() | ||||||
|  |  | ||||||
|  |  | ||||||
| set(SIGNAL_SOURCE_ADAPTER_SOURCES file_signal_source.cc | set(SIGNAL_SOURCE_ADAPTER_SOURCES | ||||||
|                                   gen_signal_source.cc |     file_signal_source.cc | ||||||
|                                   nsr_file_signal_source.cc |     gen_signal_source.cc | ||||||
|                                   spir_file_signal_source.cc |     nsr_file_signal_source.cc | ||||||
|                                   spir_gss6450_file_signal_source.cc |     spir_file_signal_source.cc | ||||||
|                                   rtl_tcp_signal_source.cc |     spir_gss6450_file_signal_source.cc | ||||||
|                                   labsat_signal_source.cc |     rtl_tcp_signal_source.cc | ||||||
|                                   ${OPT_DRIVER_SOURCES} |     labsat_signal_source.cc | ||||||
|  |     ${OPT_DRIVER_SOURCES} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| set(SIGNAL_SOURCE_ADAPTER_HEADERS file_signal_source.h | set(SIGNAL_SOURCE_ADAPTER_HEADERS | ||||||
|                                   gen_signal_source.h |     file_signal_source.h | ||||||
|                                   nsr_file_signal_source.h |     gen_signal_source.h | ||||||
|                                   spir_file_signal_source.h |     nsr_file_signal_source.h | ||||||
|                                   spir_gss6450_file_signal_source.h |     spir_file_signal_source.h | ||||||
|                                   rtl_tcp_signal_source.h |     spir_gss6450_file_signal_source.h | ||||||
|                                   labsat_signal_source.h |     rtl_tcp_signal_source.h | ||||||
|                                   ${OPT_DRIVER_HEADERS} |     labsat_signal_source.h | ||||||
|  |     ${OPT_DRIVER_HEADERS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  |  | ||||||
| @@ -203,7 +205,7 @@ if(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.3) | |||||||
|     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() | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|     ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
| @@ -222,7 +224,7 @@ include_directories( | |||||||
|  |  | ||||||
| if(ARCH_64BITS) | if(ARCH_64BITS) | ||||||
|     add_definitions(-DARCH_64BITS=1) |     add_definitions(-DARCH_64BITS=1) | ||||||
| endif(ARCH_64BITS) | endif() | ||||||
|  |  | ||||||
| add_definitions(-DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}") | add_definitions(-DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}") | ||||||
|  |  | ||||||
|   | |||||||
| @@ -20,14 +20,14 @@ | |||||||
| if(ENABLE_RAW_UDP) | if(ENABLE_RAW_UDP) | ||||||
|     find_package(PCAP) |     find_package(PCAP) | ||||||
|     if(NOT PCAP_FOUND) |     if(NOT PCAP_FOUND) | ||||||
|         message(FATAL_ERROR "PCAP required to compile custom UDP packet sample source (ENABLE_RAW_UDP)") |         message(FATAL_ERROR "PCAP required to compile custom UDP packet sample source") | ||||||
|     endif(NOT PCAP_FOUND) |     endif() | ||||||
|     get_filename_component(PCAP_LIBRARY_DIRS ${PCAP_LIBRARY} DIRECTORY CACHE) |     get_filename_component(PCAP_LIBRARY_DIRS ${PCAP_LIBRARY} DIRECTORY CACHE) | ||||||
|     set(OPT_LIBRARIES ${OPT_LIBRARIES} ${PCAP_LIBRARIES}) |     set(OPT_LIBRARIES ${OPT_LIBRARIES} ${PCAP_LIBRARIES}) | ||||||
|     set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${PCAP_INCLUDE_DIRS}) |     set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${PCAP_INCLUDE_DIRS}) | ||||||
|     set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} gr_complex_ip_packet_source.cc) |     set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} gr_complex_ip_packet_source.cc) | ||||||
|     set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} gr_complex_ip_packet_source.h) |     set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} gr_complex_ip_packet_source.h) | ||||||
| endif(ENABLE_RAW_UDP) | endif() | ||||||
|  |  | ||||||
|  |  | ||||||
| set(SIGNAL_SOURCE_GR_BLOCKS_SOURCES | set(SIGNAL_SOURCE_GR_BLOCKS_SOURCES | ||||||
| @@ -69,12 +69,18 @@ include_directories( | |||||||
| list(SORT SIGNAL_SOURCE_GR_BLOCKS_HEADERS) | list(SORT SIGNAL_SOURCE_GR_BLOCKS_HEADERS) | ||||||
| list(SORT SIGNAL_SOURCE_GR_BLOCKS_SOURCES) | list(SORT SIGNAL_SOURCE_GR_BLOCKS_SOURCES) | ||||||
|  |  | ||||||
| add_library(signal_source_gr_blocks ${SIGNAL_SOURCE_GR_BLOCKS_SOURCES} ${SIGNAL_SOURCE_GR_BLOCKS_HEADERS}) | add_library(signal_source_gr_blocks | ||||||
|  |     ${SIGNAL_SOURCE_GR_BLOCKS_SOURCES} | ||||||
|  |     ${SIGNAL_SOURCE_GR_BLOCKS_HEADERS} | ||||||
|  | ) | ||||||
|  |  | ||||||
| source_group(Headers FILES ${SIGNAL_SOURCE_GR_BLOCKS_HEADERS}) | source_group(Headers FILES ${SIGNAL_SOURCE_GR_BLOCKS_HEADERS}) | ||||||
|  |  | ||||||
| target_link_libraries(signal_source_gr_blocks | target_link_libraries(signal_source_gr_blocks | ||||||
|     signal_source_lib |     signal_source_lib | ||||||
|     ${GNURADIO_RUNTIME_LIBRARIES} |     ${GNURADIO_RUNTIME_LIBRARIES} | ||||||
|     ${Boost_LIBRARIES} |     ${Boost_LIBRARIES} | ||||||
|     ${OPT_LIBRARIES} |     ${OPT_LIBRARIES} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| add_dependencies(signal_source_gr_blocks glog-${glog_RELEASE}) | add_dependencies(signal_source_gr_blocks glog-${glog_RELEASE}) | ||||||
|   | |||||||
| @@ -25,10 +25,10 @@ if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2) | |||||||
|             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() | ||||||
|     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() | ||||||
|  |  | ||||||
| if(ENABLE_FMCOMMS2 OR ENABLE_AD9361) | if(ENABLE_FMCOMMS2 OR ENABLE_AD9361) | ||||||
|     find_package(LIBIIO REQUIRED) |     find_package(LIBIIO REQUIRED) | ||||||
| @@ -39,7 +39,7 @@ if(ENABLE_FMCOMMS2 OR ENABLE_AD9361) | |||||||
|             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() | ||||||
|     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}) | ||||||
|  |  | ||||||
| @@ -49,13 +49,13 @@ if(ENABLE_FMCOMMS2 OR ENABLE_AD9361) | |||||||
|     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() | ||||||
| endif(ENABLE_FMCOMMS2 OR ENABLE_AD9361) | endif() | ||||||
|  |  | ||||||
| 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() | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|     ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
|   | |||||||
| @@ -67,6 +67,6 @@ target_link_libraries(telemetry_decoder_gr_blocks | |||||||
|     ${VOLK_GNSSSDR_LIBRARIES} |     ${VOLK_GNSSSDR_LIBRARIES} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| if(NOT VOLK_GNSSSDR_FOUND) | if(NOT VOLKGNSSSDR_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() | ||||||
|   | |||||||
| @@ -30,7 +30,7 @@ if(ENABLE_CUDA) | |||||||
|         ${OPT_TRACKING_INCLUDE_DIRS} |         ${OPT_TRACKING_INCLUDE_DIRS} | ||||||
|         ${CUDA_INCLUDE_DIRS} |         ${CUDA_INCLUDE_DIRS} | ||||||
|     ) |     ) | ||||||
| endif(ENABLE_CUDA) | endif() | ||||||
|  |  | ||||||
| if(ENABLE_FPGA) | if(ENABLE_FPGA) | ||||||
|     set(OPT_TRACKING_ADAPTERS_SOURCES |     set(OPT_TRACKING_ADAPTERS_SOURCES | ||||||
| @@ -41,7 +41,6 @@ if(ENABLE_FPGA) | |||||||
|         galileo_e5a_dll_pll_tracking_fpga.cc |         galileo_e5a_dll_pll_tracking_fpga.cc | ||||||
|         gps_l5_dll_pll_tracking_fpga.cc |         gps_l5_dll_pll_tracking_fpga.cc | ||||||
|     ) |     ) | ||||||
|  |  | ||||||
|     set(OPT_TRACKING_ADAPTERS_HEADERS |     set(OPT_TRACKING_ADAPTERS_HEADERS | ||||||
|         ${OPT_TRACKING_ADAPTERS_HEADERS} |         ${OPT_TRACKING_ADAPTERS_HEADERS} | ||||||
|         gps_l1_ca_dll_pll_tracking_fpga.h |         gps_l1_ca_dll_pll_tracking_fpga.h | ||||||
| @@ -50,7 +49,7 @@ if(ENABLE_FPGA) | |||||||
|         galileo_e5a_dll_pll_tracking_fpga.h |         galileo_e5a_dll_pll_tracking_fpga.h | ||||||
|         gps_l5_dll_pll_tracking_fpga.h |         gps_l5_dll_pll_tracking_fpga.h | ||||||
|     ) |     ) | ||||||
| endif(ENABLE_FPGA) | endif() | ||||||
|  |  | ||||||
| set(TRACKING_ADAPTER_SOURCES | set(TRACKING_ADAPTER_SOURCES | ||||||
|     galileo_e1_dll_pll_veml_tracking.cc |     galileo_e1_dll_pll_veml_tracking.cc | ||||||
|   | |||||||
| @@ -33,7 +33,7 @@ if(ENABLE_CUDA) | |||||||
|         ${OPT_TRACKING_LIBRARIES} |         ${OPT_TRACKING_LIBRARIES} | ||||||
|         ${CUDA_LIBRARIES} |         ${CUDA_LIBRARIES} | ||||||
|     ) |     ) | ||||||
| endif(ENABLE_CUDA) | endif() | ||||||
|  |  | ||||||
| if(ENABLE_FPGA) | if(ENABLE_FPGA) | ||||||
|     set(OPT_TRACKING_BLOCKS_SOURCES |     set(OPT_TRACKING_BLOCKS_SOURCES | ||||||
| @@ -44,7 +44,7 @@ if(ENABLE_FPGA) | |||||||
|         ${OPT_TRACKING_BLOCKS_HEADERS} |         ${OPT_TRACKING_BLOCKS_HEADERS} | ||||||
|         dll_pll_veml_tracking_fpga.h |         dll_pll_veml_tracking_fpga.h | ||||||
|     ) |     ) | ||||||
| endif(ENABLE_FPGA) | endif() | ||||||
|  |  | ||||||
| set(TRACKING_GR_BLOCKS_SOURCES | set(TRACKING_GR_BLOCKS_SOURCES | ||||||
|     galileo_e1_tcp_connector_tracking_cc.cc |     galileo_e1_tcp_connector_tracking_cc.cc | ||||||
| @@ -97,12 +97,15 @@ include_directories( | |||||||
|  |  | ||||||
| if(ENABLE_GENERIC_ARCH) | if(ENABLE_GENERIC_ARCH) | ||||||
|     add_definitions(-DGENERIC_ARCH=1) |     add_definitions(-DGENERIC_ARCH=1) | ||||||
| endif(ENABLE_GENERIC_ARCH) | endif() | ||||||
|  |  | ||||||
| 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}) | ||||||
|  |  | ||||||
| @@ -116,14 +119,18 @@ target_link_libraries(tracking_gr_blocks | |||||||
|     ${OPT_TRACKING_LIBRARIES} |     ${OPT_TRACKING_LIBRARIES} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| if(NOT VOLK_GNSSSDR_FOUND) | if(NOT VOLKGNSSSDR_FOUND) | ||||||
|     if(MATIO_FOUND) |     if(MATIO_FOUND) | ||||||
|         add_dependencies(tracking_gr_blocks volk_gnsssdr_module) |         add_dependencies(tracking_gr_blocks volk_gnsssdr_module) | ||||||
|     else(MATIO_FOUND) |     else() | ||||||
|         add_dependencies(tracking_gr_blocks volk_gnsssdr_module matio-${GNSSSDR_MATIO_LOCAL_VERSION}) |         add_dependencies(tracking_gr_blocks volk_gnsssdr_module | ||||||
|     endif(MATIO_FOUND) |             matio-${GNSSSDR_MATIO_LOCAL_VERSION} | ||||||
| else(NOT VOLK_GNSSSDR_FOUND) |         ) | ||||||
|  |     endif() | ||||||
|  | else() | ||||||
|     if(NOT MATIO_FOUND) |     if(NOT MATIO_FOUND) | ||||||
|         add_dependencies(tracking_gr_blocks matio-${GNSSSDR_MATIO_LOCAL_VERSION}) |         add_dependencies(tracking_gr_blocks | ||||||
|     endif(NOT MATIO_FOUND) |             matio-${GNSSSDR_MATIO_LOCAL_VERSION} | ||||||
| endif(NOT VOLK_GNSSSDR_FOUND) |         ) | ||||||
|  |     endif() | ||||||
|  | endif() | ||||||
|   | |||||||
| @@ -27,7 +27,7 @@ if(ENABLE_CUDA) | |||||||
|     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() | ||||||
|  |  | ||||||
| set(TRACKING_LIB_SOURCES | set(TRACKING_LIB_SOURCES | ||||||
|     cpu_multicorrelator.cc |     cpu_multicorrelator.cc | ||||||
| @@ -64,7 +64,7 @@ set(TRACKING_LIB_HEADERS | |||||||
| if(ENABLE_FPGA) | if(ENABLE_FPGA) | ||||||
|     set(TRACKING_LIB_SOURCES ${TRACKING_LIB_SOURCES} fpga_multicorrelator.cc dll_pll_conf_fpga.cc) |     set(TRACKING_LIB_SOURCES ${TRACKING_LIB_SOURCES} fpga_multicorrelator.cc dll_pll_conf_fpga.cc) | ||||||
|     set(TRACKING_LIB_HEADERS ${TRACKING_LIB_HEADERS} fpga_multicorrelator.h dll_pll_conf_fpga.h) |     set(TRACKING_LIB_HEADERS ${TRACKING_LIB_HEADERS} fpga_multicorrelator.h dll_pll_conf_fpga.h) | ||||||
| endif(ENABLE_FPGA) | endif() | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|     ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
| @@ -82,11 +82,11 @@ include_directories( | |||||||
|  |  | ||||||
| if(ENABLE_GENERIC_ARCH) | if(ENABLE_GENERIC_ARCH) | ||||||
|     add_definitions(-DGENERIC_ARCH=1) |     add_definitions(-DGENERIC_ARCH=1) | ||||||
| endif(ENABLE_GENERIC_ARCH) | endif() | ||||||
|  |  | ||||||
| if(SSE3_AVAILABLE) | if(SSE3_AVAILABLE) | ||||||
|     add_definitions(-DHAVE_SSE3=1) |     add_definitions(-DHAVE_SSE3=1) | ||||||
| endif(SSE3_AVAILABLE) | endif() | ||||||
|  |  | ||||||
| list(SORT TRACKING_LIB_HEADERS) | list(SORT TRACKING_LIB_HEADERS) | ||||||
| list(SORT TRACKING_LIB_SOURCES) | list(SORT TRACKING_LIB_SOURCES) | ||||||
| @@ -103,8 +103,8 @@ target_link_libraries(tracking_lib | |||||||
|     ${GNURADIO_RUNTIME_LIBRARIES} |     ${GNURADIO_RUNTIME_LIBRARIES} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| if(VOLK_GNSSSDR_FOUND) | if(VOLKGNSSSDR_FOUND) | ||||||
|     add_dependencies(tracking_lib glog-${glog_RELEASE}) |     add_dependencies(tracking_lib glog-${glog_RELEASE}) | ||||||
| else(VOLK_GNSSSDR_FOUND) | else() | ||||||
|     add_dependencies(tracking_lib glog-${glog_RELEASE} volk_gnsssdr_module) |     add_dependencies(tracking_lib glog-${glog_RELEASE} volk_gnsssdr_module) | ||||||
| endif() | endif() | ||||||
|   | |||||||
| @@ -20,7 +20,7 @@ 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() | ||||||
|  |  | ||||||
| set(CORE_LIBS_SOURCES | set(CORE_LIBS_SOURCES | ||||||
|     ini.cc |     ini.cc | ||||||
| @@ -57,4 +57,4 @@ target_link_libraries(rx_core_lib supl_library ${PUGIXML_LIBRARY}) | |||||||
|  |  | ||||||
| if(PUGIXML_LOCAL) | if(PUGIXML_LOCAL) | ||||||
|     add_dependencies(rx_core_lib pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION}) |     add_dependencies(rx_core_lib pugixml-${GNSSSDR_PUGIXML_LOCAL_VERSION}) | ||||||
| endif(PUGIXML_LOCAL) | endif() | ||||||
|   | |||||||
| @@ -27,7 +27,7 @@ set(SUPL_SOURCES | |||||||
|  |  | ||||||
| if(OPENSSL_FOUND) | if(OPENSSL_FOUND) | ||||||
|     add_definitions(-DUSE_OPENSSL_FALLBACK=1) |     add_definitions(-DUSE_OPENSSL_FALLBACK=1) | ||||||
| endif(OPENSSL_FOUND) | endif() | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|     ${CMAKE_CURRENT_SOURCE_DIR} |     ${CMAKE_CURRENT_SOURCE_DIR} | ||||||
| @@ -40,8 +40,8 @@ include_directories( | |||||||
| 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") | ||||||
|         set(MY_C_FLAGS "${MY_C_FLAGS} -Wno-parentheses-equality") |         set(MY_C_FLAGS "${MY_C_FLAGS} -Wno-parentheses-equality") | ||||||
|     endif(CMAKE_BUILD_TYPE MATCHES "Release") |     endif() | ||||||
| endif(CMAKE_C_COMPILER_ID MATCHES "Clang") | endif() | ||||||
| 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}) | ||||||
|   | |||||||
| @@ -34,6 +34,7 @@ set(GNSS_RECEIVER_HEADERS | |||||||
|     gnss_block_factory.h |     gnss_block_factory.h | ||||||
|     gnss_flowgraph.h |     gnss_flowgraph.h | ||||||
|     in_memory_configuration.h |     in_memory_configuration.h | ||||||
|  |     tcp_cmd_interface.h | ||||||
|     concurrent_map.h |     concurrent_map.h | ||||||
|     concurrent_queue.h |     concurrent_queue.h | ||||||
|     control_message.h |     control_message.h | ||||||
| @@ -41,78 +42,86 @@ set(GNSS_RECEIVER_HEADERS | |||||||
|  |  | ||||||
| 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() | ||||||
|  |  | ||||||
| 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 | ||||||
| endif(ENABLE_CUDA) |         ${OPT_RECEIVER_INCLUDE_DIRS} ${CUDA_INCLUDE_DIRS} | ||||||
|  |     ) | ||||||
|  | endif() | ||||||
|  |  | ||||||
| if(ENABLE_FPGA) | if(ENABLE_FPGA) | ||||||
|     add_definitions(-DENABLE_FPGA=1) |     add_definitions(-DENABLE_FPGA=1) | ||||||
| endif(ENABLE_FPGA) | endif() | ||||||
|  |  | ||||||
| if(ENABLE_RAW_UDP) | if(ENABLE_RAW_UDP) | ||||||
|     add_definitions(-DRAW_UDP=1) |     add_definitions(-DRAW_UDP=1) | ||||||
| endif(ENABLE_RAW_UDP) | endif() | ||||||
|  |  | ||||||
| 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() | ||||||
|  |  | ||||||
| if(OPENSSL_FOUND) | if(OPENSSL_FOUND) | ||||||
|     add_definitions( -DUSE_OPENSSL_FALLBACK=1 ) |     add_definitions(-DUSE_OPENSSL_FALLBACK=1) | ||||||
| endif(OPENSSL_FOUND) | endif() | ||||||
|  |  | ||||||
| if(ENABLE_GN3S) | if(ENABLE_GN3S) | ||||||
|     add_definitions(-DGN3S_DRIVER=1) |     add_definitions(-DGN3S_DRIVER=1) | ||||||
| endif(ENABLE_GN3S) | endif() | ||||||
|  |  | ||||||
| if(ENABLE_ARRAY) | if(ENABLE_ARRAY) | ||||||
|     add_definitions(-DRAW_ARRAY_DRIVER=1) |     add_definitions(-DRAW_ARRAY_DRIVER=1) | ||||||
| endif(ENABLE_ARRAY) | endif() | ||||||
|  |  | ||||||
| if(ENABLE_FLEXIBAND) | if(ENABLE_FLEXIBAND) | ||||||
|     add_definitions(-DFLEXIBAND_DRIVER=1) |     add_definitions(-DFLEXIBAND_DRIVER=1) | ||||||
| endif(ENABLE_FLEXIBAND) | endif() | ||||||
|  |  | ||||||
| if(ENABLE_OSMOSDR) | if(ENABLE_OSMOSDR) | ||||||
|     if(GROSMOSDR_FOUND) |     if(GROSMOSDR_FOUND) | ||||||
|         add_definitions(-DOSMOSDR_DRIVER=1) |         add_definitions(-DOSMOSDR_DRIVER=1) | ||||||
|     endif(GROSMOSDR_FOUND) |     endif() | ||||||
| endif(ENABLE_OSMOSDR) | endif() | ||||||
|  |  | ||||||
| if(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd) | if(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd) | ||||||
|     add_definitions(-DUHD_DRIVER=1) |     add_definitions(-DUHD_DRIVER=1) | ||||||
| endif(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd) | endif() | ||||||
|  |  | ||||||
| #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() | ||||||
|     add_definitions(-DOPENCL_BLOCKS=0) |     add_definitions(-DOPENCL_BLOCKS=0) | ||||||
| endif(OPENCL_FOUND) | endif() | ||||||
|  |  | ||||||
| #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 | ||||||
| endif(ENABLE_PLUTOSDR) |         ${OPT_RECEIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS} | ||||||
|  |     ) | ||||||
|  | endif() | ||||||
|  |  | ||||||
| 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 | ||||||
| endif(ENABLE_FMCOMMS2) |         ${OPT_RECEIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS} | ||||||
|  |     ) | ||||||
|  | endif() | ||||||
|  |  | ||||||
| if(ENABLE_AD9361) | if(ENABLE_AD9361) | ||||||
|     add_definitions(-DAD9361_DRIVER=1) |     add_definitions(-DAD9361_DRIVER=1) | ||||||
|     set(OPT_RECEIVER_INCLUDE_DIRS ${OPT_RECEIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS}) |     set(OPT_RECEIVER_INCLUDE_DIRS | ||||||
| endif(ENABLE_AD9361) |         ${OPT_RECEIVER_INCLUDE_DIRS} ${IIO_INCLUDE_DIRS} | ||||||
|  |     ) | ||||||
|  | endif() | ||||||
|  |  | ||||||
| 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() | ||||||
|  |  | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
| @@ -184,7 +193,8 @@ add_library(gnss_rx | |||||||
|     ${GNSS_RECEIVER_INTERFACE_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 | target_link_libraries(gnss_rx | ||||||
|     ${Boost_LIBRARIES} |     ${Boost_LIBRARIES} | ||||||
|   | |||||||
| @@ -99,8 +99,6 @@ include_directories( | |||||||
|     ${GFlags_INCLUDE_DIRS} |     ${GFlags_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
| 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) | ||||||
|  |  | ||||||
|   | |||||||
| @@ -23,28 +23,28 @@ if(ENABLE_GPERFTOOLS) | |||||||
|     if(GPERFTOOLS_FOUND) |     if(GPERFTOOLS_FOUND) | ||||||
|         set(GNSS_SDR_OPTIONAL_LIBS "${GNSS_SDR_OPTIONAL_LIBS};${GPERFTOOLS_PROFILER};${GPERFTOOLS_TCMALLOC}") |         set(GNSS_SDR_OPTIONAL_LIBS "${GNSS_SDR_OPTIONAL_LIBS};${GPERFTOOLS_PROFILER};${GPERFTOOLS_TCMALLOC}") | ||||||
|         set(GNSS_SDR_OPTIONAL_HEADERS "${GNSS_SDR_OPTIONAL_HEADERS};${GPERFTOOLS_INCLUDE_DIR}") |         set(GNSS_SDR_OPTIONAL_HEADERS "${GNSS_SDR_OPTIONAL_HEADERS};${GPERFTOOLS_INCLUDE_DIR}") | ||||||
|     endif(GPERFTOOLS_FOUND) |     endif() | ||||||
| endif(ENABLE_GPERFTOOLS) | endif() | ||||||
|  |  | ||||||
| if(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd) | if(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd) | ||||||
|     set(GNSS_SDR_OPTIONAL_LIBS ${GNSS_SDR_OPTIONAL_LIBS} ${UHD_LIBRARIES} ${GNURADIO_UHD_LIBRARIES}) |     set(GNSS_SDR_OPTIONAL_LIBS ${GNSS_SDR_OPTIONAL_LIBS} ${UHD_LIBRARIES} ${GNURADIO_UHD_LIBRARIES}) | ||||||
|     set(GNSS_SDR_OPTIONAL_HEADERS ${GNSS_SDR_OPTIONAL_HEADERS} ${UHD_INCLUDE_DIRS}) |     set(GNSS_SDR_OPTIONAL_HEADERS ${GNSS_SDR_OPTIONAL_HEADERS} ${UHD_INCLUDE_DIRS}) | ||||||
| endif(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd) | endif() | ||||||
|  |  | ||||||
| if(OPENSSL_FOUND) | if(OPENSSL_FOUND) | ||||||
|     add_definitions(-DUSE_OPENSSL_FALLBACK=1) |     add_definitions(-DUSE_OPENSSL_FALLBACK=1) | ||||||
| endif(OPENSSL_FOUND) | endif() | ||||||
|  |  | ||||||
| if(ENABLE_CUDA) | if(ENABLE_CUDA) | ||||||
|     add_definitions(-DCUDA_GPU_ACCEL=1) |     add_definitions(-DCUDA_GPU_ACCEL=1) | ||||||
|     set(GNSS_SDR_OPTIONAL_LIBS ${GNSS_SDR_OPTIONAL_LIBS} ${CUDA_LIBRARIES}) |     set(GNSS_SDR_OPTIONAL_LIBS ${GNSS_SDR_OPTIONAL_LIBS} ${CUDA_LIBRARIES}) | ||||||
|     set(GNSS_SDR_OPTIONAL_HEADERS ${GNSS_SDR_OPTIONAL_HEADERS} ${CUDA_INCLUDE_DIRS}) |     set(GNSS_SDR_OPTIONAL_HEADERS ${GNSS_SDR_OPTIONAL_HEADERS} ${CUDA_INCLUDE_DIRS}) | ||||||
| endif(ENABLE_CUDA) | endif() | ||||||
|  |  | ||||||
| if(ORC_FOUND) | if(ORC_FOUND) | ||||||
|     set(GNSS_SDR_OPTIONAL_LIBS ${GNSS_SDR_OPTIONAL_LIBS} ${ORC_LIBRARIES}) |     set(GNSS_SDR_OPTIONAL_LIBS ${GNSS_SDR_OPTIONAL_LIBS} ${ORC_LIBRARIES}) | ||||||
|     set(GNSS_SDR_OPTIONAL_HEADERS ${GNSS_SDR_OPTIONAL_HEADERS} ${ORC_INCLUDE_DIRS}) |     set(GNSS_SDR_OPTIONAL_HEADERS ${GNSS_SDR_OPTIONAL_HEADERS} ${ORC_INCLUDE_DIRS}) | ||||||
| endif(ORC_FOUND) | endif() | ||||||
|  |  | ||||||
| include_directories( | include_directories( | ||||||
|     ${CMAKE_SOURCE_DIR}/src/core/system_parameters |     ${CMAKE_SOURCE_DIR}/src/core/system_parameters | ||||||
| @@ -72,8 +72,8 @@ 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() | ||||||
| endif(OS_IS_MACOSX) | endif() | ||||||
|  |  | ||||||
| add_executable(gnss-sdr ${CMAKE_CURRENT_SOURCE_DIR}/main.cc) | add_executable(gnss-sdr ${CMAKE_CURRENT_SOURCE_DIR}/main.cc) | ||||||
|  |  | ||||||
| @@ -110,10 +110,10 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/conf DESTINATION share/gnss-sdr | |||||||
| 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 VOLKGNSSSDR_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") | ||||||
|     install(PROGRAMS ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build/apps/volk_gnsssdr-config-info DESTINATION bin COMPONENT "volk_gnsssdr") |     install(PROGRAMS ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build/apps/volk_gnsssdr-config-info DESTINATION bin COMPONENT "volk_gnsssdr") | ||||||
| endif(NOT VOLK_GNSSSDR_FOUND) | endif() | ||||||
|  |  | ||||||
| find_program(GZIP | find_program(GZIP | ||||||
|     gzip |     gzip | ||||||
| @@ -135,12 +135,12 @@ if(NOT GZIP_NOTFOUND) | |||||||
|  |  | ||||||
|     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 VOLKGNSSSDR_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() | ||||||
| endif(NOT GZIP_NOTFOUND) | endif() | ||||||
|   | |||||||
| @@ -25,26 +25,26 @@ add_subdirectory(system-tests/libs) | |||||||
| ################################################################################ | ################################################################################ | ||||||
| if(EXISTS $ENV{GTEST_DIR}) | if(EXISTS $ENV{GTEST_DIR}) | ||||||
|     set(GTEST_DIR_LOCAL $ENV{GTEST_DIR}) |     set(GTEST_DIR_LOCAL $ENV{GTEST_DIR}) | ||||||
| endif(EXISTS $ENV{GTEST_DIR}) | endif() | ||||||
| if(GTEST_DIR) | if(GTEST_DIR) | ||||||
|     set(GTEST_DIR_LOCAL ${GTEST_DIR}) |     set(GTEST_DIR_LOCAL ${GTEST_DIR}) | ||||||
| endif(GTEST_DIR) | endif() | ||||||
| if(NOT GTEST_DIR_LOCAL) | if(NOT GTEST_DIR_LOCAL) | ||||||
|     set(GTEST_DIR_LOCAL false) |     set(GTEST_DIR_LOCAL false) | ||||||
| else() | else() | ||||||
|     set(GTEST_DIR_LOCAL true) |     set(GTEST_DIR_LOCAL true) | ||||||
| endif(NOT GTEST_DIR_LOCAL) | endif() | ||||||
|  |  | ||||||
| if(GTEST_INCLUDE_DIRS) | if(GTEST_INCLUDE_DIRS) | ||||||
|     set(GTEST_DIR_LOCAL true) |     set(GTEST_DIR_LOCAL true) | ||||||
| endif(GTEST_INCLUDE_DIRS) | endif() | ||||||
|  |  | ||||||
| set(GTEST_COMPILER -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}) | set(GTEST_COMPILER -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}) | ||||||
| set(TOOLCHAIN_ARG "") | set(TOOLCHAIN_ARG "") | ||||||
| if(EXISTS $ENV{OECORE_TARGET_SYSROOT}) | if(EXISTS $ENV{OECORE_TARGET_SYSROOT}) | ||||||
|     set(GTEST_COMPILER "") |     set(GTEST_COMPILER "") | ||||||
|     set(TOOLCHAIN_ARG "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/Toolchains/oe-sdk_cross.cmake") |     set(TOOLCHAIN_ARG "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/Toolchains/oe-sdk_cross.cmake") | ||||||
| endif(EXISTS $ENV{OECORE_TARGET_SYSROOT}) | endif() | ||||||
|  |  | ||||||
| if(NOT ${GTEST_DIR_LOCAL}) | if(NOT ${GTEST_DIR_LOCAL}) | ||||||
|     # if GTEST_DIR is not defined, we download and build it |     # if GTEST_DIR is not defined, we download and build it | ||||||
| @@ -60,7 +60,7 @@ if(NOT ${GTEST_DIR_LOCAL}) | |||||||
|         PATCH_COMMAND "" |         PATCH_COMMAND "" | ||||||
|         INSTALL_COMMAND "" |         INSTALL_COMMAND "" | ||||||
|       ) |       ) | ||||||
|     else(CMAKE_VERSION VERSION_LESS 3.2) |     else() | ||||||
|       ExternalProject_Add( |       ExternalProject_Add( | ||||||
|         gtest-${GNSSSDR_GTEST_LOCAL_VERSION} |         gtest-${GNSSSDR_GTEST_LOCAL_VERSION} | ||||||
|         GIT_REPOSITORY https://github.com/google/googletest |         GIT_REPOSITORY https://github.com/google/googletest | ||||||
| @@ -74,7 +74,7 @@ if(NOT ${GTEST_DIR_LOCAL}) | |||||||
|             ${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${GNSSSDR_GTEST_LOCAL_VERSION}/googletest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX} |             ${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${GNSSSDR_GTEST_LOCAL_VERSION}/googletest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX} | ||||||
|         INSTALL_COMMAND "" |         INSTALL_COMMAND "" | ||||||
|       ) |       ) | ||||||
|     endif(CMAKE_VERSION VERSION_LESS 3.2) |     endif() | ||||||
|  |  | ||||||
|     # Set up variables |     # Set up variables | ||||||
|     # Set recently downloaded and build Googletest root folder |     # Set recently downloaded and build Googletest root folder | ||||||
| @@ -87,30 +87,31 @@ if(NOT ${GTEST_DIR_LOCAL}) | |||||||
|     ExternalProject_Get_Property(gtest-${GNSSSDR_GTEST_LOCAL_VERSION} binary_dir) |     ExternalProject_Get_Property(gtest-${GNSSSDR_GTEST_LOCAL_VERSION} binary_dir) | ||||||
|     if(OS_IS_MACOSX) |     if(OS_IS_MACOSX) | ||||||
|         if(CMAKE_GENERATOR STREQUAL Xcode) |         if(CMAKE_GENERATOR STREQUAL Xcode) | ||||||
|             set(binary_dir "${binary_dir}/Debug") |             set(FINAL_D "d") | ||||||
|         endif(CMAKE_GENERATOR STREQUAL Xcode) |             set(ADD_DEBUG "Debug/") | ||||||
|     endif(OS_IS_MACOSX) |         endif() | ||||||
|     set(GTEST_LIBRARY_PATH "${binary_dir}/googletest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest${CMAKE_STATIC_LIBRARY_SUFFIX};${binary_dir}/googletest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}") |     endif() | ||||||
|  |     set(GTEST_LIBRARY_PATH "${binary_dir}/googletest/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX};${binary_dir}/googletest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX}") | ||||||
|     set(GTEST_LIBRARY gtest-${GNSSSDR_GTEST_LOCAL_VERSION}) |     set(GTEST_LIBRARY gtest-${GNSSSDR_GTEST_LOCAL_VERSION}) | ||||||
|     set(GTEST_LIBRARIES |     set(GTEST_LIBRARIES | ||||||
|         ${binary_dir}/googletest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest${CMAKE_STATIC_LIBRARY_SUFFIX} |         ${binary_dir}/googletest/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX} | ||||||
|         ${binary_dir}/googletest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX} |         ${binary_dir}/googletest/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX} | ||||||
|         ${THREAD_LIBRARIES}) |         ${THREAD_LIBRARIES}) | ||||||
|     set(GTEST_LIB_DIR "${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${GNSSSDR_GTEST_LOCAL_VERSION}/googletest") |     set(GTEST_LIB_DIR "${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${GNSSSDR_GTEST_LOCAL_VERSION}/googletest") | ||||||
| else(NOT ${GTEST_DIR_LOCAL}) | else() | ||||||
|     if(GTEST_INCLUDE_DIRS) |     if(GTEST_INCLUDE_DIRS) | ||||||
|         set(GTEST_INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIRS} ${LIBGTEST_DEV_DIR}) |         set(GTEST_INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIRS} ${LIBGTEST_DEV_DIR}) | ||||||
|         add_library(gtest ${LIBGTEST_DEV_DIR}/src/gtest-all.cc ${LIBGTEST_DEV_DIR}/src/gtest_main.cc) |         add_library(gtest ${LIBGTEST_DEV_DIR}/src/gtest-all.cc ${LIBGTEST_DEV_DIR}/src/gtest_main.cc) | ||||||
|         set(GTEST_LIBRARIES gtest) |         set(GTEST_LIBRARIES gtest) | ||||||
|     else(GTEST_INCLUDE_DIRS) |     else() | ||||||
|         # If the variable GTEST_DIR is defined, we use the existing Googletest |         # If the variable GTEST_DIR is defined, we use the existing Googletest | ||||||
|         set(GTEST_DIR $ENV{GTEST_DIR}) |         set(GTEST_DIR $ENV{GTEST_DIR}) | ||||||
|         set(GTEST_INCLUDE_DIRECTORIES ${GTEST_DIR}/include ${GTEST_DIR} ${GTEST_DIR}/src) |         set(GTEST_INCLUDE_DIRECTORIES ${GTEST_DIR}/include ${GTEST_DIR} ${GTEST_DIR}/src) | ||||||
|         add_library(gtest ${GTEST_DIR}/src/gtest-all.cc ${GTEST_DIR}/src/gtest_main.cc) |         add_library(gtest ${GTEST_DIR}/src/gtest-all.cc ${GTEST_DIR}/src/gtest_main.cc) | ||||||
|         set(GTEST_LIBRARIES gtest) |         set(GTEST_LIBRARIES gtest) | ||||||
|     endif(GTEST_INCLUDE_DIRS) |     endif() | ||||||
|     target_link_libraries(gtest ${THREAD_LIBRARIES}) |     target_link_libraries(gtest ${THREAD_LIBRARIES}) | ||||||
| endif(NOT ${GTEST_DIR_LOCAL}) | endif() | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
| @@ -123,58 +124,57 @@ set(GNSS_SDR_TEST_OPTIONAL_HEADERS "") | |||||||
| if(ENABLE_CUDA) | if(ENABLE_CUDA) | ||||||
|     set(GNSS_SDR_TEST_OPTIONAL_HEADERS ${GNSS_SDR_TEST_OPTIONAL_HEADERS} ${CUDA_INCLUDE_DIRS}) |     set(GNSS_SDR_TEST_OPTIONAL_HEADERS ${GNSS_SDR_TEST_OPTIONAL_HEADERS} ${CUDA_INCLUDE_DIRS}) | ||||||
|     set(GNSS_SDR_TEST_OPTIONAL_LIBS ${GNSS_SDR_TEST_OPTIONAL_LIBS} ${CUDA_LIBRARIES}) |     set(GNSS_SDR_TEST_OPTIONAL_LIBS ${GNSS_SDR_TEST_OPTIONAL_LIBS} ${CUDA_LIBRARIES}) | ||||||
| endif(ENABLE_CUDA) | endif() | ||||||
|  |  | ||||||
|  |  | ||||||
| if(ENABLE_GPERFTOOLS) | if(ENABLE_GPERFTOOLS) | ||||||
|     if(GPERFTOOLS_FOUND) |     if(GPERFTOOLS_FOUND) | ||||||
|         set(GNSS_SDR_TEST_OPTIONAL_LIBS "${GNSS_SDR_TEST_OPTIONAL_LIBS};${GPERFTOOLS_LIBRARIES}") |         set(GNSS_SDR_TEST_OPTIONAL_LIBS "${GNSS_SDR_TEST_OPTIONAL_LIBS};${GPERFTOOLS_LIBRARIES}") | ||||||
|         set(GNSS_SDR_TEST_OPTIONAL_HEADERS "${GNSS_SDR_TEST_OPTIONAL_HEADERS};${GPERFTOOLS_INCLUDE_DIR}") |         set(GNSS_SDR_TEST_OPTIONAL_HEADERS "${GNSS_SDR_TEST_OPTIONAL_HEADERS};${GPERFTOOLS_INCLUDE_DIR}") | ||||||
|     endif(GPERFTOOLS_FOUND) |     endif() | ||||||
| endif(ENABLE_GPERFTOOLS) | endif() | ||||||
|  |  | ||||||
| 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() | ||||||
|  |  | ||||||
| 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() | ||||||
|  |  | ||||||
|  | if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.15") | ||||||
|  |     add_definitions(-DGR_GREATER_38=1) | ||||||
|  | endif() | ||||||
|  |  | ||||||
| if(OPENSSL_FOUND) | if(OPENSSL_FOUND) | ||||||
|     add_definitions(-DUSE_OPENSSL_FALLBACK=1) |     add_definitions(-DUSE_OPENSSL_FALLBACK=1) | ||||||
| endif(OPENSSL_FOUND) | endif() | ||||||
|  |  | ||||||
| if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") | if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") | ||||||
|     if(OS_IS_MACOSX) |     if(OS_IS_MACOSX) | ||||||
|         set(CLANG_FLAGS "-stdlib=libc++ -lc++") |         set(CLANG_FLAGS "-stdlib=libc++ -lc++") | ||||||
|     endif(OS_IS_MACOSX) |     endif() | ||||||
| endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") | endif() | ||||||
|  |  | ||||||
| if(OPENCL_FOUND) | if(OPENCL_FOUND) | ||||||
|     add_definitions(-DOPENCL_BLOCKS_TEST=1) |     add_definitions(-DOPENCL_BLOCKS_TEST=1) | ||||||
| endif(OPENCL_FOUND) | endif() | ||||||
|  |  | ||||||
| if(ENABLE_CUDA) | if(ENABLE_CUDA) | ||||||
|     add_definitions(-DCUDA_BLOCKS_TEST=1) |     add_definitions(-DCUDA_BLOCKS_TEST=1) | ||||||
| endif(ENABLE_CUDA) | endif() | ||||||
|  |  | ||||||
| if(ENABLE_FPGA) | if(ENABLE_FPGA) | ||||||
|     add_definitions(-DFPGA_BLOCKS_TEST=1) |     add_definitions(-DFPGA_BLOCKS_TEST=1) | ||||||
| endif(ENABLE_FPGA) | endif() | ||||||
|  |  | ||||||
| find_package(Gnuplot) | find_package(Gnuplot) | ||||||
| if(GNUPLOT_FOUND) | if(GNUPLOT_FOUND) | ||||||
|     add_definitions(-DGNUPLOT_EXECUTABLE="${GNUPLOT_EXECUTABLE}") |     add_definitions(-DGNUPLOT_EXECUTABLE="${GNUPLOT_EXECUTABLE}") | ||||||
| endif(GNUPLOT_FOUND) | endif() | ||||||
|  |  | ||||||
| if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.15") |  | ||||||
|     add_definitions(-DGR_GREATER_38=1) |  | ||||||
| endif(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.15") |  | ||||||
|  |  | ||||||
| if(ENABLE_UNIT_TESTING_MINIMAL) | if(ENABLE_UNIT_TESTING_MINIMAL) | ||||||
|     add_definitions(-DUNIT_TESTING_MINIMAL=1) |     add_definitions(-DUNIT_TESTING_MINIMAL=1) | ||||||
| endif(ENABLE_UNIT_TESTING_MINIMAL) | endif() | ||||||
|  |  | ||||||
|  |  | ||||||
| ################################################################################ | ################################################################################ | ||||||
| @@ -186,42 +186,42 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA) | |||||||
|       set(CROSS_INSTALL_DIR "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}") |       set(CROSS_INSTALL_DIR "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}") | ||||||
|       if(EXISTS $ENV{OECORE_TARGET_SYSROOT}) |       if(EXISTS $ENV{OECORE_TARGET_SYSROOT}) | ||||||
|           set(CROSS_INSTALL_DIR "${CROSS_INSTALL_DIR} -DBOOST_ROOT=$ENV{OECORE_TARGET_SYSROOT}/usr") |           set(CROSS_INSTALL_DIR "${CROSS_INSTALL_DIR} -DBOOST_ROOT=$ENV{OECORE_TARGET_SYSROOT}/usr") | ||||||
|       endif(EXISTS $ENV{OECORE_TARGET_SYSROOT}) |       endif() | ||||||
|     else(ENABLE_FPGA) |     else() | ||||||
|       set(CROSS_INSTALL_DIR "") |       set(CROSS_INSTALL_DIR "") | ||||||
|     endif(ENABLE_FPGA) |     endif() | ||||||
|     find_package(GNSSSIMULATOR QUIET) |     find_package(GNSSSIMULATOR QUIET) | ||||||
|     if(GNSSSIMULATOR_FOUND OR NOT ENABLE_GNSS_SIM_INSTALL) |     if(GNSSSIMULATOR_FOUND OR NOT ENABLE_GNSS_SIM_INSTALL) | ||||||
|       add_definitions(-DSW_GENERATOR_BIN="${SW_GENERATOR_BIN}") |       add_definitions(-DSW_GENERATOR_BIN="${SW_GENERATOR_BIN}") | ||||||
|       add_definitions(-DDEFAULT_RINEX_NAV="${CMAKE_INSTALL_PREFIX}/share/gnss-sim/brdc3540.14n") |       add_definitions(-DDEFAULT_RINEX_NAV="${CMAKE_INSTALL_PREFIX}/share/gnss-sim/brdc3540.14n") | ||||||
|       add_definitions(-DDEFAULT_POSITION_FILE="${CMAKE_INSTALL_PREFIX}/share/gnss-sim/circle.csv") |       add_definitions(-DDEFAULT_POSITION_FILE="${CMAKE_INSTALL_PREFIX}/share/gnss-sim/circle.csv") | ||||||
|     else(GNSSSIMULATOR_FOUND OR NOT ENABLE_GNSS_SIM_INSTALL) |     else() | ||||||
|       ExternalProject_Add( |         ExternalProject_Add( | ||||||
|           gnss-sim |             gnss-sim | ||||||
|           GIT_REPOSITORY https://bitbucket.org/jarribas/gnss-simulator |             GIT_REPOSITORY https://bitbucket.org/jarribas/gnss-simulator | ||||||
|           GIT_TAG ${GNSSSDR_GNSS_SIM_LOCAL_VERSION} |             GIT_TAG ${GNSSSDR_GNSS_SIM_LOCAL_VERSION} | ||||||
|           SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gnss-sim |             SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gnss-sim | ||||||
|           BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../gnss-sim |             BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../gnss-sim | ||||||
|           CMAKE_ARGS ${GTEST_COMPILER} ${TOOLCHAIN_ARG} ${CROSS_INSTALL_DIR} |             CMAKE_ARGS ${GTEST_COMPILER} ${TOOLCHAIN_ARG} ${CROSS_INSTALL_DIR} | ||||||
|           UPDATE_COMMAND "" |             UPDATE_COMMAND "" | ||||||
|           PATCH_COMMAND "" |             PATCH_COMMAND "" | ||||||
|           INSTALL_COMMAND "" |             INSTALL_COMMAND "" | ||||||
|       ) |         ) | ||||||
|       if(ENABLE_INSTALL_TESTS) |         if(ENABLE_INSTALL_TESTS) | ||||||
|           install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/../../gnss-sim/gnss_sim DESTINATION bin) |             install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/../../gnss-sim/gnss_sim DESTINATION bin) | ||||||
|           install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../../thirdparty/gnss-sim/brdc3540.14n DESTINATION share/gnss-sim) |             install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../../thirdparty/gnss-sim/brdc3540.14n DESTINATION share/gnss-sim) | ||||||
|           install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../../thirdparty/gnss-sim/circle.csv DESTINATION share/gnss-sim) |             install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../../thirdparty/gnss-sim/circle.csv DESTINATION share/gnss-sim) | ||||||
|           set(SW_GENERATOR_BIN ${CMAKE_INSTALL_PREFIX}/bin/gnss_sim) |             set(SW_GENERATOR_BIN ${CMAKE_INSTALL_PREFIX}/bin/gnss_sim) | ||||||
|           add_definitions(-DSW_GENERATOR_BIN="${SW_GENERATOR_BIN}") |             add_definitions(-DSW_GENERATOR_BIN="${SW_GENERATOR_BIN}") | ||||||
|           add_definitions(-DDEFAULT_RINEX_NAV="${CMAKE_INSTALL_PREFIX}/share/gnss-sim/brdc3540.14n") |             add_definitions(-DDEFAULT_RINEX_NAV="${CMAKE_INSTALL_PREFIX}/share/gnss-sim/brdc3540.14n") | ||||||
|           add_definitions(-DDEFAULT_POSITION_FILE="${CMAKE_INSTALL_PREFIX}/share/gnss-sim/circle.csv") |             add_definitions(-DDEFAULT_POSITION_FILE="${CMAKE_INSTALL_PREFIX}/share/gnss-sim/circle.csv") | ||||||
|       else(ENABLE_INSTALL_TESTS) |         else() | ||||||
|           set(SW_GENERATOR_BIN ${CMAKE_CURRENT_BINARY_DIR}/../../gnss-sim/gnss_sim) |             set(SW_GENERATOR_BIN ${CMAKE_CURRENT_BINARY_DIR}/../../gnss-sim/gnss_sim) | ||||||
|           add_definitions(-DSW_GENERATOR_BIN="${SW_GENERATOR_BIN}") |             add_definitions(-DSW_GENERATOR_BIN="${SW_GENERATOR_BIN}") | ||||||
|           add_definitions(-DDEFAULT_RINEX_NAV="${CMAKE_CURRENT_BINARY_DIR}/../../../thirdparty/gnss-sim/brdc3540.14n") |             add_definitions(-DDEFAULT_RINEX_NAV="${CMAKE_CURRENT_BINARY_DIR}/../../../thirdparty/gnss-sim/brdc3540.14n") | ||||||
|           add_definitions(-DDEFAULT_POSITION_FILE="${CMAKE_CURRENT_BINARY_DIR}/../../../thirdparty/gnss-sim/circle.csv") |             add_definitions(-DDEFAULT_POSITION_FILE="${CMAKE_CURRENT_BINARY_DIR}/../../../thirdparty/gnss-sim/circle.csv") | ||||||
|       endif(ENABLE_INSTALL_TESTS) |         endif() | ||||||
|     endif(GNSSSIMULATOR_FOUND OR NOT ENABLE_GNSS_SIM_INSTALL) |     endif() | ||||||
|  |  | ||||||
|     ################################################################################ |     ################################################################################ | ||||||
|     # Local installation of GPSTk http://www.gpstk.org/ |     # Local installation of GPSTk http://www.gpstk.org/ | ||||||
| @@ -229,10 +229,10 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA) | |||||||
|     find_package(GPSTK) |     find_package(GPSTK) | ||||||
|     if(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK) |     if(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK) | ||||||
|       message(STATUS "GPSTk v${GNSSSDR_GPSTK_LOCAL_VERSION} will be automatically downloaded and built when doing 'make'.") |       message(STATUS "GPSTk v${GNSSSDR_GPSTK_LOCAL_VERSION} will be automatically downloaded and built when doing 'make'.") | ||||||
|       if ("${TOOLCHAIN_ARG}" STREQUAL "") |       if("${TOOLCHAIN_ARG}" STREQUAL "") | ||||||
|           set(TOOLCHAIN_ARG "-DCMAKE_CXX_FLAGS=\"-Wno-deprecated\"") |           set(TOOLCHAIN_ARG "-DCMAKE_CXX_FLAGS=\"-Wno-deprecated\"") | ||||||
|           set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated") |           set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated") | ||||||
|       endif("${TOOLCHAIN_ARG}" STREQUAL "") |       endif() | ||||||
|       include(GNUInstallDirs) |       include(GNUInstallDirs) | ||||||
|       string(REGEX REPLACE /[^/]*$ "" LIBDIR ${CMAKE_INSTALL_LIBDIR}) |       string(REGEX REPLACE /[^/]*$ "" LIBDIR ${CMAKE_INSTALL_LIBDIR}) | ||||||
|       if(CMAKE_VERSION VERSION_LESS 3.2) |       if(CMAKE_VERSION VERSION_LESS 3.2) | ||||||
| @@ -246,7 +246,7 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA) | |||||||
|             UPDATE_COMMAND "" |             UPDATE_COMMAND "" | ||||||
|             PATCH_COMMAND "" |             PATCH_COMMAND "" | ||||||
|           ) |           ) | ||||||
|       else(CMAKE_VERSION VERSION_LESS 3.2) |       else() | ||||||
|           ExternalProject_Add( |           ExternalProject_Add( | ||||||
|             gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION} |             gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION} | ||||||
|             GIT_REPOSITORY https://github.com/SGL-UT/GPSTk |             GIT_REPOSITORY https://github.com/SGL-UT/GPSTk | ||||||
| @@ -258,24 +258,24 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA) | |||||||
|             UPDATE_COMMAND "" |             UPDATE_COMMAND "" | ||||||
|             PATCH_COMMAND "" |             PATCH_COMMAND "" | ||||||
|           ) |           ) | ||||||
|       endif(CMAKE_VERSION VERSION_LESS 3.2) |       endif() | ||||||
|       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/${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) | ||||||
|     else(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK) |     else() | ||||||
|       set(GPSTK_INCLUDE_DIRS ${GPSTK_INCLUDE_DIR}) |       set(GPSTK_INCLUDE_DIRS ${GPSTK_INCLUDE_DIR}) | ||||||
|       set(GPSTK_BINDIR ${GPSTK_LIBRARY}/../bin/) |       set(GPSTK_BINDIR ${GPSTK_LIBRARY}/../bin/) | ||||||
|       add_definitions(-DGPSTK_BINDIR="${GPSTK_BINDIR}") |       add_definitions(-DGPSTK_BINDIR="${GPSTK_BINDIR}") | ||||||
|     endif(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK) |     endif() | ||||||
| endif(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA) | endif() | ||||||
|  |  | ||||||
|  |  | ||||||
| if (ENABLE_UNIT_TESTING_EXTRA) | if(ENABLE_UNIT_TESTING_EXTRA) | ||||||
|     set(GNSS_SDR_TEST_OPTIONAL_LIBS ${GNSS_SDR_TEST_OPTIONAL_LIBS} ${GPSTK_LIBRARY}) |     set(GNSS_SDR_TEST_OPTIONAL_LIBS ${GNSS_SDR_TEST_OPTIONAL_LIBS} ${GPSTK_LIBRARY}) | ||||||
|     set(GNSS_SDR_TEST_OPTIONAL_HEADERS ${GNSS_SDR_TEST_OPTIONAL_HEADERS} ${GPSTK_INCLUDE_DIRS} ${GPSTK_INCLUDE_DIRS}/gpstk) |     set(GNSS_SDR_TEST_OPTIONAL_HEADERS ${GNSS_SDR_TEST_OPTIONAL_HEADERS} ${GPSTK_INCLUDE_DIRS} ${GPSTK_INCLUDE_DIRS}/gpstk) | ||||||
| endif (ENABLE_UNIT_TESTING_EXTRA) | endif() | ||||||
|  |  | ||||||
| if(ENABLE_UNIT_TESTING_EXTRA) | if(ENABLE_UNIT_TESTING_EXTRA) | ||||||
|     add_definitions(-DEXTRA_TESTS) |     add_definitions(-DEXTRA_TESTS) | ||||||
| @@ -284,18 +284,18 @@ if(ENABLE_UNIT_TESTING_EXTRA) | |||||||
|       file(DOWNLOAD https://sourceforge.net/projects/gnss-sdr/files/data/gps_l2c_m_prn7_5msps.dat ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/signal_samples/gps_l2c_m_prn7_5msps.dat |       file(DOWNLOAD https://sourceforge.net/projects/gnss-sdr/files/data/gps_l2c_m_prn7_5msps.dat ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/signal_samples/gps_l2c_m_prn7_5msps.dat | ||||||
|             SHOW_PROGRESS |             SHOW_PROGRESS | ||||||
|             EXPECTED_HASH MD5=a6fcbefe155137945d3c33c5ef7bd0f9) |             EXPECTED_HASH MD5=a6fcbefe155137945d3c33c5ef7bd0f9) | ||||||
|     endif(NOT EXISTS ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples/gps_l2c_m_prn7_5msps.dat) |     endif() | ||||||
|     if(NOT EXISTS ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples/Glonass_L1_CA_SIM_Fs_62Msps_4ms.dat) |     if(NOT EXISTS ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples/Glonass_L1_CA_SIM_Fs_62Msps_4ms.dat) | ||||||
|       message(STATUS "Downloading some data files for testing...") |       message(STATUS "Downloading some data files for testing...") | ||||||
|       file(DOWNLOAD https://sourceforge.net/projects/gnss-sdr/files/data/Glonass_L1_CA_SIM_Fs_62Msps_4ms.dat ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/signal_samples/Glonass_L1_CA_SIM_Fs_62Msps_4ms.dat |       file(DOWNLOAD https://sourceforge.net/projects/gnss-sdr/files/data/Glonass_L1_CA_SIM_Fs_62Msps_4ms.dat ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/signal_samples/Glonass_L1_CA_SIM_Fs_62Msps_4ms.dat | ||||||
|             SHOW_PROGRESS |             SHOW_PROGRESS | ||||||
|             EXPECTED_HASH MD5=ffb72fc63c116be58d5e5ccb1daaed3a) |             EXPECTED_HASH MD5=ffb72fc63c116be58d5e5ccb1daaed3a) | ||||||
|     endif(NOT EXISTS ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples/Glonass_L1_CA_SIM_Fs_62Msps_4ms.dat) |     endif() | ||||||
|     if(ENABLE_INSTALL_TESTS) |     if(ENABLE_INSTALL_TESTS) | ||||||
|       install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/signal_samples/gps_l2c_m_prn7_5msps.dat DESTINATION share/gnss-sdr/signal_samples) |       install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/signal_samples/gps_l2c_m_prn7_5msps.dat DESTINATION share/gnss-sdr/signal_samples) | ||||||
|       install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/signal_samples/Glonass_L1_CA_SIM_Fs_62Msps_4ms.dat DESTINATION share/gnss-sdr/signal_samples) |       install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/signal_samples/Glonass_L1_CA_SIM_Fs_62Msps_4ms.dat DESTINATION share/gnss-sdr/signal_samples) | ||||||
|     endif(ENABLE_INSTALL_TESTS) |     endif() | ||||||
| endif(ENABLE_UNIT_TESTING_EXTRA) | endif() | ||||||
|  |  | ||||||
| if(ENABLE_INSTALL_TESTS) | if(ENABLE_INSTALL_TESTS) | ||||||
|     install(FILES ${CMAKE_SOURCE_DIR}/src/tests/signal_samples/GSoC_CTTC_capture_2012_07_26_4Msps_4ms.dat DESTINATION share/gnss-sdr/signal_samples) |     install(FILES ${CMAKE_SOURCE_DIR}/src/tests/signal_samples/GSoC_CTTC_capture_2012_07_26_4Msps_4ms.dat DESTINATION share/gnss-sdr/signal_samples) | ||||||
| @@ -305,7 +305,7 @@ if(ENABLE_INSTALL_TESTS) | |||||||
|     install(FILES ${CMAKE_SOURCE_DIR}/src/tests/data/rtklib_test/obs_test1.xml DESTINATION share/gnss-sdr/data/rtklib_test) |     install(FILES ${CMAKE_SOURCE_DIR}/src/tests/data/rtklib_test/obs_test1.xml DESTINATION share/gnss-sdr/data/rtklib_test) | ||||||
|     install(FILES ${CMAKE_SOURCE_DIR}/src/tests/data/rtklib_test/eph_GPS_L1CA_test1.xml DESTINATION share/gnss-sdr/data/rtklib_test) |     install(FILES ${CMAKE_SOURCE_DIR}/src/tests/data/rtklib_test/eph_GPS_L1CA_test1.xml DESTINATION share/gnss-sdr/data/rtklib_test) | ||||||
|     add_definitions(-DTEST_PATH="${CMAKE_INSTALL_PREFIX}/share/gnss-sdr/") |     add_definitions(-DTEST_PATH="${CMAKE_INSTALL_PREFIX}/share/gnss-sdr/") | ||||||
| else(ENABLE_INSTALL_TESTS) | else() | ||||||
|     file(COPY ${CMAKE_SOURCE_DIR}/src/tests/signal_samples/GSoC_CTTC_capture_2012_07_26_4Msps_4ms.dat DESTINATION ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples) |     file(COPY ${CMAKE_SOURCE_DIR}/src/tests/signal_samples/GSoC_CTTC_capture_2012_07_26_4Msps_4ms.dat DESTINATION ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples) | ||||||
|     file(COPY ${CMAKE_SOURCE_DIR}/src/tests/signal_samples/Galileo_E1_ID_1_Fs_4Msps_8ms.dat DESTINATION ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples) |     file(COPY ${CMAKE_SOURCE_DIR}/src/tests/signal_samples/Galileo_E1_ID_1_Fs_4Msps_8ms.dat DESTINATION ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples) | ||||||
|     file(COPY ${CMAKE_SOURCE_DIR}/src/tests/signal_samples/GPS_L1_CA_ID_1_Fs_4Msps_2ms.dat DESTINATION ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples) |     file(COPY ${CMAKE_SOURCE_DIR}/src/tests/signal_samples/GPS_L1_CA_ID_1_Fs_4Msps_2ms.dat DESTINATION ${CMAKE_SOURCE_DIR}/thirdparty/signal_samples) | ||||||
| @@ -313,7 +313,7 @@ else(ENABLE_INSTALL_TESTS) | |||||||
|     file(COPY ${CMAKE_SOURCE_DIR}/src/tests/data/rtklib_test/obs_test1.xml DESTINATION ${CMAKE_SOURCE_DIR}/thirdparty/data/rtklib_test) |     file(COPY ${CMAKE_SOURCE_DIR}/src/tests/data/rtklib_test/obs_test1.xml DESTINATION ${CMAKE_SOURCE_DIR}/thirdparty/data/rtklib_test) | ||||||
|     file(COPY ${CMAKE_SOURCE_DIR}/src/tests/data/rtklib_test/eph_GPS_L1CA_test1.xml DESTINATION ${CMAKE_SOURCE_DIR}/thirdparty/data/rtklib_test) |     file(COPY ${CMAKE_SOURCE_DIR}/src/tests/data/rtklib_test/eph_GPS_L1CA_test1.xml DESTINATION ${CMAKE_SOURCE_DIR}/thirdparty/data/rtklib_test) | ||||||
|     add_definitions(-DTEST_PATH="${CMAKE_SOURCE_DIR}/thirdparty/") |     add_definitions(-DTEST_PATH="${CMAKE_SOURCE_DIR}/thirdparty/") | ||||||
| endif(ENABLE_INSTALL_TESTS) | endif() | ||||||
|  |  | ||||||
| set(LIST_INCLUDE_DIRS | set(LIST_INCLUDE_DIRS | ||||||
|     ${GTEST_INCLUDE_DIRECTORIES} |     ${GTEST_INCLUDE_DIRECTORIES} | ||||||
| @@ -400,44 +400,46 @@ if(ENABLE_UNIT_TESTING) | |||||||
|     ) |     ) | ||||||
|     if(NOT ${GTEST_DIR_LOCAL}) |     if(NOT ${GTEST_DIR_LOCAL}) | ||||||
|         add_dependencies(run_tests gtest-${GNSSSDR_GTEST_LOCAL_VERSION}) |         add_dependencies(run_tests gtest-${GNSSSDR_GTEST_LOCAL_VERSION}) | ||||||
|     endif(NOT ${GTEST_DIR_LOCAL}) |     endif() | ||||||
|  |  | ||||||
|     if(ENABLE_INSTALL_TESTS) |     if(ENABLE_INSTALL_TESTS) | ||||||
|         if(EXISTS ${CMAKE_SOURCE_DIR}/install/run_tests) |         if(EXISTS ${CMAKE_SOURCE_DIR}/install/run_tests) | ||||||
|             file(REMOVE ${CMAKE_SOURCE_DIR}/install/run_tests) |             file(REMOVE ${CMAKE_SOURCE_DIR}/install/run_tests) | ||||||
|         endif(EXISTS ${CMAKE_SOURCE_DIR}/install/run_tests) |         endif() | ||||||
|         install(TARGETS run_tests RUNTIME DESTINATION bin COMPONENT "run_tests") |         install(TARGETS run_tests RUNTIME DESTINATION bin COMPONENT "run_tests") | ||||||
|     else(ENABLE_INSTALL_TESTS) |     else() | ||||||
|         add_custom_command(TARGET run_tests POST_BUILD |         add_custom_command(TARGET run_tests POST_BUILD | ||||||
|             COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:run_tests> |             COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:run_tests> | ||||||
|             ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:run_tests>) |             ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:run_tests>) | ||||||
|     endif(ENABLE_INSTALL_TESTS) |     endif() | ||||||
| endif(ENABLE_UNIT_TESTING) | endif() | ||||||
|  |  | ||||||
| if(ENABLE_FPGA) | if(ENABLE_FPGA) | ||||||
|     add_executable(gps_l1_ca_dll_pll_tracking_test_fpga |     add_executable(gps_l1_ca_dll_pll_tracking_test_fpga | ||||||
|             ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc |         ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc | ||||||
|             ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc) |         ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc | ||||||
|  |     ) | ||||||
|     target_link_libraries(gps_l1_ca_dll_pll_tracking_test_fpga |     target_link_libraries(gps_l1_ca_dll_pll_tracking_test_fpga | ||||||
|             ${Boost_LIBRARIES} |         ${Boost_LIBRARIES} | ||||||
|             ${GFlags_LIBS} |         ${GFlags_LIBS} | ||||||
|             ${GLOG_LIBRARIES} |         ${GLOG_LIBRARIES} | ||||||
|             ${GTEST_LIBRARIES} |         ${GTEST_LIBRARIES} | ||||||
|             ${GNURADIO_RUNTIME_LIBRARIES} |         ${GNURADIO_RUNTIME_LIBRARIES} | ||||||
|             ${GNURADIO_BLOCKS_LIBRARIES} |         ${GNURADIO_BLOCKS_LIBRARIES} | ||||||
|             ${ARMADILLO_LIBRARIES} |         ${ARMADILLO_LIBRARIES} | ||||||
|             ${VOLK_LIBRARIES} |         ${VOLK_LIBRARIES} | ||||||
|             ${MATIO_LIBRARIES} |         ${MATIO_LIBRARIES} | ||||||
|             channel_fsm |         channel_fsm | ||||||
|             gnss_sp_libs |         gnss_sp_libs | ||||||
|             gnss_rx |         gnss_rx | ||||||
|             gnss_system_parameters |         gnss_system_parameters | ||||||
|             signal_processing_testing_lib |         signal_processing_testing_lib | ||||||
|             ) |     ) | ||||||
|     install(TARGETS gps_l1_ca_dll_pll_tracking_test_fpga |     install(TARGETS gps_l1_ca_dll_pll_tracking_test_fpga | ||||||
|             RUNTIME DESTINATION bin |         RUNTIME DESTINATION bin | ||||||
|             COMPONENT "fpga-test") |         COMPONENT "fpga-test" | ||||||
| endif(ENABLE_FPGA) |     ) | ||||||
|  | endif() | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
| @@ -451,14 +453,14 @@ function(add_system_test executable) | |||||||
|     # Ensure that executable is rebuilt if it was previously built and then removed |     # Ensure that executable is rebuilt if it was previously built and then removed | ||||||
|     if(NOT EXISTS ${CMAKE_SOURCE_DIR}/install/${executable}) |     if(NOT EXISTS ${CMAKE_SOURCE_DIR}/install/${executable}) | ||||||
|         execute_process(COMMAND ${CMAKE_COMMAND} -E touch ${SYSTEM_TEST_SOURCES}) |         execute_process(COMMAND ${CMAKE_COMMAND} -E touch ${SYSTEM_TEST_SOURCES}) | ||||||
|     endif(NOT EXISTS ${CMAKE_SOURCE_DIR}/install/${executable}) |     endif() | ||||||
|     add_executable(${executable} ${SYSTEM_TEST_SOURCES}) |     add_executable(${executable} ${SYSTEM_TEST_SOURCES}) | ||||||
|  |  | ||||||
|     if(NOT ${GTEST_DIR_LOCAL}) |     if(NOT ${GTEST_DIR_LOCAL}) | ||||||
|         add_dependencies(${executable} gtest-${GNSSSDR_GTEST_LOCAL_VERSION}) |         add_dependencies(${executable} gtest-${GNSSSDR_GTEST_LOCAL_VERSION}) | ||||||
|     else(NOT ${GTEST_DIR_LOCAL}) |     else() | ||||||
|         add_dependencies(${executable} gtest) |         add_dependencies(${executable} gtest) | ||||||
|     endif(NOT ${GTEST_DIR_LOCAL}) |     endif() | ||||||
|  |  | ||||||
|     include_directories(${OPT_INCLUDES_}) |     include_directories(${OPT_INCLUDES_}) | ||||||
|     target_link_libraries(${executable} ${OPT_LIBS_}) |     target_link_libraries(${executable} ${OPT_LIBS_}) | ||||||
| @@ -466,14 +468,14 @@ function(add_system_test executable) | |||||||
|     if(ENABLE_INSTALL_TESTS) |     if(ENABLE_INSTALL_TESTS) | ||||||
|         if(EXISTS ${CMAKE_SOURCE_DIR}/install/${executable}) |         if(EXISTS ${CMAKE_SOURCE_DIR}/install/${executable}) | ||||||
|             file(REMOVE ${CMAKE_SOURCE_DIR}/install/${executable}) |             file(REMOVE ${CMAKE_SOURCE_DIR}/install/${executable}) | ||||||
|         endif(EXISTS ${CMAKE_SOURCE_DIR}/install/${executable}) |         endif() | ||||||
|         install(TARGETS ${executable} RUNTIME DESTINATION bin COMPONENT "${executable}_test") |         install(TARGETS ${executable} RUNTIME DESTINATION bin COMPONENT "${executable}_test") | ||||||
|     else(ENABLE_INSTALL_TESTS) |     else() | ||||||
|         add_custom_command(TARGET ${executable} POST_BUILD |         add_custom_command(TARGET ${executable} POST_BUILD | ||||||
|             COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${executable}> |             COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${executable}> | ||||||
|             ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:${executable}>) |             ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:${executable}>) | ||||||
|     endif(ENABLE_INSTALL_TESTS) |     endif() | ||||||
| endfunction(add_system_test) | endfunction() | ||||||
|  |  | ||||||
|  |  | ||||||
| if(ENABLE_SYSTEM_TESTING) | if(ENABLE_SYSTEM_TESTING) | ||||||
| @@ -482,10 +484,10 @@ if(ENABLE_SYSTEM_TESTING) | |||||||
|         set(HOST_SYSTEM "GNU/Linux ${LINUX_DISTRIBUTION} ${LINUX_VER} ${ARCH_}") |         set(HOST_SYSTEM "GNU/Linux ${LINUX_DISTRIBUTION} ${LINUX_VER} ${ARCH_}") | ||||||
|         string(REPLACE "\n" "" HOST_SYSTEM "${HOST_SYSTEM}") |         string(REPLACE "\n" "" HOST_SYSTEM "${HOST_SYSTEM}") | ||||||
|         string(REPLACE "\"" "" HOST_SYSTEM "${HOST_SYSTEM}") |         string(REPLACE "\"" "" HOST_SYSTEM "${HOST_SYSTEM}") | ||||||
|     endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") |     endif() | ||||||
|     if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") |     if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") | ||||||
|         set(HOST_SYSTEM "MacOS") |         set(HOST_SYSTEM "MacOS") | ||||||
|     endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") |     endif() | ||||||
|     add_definitions(-DHOST_SYSTEM="${HOST_SYSTEM}") |     add_definitions(-DHOST_SYSTEM="${HOST_SYSTEM}") | ||||||
|  |  | ||||||
|     #### TTFF |     #### TTFF | ||||||
| @@ -505,32 +507,22 @@ if(ENABLE_SYSTEM_TESTING) | |||||||
|                       ${GNURADIO_ANALOG_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} |                       ${GNURADIO_ANALOG_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} | ||||||
|                       gnss_sp_libs gnss_rx gnss_system_parameters |                       gnss_sp_libs gnss_rx gnss_system_parameters | ||||||
|                       system_testing_lib) |                       system_testing_lib) | ||||||
|  |  | ||||||
|         add_system_test(position_test) |         add_system_test(position_test) | ||||||
|  |     else() | ||||||
|         #if(GPSTK_FOUND OR OWN_GPSTK) |  | ||||||
|             ## OBS_SYSTEM_TEST and OBS_GPS_L1_SYSTEM_TEST |  | ||||||
|         #    set(OPT_LIBS_ ${GFlags_LIBS} ${GLOG_LIBRARIES} ${GTEST_LIBRARIES} |  | ||||||
|         #                  gnss_sp_libs gnss_rx ${GPSTK_LIBRARY}) |  | ||||||
|         #    set(OPT_INCLUDES_ ${GPSTK_INCLUDE_DIRS} ${GPSTK_INCLUDE_DIRS}/gpstk) |  | ||||||
|         #    add_system_test(obs_gps_l1_system_test) |  | ||||||
|         #    add_system_test(obs_system_test) |  | ||||||
|         #endif(GPSTK_FOUND OR OWN_GPSTK) |  | ||||||
|     else(ENABLE_SYSTEM_TESTING_EXTRA) |  | ||||||
|         # Avoid working with old executables if they were switched ON and then OFF |         # Avoid working with old executables if they were switched ON and then OFF | ||||||
|         if(EXISTS ${CMAKE_SOURCE_DIR}/install/position_test) |         if(EXISTS ${CMAKE_SOURCE_DIR}/install/position_test) | ||||||
|             file(REMOVE ${CMAKE_SOURCE_DIR}/install/position_test) |             file(REMOVE ${CMAKE_SOURCE_DIR}/install/position_test) | ||||||
|         endif(EXISTS ${CMAKE_SOURCE_DIR}/install/position_test) |         endif() | ||||||
|     endif(ENABLE_SYSTEM_TESTING_EXTRA) |     endif() | ||||||
| else(ENABLE_SYSTEM_TESTING) | else() | ||||||
|     # Avoid working with old executables if they were switched ON and then OFF |     # Avoid working with old executables if they were switched ON and then OFF | ||||||
|     if(EXISTS ${CMAKE_SOURCE_DIR}/install/ttff) |     if(EXISTS ${CMAKE_SOURCE_DIR}/install/ttff) | ||||||
|         file(REMOVE ${CMAKE_SOURCE_DIR}/install/ttff) |         file(REMOVE ${CMAKE_SOURCE_DIR}/install/ttff) | ||||||
|     endif(EXISTS ${CMAKE_SOURCE_DIR}/install/ttff) |     endif() | ||||||
|     if(EXISTS ${CMAKE_SOURCE_DIR}/install/position_test) |     if(EXISTS ${CMAKE_SOURCE_DIR}/install/position_test) | ||||||
|         file(REMOVE ${CMAKE_SOURCE_DIR}/install/position_test) |         file(REMOVE ${CMAKE_SOURCE_DIR}/install/position_test) | ||||||
|     endif(EXISTS ${CMAKE_SOURCE_DIR}/install/position_test) |     endif() | ||||||
| endif(ENABLE_SYSTEM_TESTING) | endif() | ||||||
|  |  | ||||||
|  |  | ||||||
| ######################################################### | ######################################################### | ||||||
| @@ -550,13 +542,15 @@ target_link_libraries(flowgraph_test ${Boost_LIBRARIES} | |||||||
|     gnss_sp_libs |     gnss_sp_libs | ||||||
|     gnss_rx |     gnss_rx | ||||||
|     gnss_system_parameters |     gnss_system_parameters | ||||||
|     ${VOLK_GNSSSDR_LIBRARIES}) |     ${VOLK_GNSSSDR_LIBRARIES} | ||||||
|  | ) | ||||||
|  |  | ||||||
| add_test(flowgraph_test flowgraph_test) | add_test(flowgraph_test flowgraph_test) | ||||||
| if(NOT ${GTEST_DIR_LOCAL}) | if(NOT ${GTEST_DIR_LOCAL}) | ||||||
|     add_dependencies(flowgraph_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION}) |     add_dependencies(flowgraph_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION}) | ||||||
| else(NOT ${GTEST_DIR_LOCAL}) | else() | ||||||
|     add_dependencies(flowgraph_test gtest) |     add_dependencies(flowgraph_test gtest) | ||||||
| endif(NOT ${GTEST_DIR_LOCAL}) | endif() | ||||||
| set_property(TEST flowgraph_test PROPERTY TIMEOUT 30) | set_property(TEST flowgraph_test PROPERTY TIMEOUT 30) | ||||||
|  |  | ||||||
| ######################################################### | ######################################################### | ||||||
| @@ -569,7 +563,8 @@ add_executable(gnss_block_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc | |||||||
|     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/notch_filter_lite_test.cc |     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/notch_filter_lite_test.cc | ||||||
|     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/adapter/pass_through_test.cc |     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/adapter/pass_through_test.cc | ||||||
|     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/adapter/adapter_test.cc |     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/adapter/adapter_test.cc | ||||||
|     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/gnss_block_factory_test.cc) |     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/gnss_block_factory_test.cc | ||||||
|  | ) | ||||||
| target_link_libraries(gnss_block_test ${Boost_LIBRARIES} | target_link_libraries(gnss_block_test ${Boost_LIBRARIES} | ||||||
|     ${GFlags_LIBS} |     ${GFlags_LIBS} | ||||||
|     ${GLOG_LIBRARIES} |     ${GLOG_LIBRARIES} | ||||||
| @@ -581,19 +576,21 @@ target_link_libraries(gnss_block_test ${Boost_LIBRARIES} | |||||||
|     gnss_sp_libs |     gnss_sp_libs | ||||||
|     gnss_rx |     gnss_rx | ||||||
|     gnss_system_parameters |     gnss_system_parameters | ||||||
|     ${VOLK_GNSSSDR_LIBRARIES}) |     ${VOLK_GNSSSDR_LIBRARIES} | ||||||
|  | ) | ||||||
| add_test(gnss_block_test gnss_block_test) | add_test(gnss_block_test gnss_block_test) | ||||||
| if(NOT ${GTEST_DIR_LOCAL}) | if(NOT ${GTEST_DIR_LOCAL}) | ||||||
|     add_dependencies(gnss_block_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION}) |     add_dependencies(gnss_block_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION}) | ||||||
| else(NOT ${GTEST_DIR_LOCAL}) | else() | ||||||
|     add_dependencies(gnss_block_test gtest) |     add_dependencies(gnss_block_test gtest) | ||||||
| endif(NOT ${GTEST_DIR_LOCAL}) | endif() | ||||||
| set_property(TEST gnss_block_test PROPERTY TIMEOUT 60) | set_property(TEST gnss_block_test PROPERTY TIMEOUT 60) | ||||||
|  |  | ||||||
| ######################################################### | ######################################################### | ||||||
|  |  | ||||||
| add_executable(gnuradio_block_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc | add_executable(gnuradio_block_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc | ||||||
|     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/sources/unpack_2bit_samples_test.cc) |     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/sources/unpack_2bit_samples_test.cc | ||||||
|  | ) | ||||||
| target_link_libraries(gnuradio_block_test ${Boost_LIBRARIES} | target_link_libraries(gnuradio_block_test ${Boost_LIBRARIES} | ||||||
|     ${GFlags_LIBS} |     ${GFlags_LIBS} | ||||||
|     ${GLOG_LIBRARIES} |     ${GLOG_LIBRARIES} | ||||||
| @@ -605,40 +602,42 @@ target_link_libraries(gnuradio_block_test ${Boost_LIBRARIES} | |||||||
|     gnss_sp_libs |     gnss_sp_libs | ||||||
|     gnss_rx |     gnss_rx | ||||||
|     gnss_system_parameters |     gnss_system_parameters | ||||||
|     ${VOLK_GNSSSDR_LIBRARIES}) |     ${VOLK_GNSSSDR_LIBRARIES} | ||||||
|  | ) | ||||||
| add_test(gnuradio_block_test gnuradio_block_test) | add_test(gnuradio_block_test gnuradio_block_test) | ||||||
| if(NOT ${GTEST_DIR_LOCAL}) | if(NOT ${GTEST_DIR_LOCAL}) | ||||||
|     add_dependencies(gnuradio_block_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION}) |     add_dependencies(gnuradio_block_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION}) | ||||||
| else(NOT ${GTEST_DIR_LOCAL}) | else() | ||||||
|     add_dependencies(gnuradio_block_test gtest) |     add_dependencies(gnuradio_block_test gtest) | ||||||
| endif(NOT ${GTEST_DIR_LOCAL}) | endif() | ||||||
| set_property(TEST gnuradio_block_test PROPERTY TIMEOUT 30) | set_property(TEST gnuradio_block_test PROPERTY TIMEOUT 30) | ||||||
|  |  | ||||||
| ######################################################### | ######################################################### | ||||||
|  |  | ||||||
| add_executable(matio_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc | add_executable(matio_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc | ||||||
|     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/arithmetic/matio_test.cc) |     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/arithmetic/matio_test.cc | ||||||
|  | ) | ||||||
| target_link_libraries(matio_test ${Boost_LIBRARIES} | target_link_libraries(matio_test ${Boost_LIBRARIES} | ||||||
|     ${GFlags_LIBS} |     ${GFlags_LIBS} | ||||||
|     ${GLOG_LIBRARIES} |     ${GLOG_LIBRARIES} | ||||||
|     ${GTEST_LIBRARIES} |     ${GTEST_LIBRARIES} | ||||||
|     ${MATIO_LIBRARIES} |     ${MATIO_LIBRARIES} | ||||||
|     gnss_system_parameters) |     gnss_system_parameters | ||||||
|  | ) | ||||||
| add_test(matio_test matio_test) | add_test(matio_test matio_test) | ||||||
| if(NOT ${GTEST_DIR_LOCAL}) | if(NOT ${GTEST_DIR_LOCAL}) | ||||||
|     if(MATIO_FOUND) |     if(MATIO_FOUND) | ||||||
|         add_dependencies(matio_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION}) |         add_dependencies(matio_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION}) | ||||||
|     else(MATIO_FOUND) |     else() | ||||||
|         add_dependencies(matio_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION} matio-${GNSSSDR_MATIO_LOCAL_VERSION}) |         add_dependencies(matio_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION} matio-${GNSSSDR_MATIO_LOCAL_VERSION}) | ||||||
|     endif(MATIO_FOUND) |     endif() | ||||||
| else(NOT ${GTEST_DIR_LOCAL}) | else() | ||||||
|     if(MATIO_FOUND) |     if(MATIO_FOUND) | ||||||
|         add_dependencies(matio_test gtest) |         add_dependencies(matio_test gtest) | ||||||
|     else(MATIO_FOUND) |     else() | ||||||
|         add_dependencies(matio_test gtest matio-${GNSSSDR_MATIO_LOCAL_VERSION}) |         add_dependencies(matio_test gtest matio-${GNSSSDR_MATIO_LOCAL_VERSION}) | ||||||
|     endif(MATIO_FOUND) |     endif() | ||||||
| endif(NOT ${GTEST_DIR_LOCAL}) | endif() | ||||||
| set_property(TEST matio_test PROPERTY TIMEOUT 30) | set_property(TEST matio_test PROPERTY TIMEOUT 30) | ||||||
|  |  | ||||||
| ######################################################### | ######################################################### | ||||||
| @@ -663,9 +662,9 @@ target_link_libraries(acq_test ${Boost_LIBRARIES} | |||||||
| add_test(acq_test acq_test) | add_test(acq_test acq_test) | ||||||
| if(NOT ${GTEST_DIR_LOCAL}) | if(NOT ${GTEST_DIR_LOCAL}) | ||||||
|     add_dependencies(acq_test acq_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION}) |     add_dependencies(acq_test acq_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION}) | ||||||
| else(NOT ${GTEST_DIR_LOCAL}) | else() | ||||||
|     add_dependencies(acq_test acq_test gtest) |     add_dependencies(acq_test acq_test gtest) | ||||||
| endif(NOT ${GTEST_DIR_LOCAL}) | endif() | ||||||
| set_property(TEST acq_test PROPERTY TIMEOUT 30) | set_property(TEST acq_test PROPERTY TIMEOUT 30) | ||||||
|  |  | ||||||
| ######################################################### | ######################################################### | ||||||
| @@ -674,7 +673,8 @@ add_executable(trk_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc | |||||||
|     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc |     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc | ||||||
|     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/tracking_loop_filter_test.cc |     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/tracking_loop_filter_test.cc | ||||||
|     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_real_codes_test.cc |     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_real_codes_test.cc | ||||||
|     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/bayesian_estimation_test.cc) |     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/bayesian_estimation_test.cc | ||||||
|  | ) | ||||||
|  |  | ||||||
| target_link_libraries(trk_test ${Boost_LIBRARIES} | target_link_libraries(trk_test ${Boost_LIBRARIES} | ||||||
|     ${GFlags_LIBS} |     ${GFlags_LIBS} | ||||||
| @@ -688,13 +688,14 @@ target_link_libraries(trk_test ${Boost_LIBRARIES} | |||||||
|     gnss_rx |     gnss_rx | ||||||
|     gnss_system_parameters |     gnss_system_parameters | ||||||
|     signal_generator_blocks |     signal_generator_blocks | ||||||
|     ${VOLK_GNSSSDR_LIBRARIES}) |     ${VOLK_GNSSSDR_LIBRARIES} | ||||||
|  | ) | ||||||
| add_test(trk_test trk_test) | add_test(trk_test trk_test) | ||||||
| if(NOT ${GTEST_DIR_LOCAL}) | if(NOT ${GTEST_DIR_LOCAL}) | ||||||
|     add_dependencies(trk_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION}) |     add_dependencies(trk_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION}) | ||||||
| else(NOT ${GTEST_DIR_LOCAL}) | else() | ||||||
|     add_dependencies(trk_test gtest) |     add_dependencies(trk_test gtest) | ||||||
| endif(NOT ${GTEST_DIR_LOCAL}) | endif() | ||||||
| set_property(TEST trk_test PROPERTY TIMEOUT 30) | set_property(TEST trk_test PROPERTY TIMEOUT 30) | ||||||
|  |  | ||||||
|  |  | ||||||
| @@ -703,29 +704,31 @@ set_property(TEST trk_test PROPERTY TIMEOUT 30) | |||||||
| if(NOT ENABLE_PACKAGING) | if(NOT ENABLE_PACKAGING) | ||||||
|     add_executable(control_thread_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc |     add_executable(control_thread_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc | ||||||
|         ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/control_message_factory_test.cc |         ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/control_message_factory_test.cc | ||||||
|         ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/control_thread_test.cc) |         ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/control_thread_test.cc | ||||||
|  |     ) | ||||||
|  |  | ||||||
|     target_link_libraries(control_thread_test ${Boost_LIBRARIES} |     target_link_libraries(control_thread_test ${Boost_LIBRARIES} | ||||||
|         ${GFlags_LIBS} |         ${GFlags_LIBS} | ||||||
|         ${GLOG_LIBRARIES} |         ${GLOG_LIBRARIES} | ||||||
|         ${GTEST_LIBRARIES} |         ${GTEST_LIBRARIES} | ||||||
|         gnss_rx) |         gnss_rx | ||||||
|  |     ) | ||||||
|  |  | ||||||
|     add_test(control_thread_test control_thread_test) |     add_test(control_thread_test control_thread_test) | ||||||
|     if(NOT ${GTEST_DIR_LOCAL}) |     if(NOT ${GTEST_DIR_LOCAL}) | ||||||
|         add_dependencies(control_thread_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION}) |         add_dependencies(control_thread_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION}) | ||||||
|     else(NOT ${GTEST_DIR_LOCAL}) |     else() | ||||||
|         add_dependencies(control_thread_test gtest) |         add_dependencies(control_thread_test gtest) | ||||||
|     endif(NOT ${GTEST_DIR_LOCAL}) |     endif() | ||||||
|     set_property(TEST control_thread_test PROPERTY TIMEOUT 30) |     set_property(TEST control_thread_test PROPERTY TIMEOUT 30) | ||||||
| endif(NOT ENABLE_PACKAGING) | endif() | ||||||
|  |  | ||||||
| ######################################################### | ######################################################### | ||||||
|  |  | ||||||
| if(ENABLE_PACKAGING) | if(ENABLE_PACKAGING) | ||||||
|     add_dependencies(check flowgraph_test gnss_block_test |     add_dependencies(check flowgraph_test gnss_block_test | ||||||
|         gnuradio_block_test acq_test trk_test matio_test) |         gnuradio_block_test acq_test trk_test matio_test) | ||||||
| else(ENABLE_PACKAGING) | else() | ||||||
|     add_dependencies(check control_thread_test flowgraph_test gnss_block_test |     add_dependencies(check control_thread_test flowgraph_test gnss_block_test | ||||||
|         gnuradio_block_test acq_test trk_test matio_test) |         gnuradio_block_test acq_test trk_test matio_test) | ||||||
| endif(ENABLE_PACKAGING) | endif() | ||||||
|   | |||||||
| @@ -23,22 +23,29 @@ set(SYSTEM_TESTING_LIB_SOURCES | |||||||
| ) | ) | ||||||
|  |  | ||||||
| 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} | ||||||
|      ${MATIO_INCLUDE_DIRS} |     ${MATIO_INCLUDE_DIRS} | ||||||
|      ${ARMADILLO_INCLUDE_DIRS} |     ${ARMADILLO_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  |  | ||||||
| file(GLOB SYSTEM_TESTING_LIB_HEADERS "*.h") | file(GLOB SYSTEM_TESTING_LIB_HEADERS "*.h") | ||||||
| list(SORT SYSTEM_TESTING_LIB_HEADERS) | list(SORT SYSTEM_TESTING_LIB_HEADERS) | ||||||
| add_library(system_testing_lib ${SYSTEM_TESTING_LIB_SOURCES} ${SYSTEM_TESTING_LIB_HEADERS}) |  | ||||||
|  | add_library(system_testing_lib | ||||||
|  |     ${SYSTEM_TESTING_LIB_SOURCES} | ||||||
|  |     ${SYSTEM_TESTING_LIB_HEADERS} | ||||||
|  | ) | ||||||
|  |  | ||||||
| source_group(Headers FILES ${SYSTEM_TESTING_LIB_HEADERS}) | source_group(Headers FILES ${SYSTEM_TESTING_LIB_HEADERS}) | ||||||
|  |  | ||||||
| if(NOT MATIO_FOUND) | if(NOT MATIO_FOUND) | ||||||
|    add_dependencies(system_testing_lib armadillo-${armadillo_RELEASE} matio-${GNSSSDR_MATIO_LOCAL_VERSION}) |     add_dependencies(system_testing_lib | ||||||
| else(NOT MATIO_FOUND) |         armadillo-${armadillo_RELEASE} | ||||||
|    add_dependencies(system_testing_lib armadillo-${armadillo_RELEASE}) |         matio-${GNSSSDR_MATIO_LOCAL_VERSION} | ||||||
| endif(NOT MATIO_FOUND) |     ) | ||||||
|  | else() | ||||||
|  |     add_dependencies(system_testing_lib armadillo-${armadillo_RELEASE}) | ||||||
|  | endif() | ||||||
|   | |||||||
| @@ -21,29 +21,36 @@ set(SIGNAL_PROCESSING_TESTING_LIB_SOURCES | |||||||
|     acquisition_dump_reader.cc |     acquisition_dump_reader.cc | ||||||
|     acquisition_msg_rx.cc |     acquisition_msg_rx.cc | ||||||
|     tracking_dump_reader.cc |     tracking_dump_reader.cc | ||||||
|     tlm_dump_reader.cc   |     tlm_dump_reader.cc | ||||||
|     observables_dump_reader.cc     |     observables_dump_reader.cc | ||||||
|     tracking_true_obs_reader.cc |     tracking_true_obs_reader.cc | ||||||
|     true_observables_reader.cc |     true_observables_reader.cc | ||||||
| ) | ) | ||||||
|  |  | ||||||
| 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} | ||||||
|      ${MATIO_INCLUDE_DIRS} |     ${MATIO_INCLUDE_DIRS} | ||||||
|      ${GNURADIO_RUNTIME_INCLUDE_DIRS} |     ${GNURADIO_RUNTIME_INCLUDE_DIRS} | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  |  | ||||||
| file(GLOB SIGNAL_PROCESSING_TESTING_LIB_HEADERS "*.h") | file(GLOB SIGNAL_PROCESSING_TESTING_LIB_HEADERS "*.h") | ||||||
| list(SORT SIGNAL_PROCESSING_TESTING_LIB_HEADERS) | list(SORT SIGNAL_PROCESSING_TESTING_LIB_HEADERS) | ||||||
| add_library(signal_processing_testing_lib ${SIGNAL_PROCESSING_TESTING_LIB_SOURCES} ${SIGNAL_PROCESSING_TESTING_LIB_HEADERS}) |  | ||||||
|  | add_library(signal_processing_testing_lib | ||||||
|  |     ${SIGNAL_PROCESSING_TESTING_LIB_SOURCES} | ||||||
|  |     ${SIGNAL_PROCESSING_TESTING_LIB_HEADERS} | ||||||
|  | ) | ||||||
|  |  | ||||||
| source_group(Headers FILES ${SIGNAL_PROCESSING_TESTING_LIB_HEADERS}) | source_group(Headers FILES ${SIGNAL_PROCESSING_TESTING_LIB_HEADERS}) | ||||||
|  |  | ||||||
| if(NOT MATIO_FOUND) | if(NOT MATIO_FOUND) | ||||||
|    add_dependencies(signal_processing_testing_lib matio-${GNSSSDR_MATIO_LOCAL_VERSION} glog-${glog_RELEASE}) |     add_dependencies(signal_processing_testing_lib | ||||||
| else(NOT MATIO_FOUND) |         matio-${GNSSSDR_MATIO_LOCAL_VERSION} glog-${glog_RELEASE} | ||||||
|    add_dependencies(signal_processing_testing_lib glog-${glog_RELEASE}) |     ) | ||||||
| endif(NOT MATIO_FOUND) | else() | ||||||
|  |     add_dependencies(signal_processing_testing_lib glog-${glog_RELEASE}) | ||||||
|  | endif() | ||||||
|   | |||||||
| @@ -20,4 +20,4 @@ add_subdirectory(front-end-cal) | |||||||
|  |  | ||||||
| if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA) | if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA) | ||||||
|     add_subdirectory(rinex2assist) |     add_subdirectory(rinex2assist) | ||||||
| endif(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA) | endif() | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ | |||||||
|  |  | ||||||
| if(OPENSSL_FOUND) | if(OPENSSL_FOUND) | ||||||
|     add_definitions(-DUSE_OPENSSL_FALLBACK=1) |     add_definitions(-DUSE_OPENSSL_FALLBACK=1) | ||||||
| endif(OPENSSL_FOUND) | endif() | ||||||
|  |  | ||||||
| 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) | ||||||
| @@ -112,6 +112,5 @@ find_program(GZIP gzip | |||||||
| 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() | ||||||
|   | |||||||
| @@ -22,7 +22,7 @@ if(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK) | |||||||
|     string(REGEX REPLACE /[^/]*$ "" LIBDIR ${CMAKE_INSTALL_LIBDIR}) |     string(REGEX REPLACE /[^/]*$ "" LIBDIR ${CMAKE_INSTALL_LIBDIR}) | ||||||
|     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_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) |     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() | ||||||
|  |  | ||||||
| set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} ${GPSTK_INCLUDE_DIR}/gpstk) | set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} ${GPSTK_INCLUDE_DIR}/gpstk) | ||||||
|  |  | ||||||
| @@ -48,11 +48,11 @@ target_link_libraries(rinex2assist | |||||||
|  |  | ||||||
| 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() | ||||||
|  |  | ||||||
| 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 | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Carles Fernandez
					Carles Fernandez