mirrors
/
gnss-sdr
mirror of https://github.com/gnss-sdr/gnss-sdr
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove blanks

This commit is contained in:
Carles Fernandez 2018-11-18 21:24:54 +01:00
parent 8857d3938e
commit e94b2f8990
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
29 changed files with 78 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -354,15 +354,17 @@ set(GNSSSDR_GPSTK_LOCAL_VERSION "2.10.6")
set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.13")
set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.9")
if(CMAKE_VERSION VERSION_LESS "3.0.2")
if(CMAKE_VERSION VERSION_LESS "3.0.2") # Fix for CentOS 7
set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.1")
endif(CMAKE_VERSION VERSION_LESS "3.0.2")
################################################################################
# Check cmake version
# Check CMake version
################################################################################
if(CMAKE_VERSION VERSION_LESS ${GNSSSDR_CMAKE_MIN_VERSION})
message(STATUS "Your CMake version is too old and does not support some features required by GNSS-SDR. CMake version must be at least ${GNSSSDR_CMAKE_MIN_VERSION}.") # For more information check https://github.com/joakimkarlsson/bandit/issues/40
message(STATUS "Your CMake version is too old and does not support some features required by GNSS-SDR. CMake version must be at least ${GNSSSDR_CMAKE_MIN_VERSION}.")
message(FATAL_ERROR "Fatal error: CMake >= ${GNSSSDR_CMAKE_MIN_VERSION} required.")
endif(CMAKE_VERSION VERSION_LESS ${GNSSSDR_CMAKE_MIN_VERSION})

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

@ -18,28 +18,28 @@
add_definitions( -DGNSS_SDR_VERSION="${VERSION}" )
set(PVT_LIB_SOURCES
set(PVT_LIB_SOURCES
pvt_solution.cc
ls_pvt.cc
hybrid_ls_pvt.cc
kml_printer.cc
gpx_printer.cc
rinex_printer.cc
nmea_printer.cc
nmea_printer.cc
rtcm_printer.cc
geojson_printer.cc
rtklib_solver.cc
pvt_conf.cc
)
set(PVT_LIB_HEADERS
set(PVT_LIB_HEADERS
pvt_solution.h
ls_pvt.h
hybrid_ls_pvt.h
kml_printer.h
gpx_printer.h
rinex_printer.h
nmea_printer.h
nmea_printer.h
rtcm_printer.h
geojson_printer.h
rtklib_solver.h
@ -75,11 +75,12 @@ else(MATIO_FOUND)
endif(MATIO_FOUND)
target_link_libraries(
pvt_lib
pvt_lib
rtklib_lib
gnss_sdr_flags
${Boost_LIBRARIES}
${GLOG_LIBRARIES}
gnss_sp_libs
${Boost_LIBRARIES}
${GLOG_LIBRARIES}
${ARMADILLO_LIBRARIES}
${BLAS}
${LAPACK}

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

@ -19,4 +19,3 @@
add_subdirectory(adapters)
add_subdirectory(gnuradio_blocks)
add_subdirectory(libs)

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

@ -57,19 +57,19 @@ set(ACQ_ADAPTER_HEADERS
if(ENABLE_FPGA)
set(ACQ_ADAPTER_SOURCES ${ACQ_ADAPTER_SOURCES} gps_l1_ca_pcps_acquisition_fpga.cc
set(ACQ_ADAPTER_SOURCES ${ACQ_ADAPTER_SOURCES} gps_l1_ca_pcps_acquisition_fpga.cc
gps_l2_m_pcps_acquisition_fpga.cc
galileo_e1_pcps_ambiguous_acquisition_fpga.cc
galileo_e5a_pcps_acquisition_fpga.cc
gps_l5i_pcps_acquisition_fpga.cc)
set(ACQ_ADAPTER_HEADERS ${ACQ_ADAPTER_HEADERS} gps_l1_ca_pcps_acquisition_fpga.h
set(ACQ_ADAPTER_HEADERS ${ACQ_ADAPTER_HEADERS} gps_l1_ca_pcps_acquisition_fpga.h
gps_l2_m_pcps_acquisition_fpga.h
galileo_e1_pcps_ambiguous_acquisition_fpga.h
galileo_e5a_pcps_acquisition_fpga.h
gps_l5i_pcps_acquisition_fpga.h)
gps_l5i_pcps_acquisition_fpga.h)
endif(ENABLE_FPGA)
if(OPENCL_FOUND)
set(ACQ_ADAPTER_SOURCES ${ACQ_ADAPTER_SOURCES} gps_l1_ca_pcps_opencl_acquisition.cc)
set(ACQ_ADAPTER_HEADERS ${ACQ_ADAPTER_HEADERS} gps_l1_ca_pcps_opencl_acquisition.h)

2
src/algorithms/channel/CMakeLists.txt
View File

@ -17,4 +17,4 @@
#
add_subdirectory(adapters)
add_subdirectory(libs)
add_subdirectory(libs)

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

@ -16,15 +16,15 @@
# along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
#
set(CHANNEL_FSM_SOURCES
channel_fsm.cc
set(CHANNEL_FSM_SOURCES
channel_fsm.cc
channel_msg_receiver_cc.cc
)
set(CHANNEL_FSM_HEADERS
channel_fsm.h
set(CHANNEL_FSM_HEADERS
channel_fsm.h
channel_msg_receiver_cc.h
)
)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
@ -46,4 +46,3 @@ source_group(Headers FILES ${CHANNEL_FSM_HEADERS})
add_dependencies(channel_fsm glog-${glog_RELEASE})
target_link_libraries(channel_fsm gnss_rx)

1
src/algorithms/conditioner/CMakeLists.txt
View File

@ -17,4 +17,3 @@
#
add_subdirectory(adapters)
#add_subdirectory(gnuradio_blocks)

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

@ -17,12 +17,12 @@
#
set(COND_ADAPTER_SOURCES
set(COND_ADAPTER_SOURCES
signal_conditioner.cc
array_signal_conditioner.cc
)
set(COND_ADAPTER_HEADERS
set(COND_ADAPTER_HEADERS
signal_conditioner.h
array_signal_conditioner.h
)
@ -44,4 +44,4 @@ list(SORT COND_ADAPTER_SOURCES)
add_library(conditioner_adapters ${COND_ADAPTER_SOURCES} ${COND_ADAPTER_HEADERS})
source_group(Headers FILES ${COND_ADAPTER_HEADERS})
add_dependencies(conditioner_adapters glog-${glog_RELEASE})
add_dependencies(conditioner_adapters glog-${glog_RELEASE})

1
src/algorithms/data_type_adapter/CMakeLists.txt
View File

@ -19,4 +19,3 @@
add_subdirectory(adapters)
add_subdirectory(gnuradio_blocks)

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

@ -17,23 +17,23 @@
#
set(DATATYPE_ADAPTER_SOURCES
set(DATATYPE_ADAPTER_SOURCES
byte_to_short.cc
ibyte_to_cbyte.cc
ibyte_to_complex.cc
ibyte_to_cshort.cc
ishort_to_cshort.cc
ishort_to_complex.cc
ishort_to_complex.cc
)
set(DATATYPE_ADAPTER_HEADERS
set(DATATYPE_ADAPTER_HEADERS
byte_to_short.h
ibyte_to_cbyte.h
ibyte_to_complex.h
ibyte_to_cshort.h
ishort_to_cshort.h
ishort_to_complex.h
)
ishort_to_complex.h
)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}

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

@ -17,13 +17,13 @@
#
set(DATA_TYPE_GR_BLOCKS_SOURCES
set(DATA_TYPE_GR_BLOCKS_SOURCES
interleaved_byte_to_complex_byte.cc
interleaved_short_to_complex_short.cc
interleaved_byte_to_complex_short.cc
)
set(DATA_TYPE_GR_BLOCKS_HEADERS
set(DATA_TYPE_GR_BLOCKS_HEADERS
interleaved_byte_to_complex_byte.h
interleaved_short_to_complex_short.h
interleaved_byte_to_complex_short.h

2
src/algorithms/input_filter/CMakeLists.txt
View File

@ -17,4 +17,4 @@
#
add_subdirectory(adapters)
add_subdirectory(gnuradio_blocks)
add_subdirectory(gnuradio_blocks)

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

@ -16,7 +16,7 @@
# along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
#
set(INPUT_FILTER_ADAPTER_SOURCES
set(INPUT_FILTER_ADAPTER_SOURCES
fir_filter.cc
freq_xlating_fir_filter.cc
beamformer_filter.cc
@ -25,7 +25,7 @@ set(INPUT_FILTER_ADAPTER_SOURCES
notch_filter_lite.cc
)
set(INPUT_FILTER_ADAPTER_HEADERS
set(INPUT_FILTER_ADAPTER_HEADERS
fir_filter.h
freq_xlating_fir_filter.h
beamformer_filter.h

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

@ -17,4 +17,4 @@
#
add_subdirectory(adapters)
add_subdirectory(gnuradio_blocks)
add_subdirectory(gnuradio_blocks)

2
src/algorithms/resampler/CMakeLists.txt
View File

@ -17,4 +17,4 @@
#
add_subdirectory(adapters)
add_subdirectory(gnuradio_blocks)
add_subdirectory(gnuradio_blocks)

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

@ -17,13 +17,13 @@
#
set(RESAMPLER_GR_BLOCKS_SOURCES
set(RESAMPLER_GR_BLOCKS_SOURCES
direct_resampler_conditioner_cc.cc
direct_resampler_conditioner_cs.cc
direct_resampler_conditioner_cb.cc
)
set(RESAMPLER_GR_BLOCKS_HEADERS
set(RESAMPLER_GR_BLOCKS_HEADERS
direct_resampler_conditioner_cc.h
direct_resampler_conditioner_cs.h
direct_resampler_conditioner_cb.h
@ -42,4 +42,4 @@ list(SORT RESAMPLER_GR_BLOCKS_SOURCES)
add_library(resampler_gr_blocks ${RESAMPLER_GR_BLOCKS_SOURCES} ${RESAMPLER_GR_BLOCKS_HEADERS})
source_group(Headers FILES ${RESAMPLER_GR_BLOCKS_HEADERS})
add_dependencies(resampler_gr_blocks glog-${glog_RELEASE})
add_dependencies(resampler_gr_blocks glog-${glog_RELEASE})

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

@ -33,9 +33,9 @@ include_directories(
add_library(signal_generator_adapters ${SIGNAL_GENERATOR_ADAPTER_SOURCES} ${SIGNAL_GENERATOR_ADAPTER_HEADERS})
source_group(Headers FILES ${SIGNAL_GENERATOR_ADAPTER_HEADERS})
target_link_libraries(signal_generator_adapters gnss_sp_libs
signal_generator_blocks
${GNURADIO_RUNTIME_LIBRARIES}
${GNURADIO_BLOCKS_LIBRARIES}
target_link_libraries(signal_generator_adapters gnss_sp_libs
signal_generator_blocks
${GNURADIO_RUNTIME_LIBRARIES}
${GNURADIO_BLOCKS_LIBRARIES}
${GNURADIO_FILTER_LIBRARIES}
)

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

@ -202,7 +202,7 @@ if(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.3)
two_bit_packed_file_signal_source.cc )
set(SIGNAL_SOURCE_ADAPTER_HEADERS ${SIGNAL_SOURCE_ADAPTER_HEADERS}
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)
include_directories(

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

@ -70,9 +70,9 @@ list(SORT SIGNAL_SOURCE_GR_BLOCKS_SOURCES)
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})
target_link_libraries(signal_source_gr_blocks
signal_source_lib
${GNURADIO_RUNTIME_LIBRARIES}
target_link_libraries(signal_source_gr_blocks
signal_source_lib
${GNURADIO_RUNTIME_LIBRARIES}
${Boost_LIBRARIES}
${OPT_LIBRARIES}
)

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

@ -70,7 +70,7 @@ set(SIGNAL_SOURCE_LIB_SOURCES
rtl_tcp_dongle_info.cc
${OPT_SIGNAL_SOURCE_LIB_SOURCES}
)
set(SIGNAL_SOURCE_LIB_HEADERS
rtl_tcp_commands.h
rtl_tcp_dongle_info.h

2
src/algorithms/telemetry_decoder/CMakeLists.txt
View File

@ -18,4 +18,4 @@
add_subdirectory(adapters)
add_subdirectory(gnuradio_blocks)
add_subdirectory(libs)
add_subdirectory(libs)

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

@ -20,23 +20,23 @@
set(TELEMETRY_DECODER_ADAPTER_SOURCES
gps_l1_ca_telemetry_decoder.cc
gps_l2c_telemetry_decoder.cc
gps_l5_telemetry_decoder.cc
gps_l5_telemetry_decoder.cc
galileo_e1b_telemetry_decoder.cc
sbas_l1_telemetry_decoder.cc
galileo_e5a_telemetry_decoder.cc
glonass_l1_ca_telemetry_decoder.cc
glonass_l2_ca_telemetry_decoder.cc
glonass_l2_ca_telemetry_decoder.cc
)
set(TELEMETRY_DECODER_ADAPTER_HEADERS
gps_l1_ca_telemetry_decoder.h
gps_l2c_telemetry_decoder.h
gps_l5_telemetry_decoder.h
gps_l5_telemetry_decoder.h
galileo_e1b_telemetry_decoder.h
sbas_l1_telemetry_decoder.h
galileo_e5a_telemetry_decoder.h
glonass_l1_ca_telemetry_decoder.h
glonass_l2_ca_telemetry_decoder.h
glonass_l2_ca_telemetry_decoder.h
)
include_directories(

10
src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt
View File

@ -16,19 +16,19 @@
# along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
#
set(TELEMETRY_DECODER_LIBSWIFTCNAV_SOURCES
set(TELEMETRY_DECODER_LIBSWIFTCNAV_SOURCES
cnav_msg.c
bits.c
edc.c
viterbi27.c
viterbi27.c
)
set(TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS
set(TELEMETRY_DECODER_LIBSWIFTCNAV_HEADERS
cnav_msg.h
bits.h
edc.h
swift_common.h
fec.h
swift_common.h
fec.h
)
include_directories(

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

@ -23,19 +23,19 @@ if(ENABLE_CUDA)
endif(ENABLE_CUDA)
if(ENABLE_FPGA)
set(OPT_TRACKING_ADAPTERS_SOURCES ${OPT_TRACKING_ADAPTERS_SOURCES}
set(OPT_TRACKING_ADAPTERS_SOURCES ${OPT_TRACKING_ADAPTERS_SOURCES}
gps_l1_ca_dll_pll_tracking_fpga.cc
gps_l2_m_dll_pll_tracking_fpga.cc
galileo_e1_dll_pll_veml_tracking_fpga.cc
galileo_e5a_dll_pll_tracking_fpga.cc
gps_l5_dll_pll_tracking_fpga.cc)
set(OPT_TRACKING_ADAPTERS_HEADERS ${OPT_TRACKING_ADAPTERS_HEADERS}
set(OPT_TRACKING_ADAPTERS_HEADERS ${OPT_TRACKING_ADAPTERS_HEADERS}
gps_l1_ca_dll_pll_tracking_fpga.h
gps_l2_m_dll_pll_tracking_fpga.h
galileo_e1_dll_pll_veml_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)
set(TRACKING_ADAPTER_SOURCES

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

@ -36,7 +36,7 @@ set(TRACKING_GR_BLOCKS_SOURCES
glonass_l1_ca_dll_pll_tracking_cc.cc
glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc
gps_l1_ca_kf_tracking_cc.cc
gps_l1_ca_kf_tracking_cc.cc
glonass_l2_ca_dll_pll_tracking_cc.cc
glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc
@ -52,7 +52,7 @@ set(TRACKING_GR_BLOCKS_HEADERS
glonass_l1_ca_dll_pll_tracking_cc.h
glonass_l1_ca_dll_pll_c_aid_tracking_cc.h
glonass_l1_ca_dll_pll_c_aid_tracking_sc.h
gps_l1_ca_kf_tracking_cc.h
gps_l1_ca_kf_tracking_cc.h
glonass_l2_ca_dll_pll_tracking_cc.h
glonass_l2_ca_dll_pll_c_aid_tracking_cc.h
glonass_l2_ca_dll_pll_c_aid_tracking_sc.h

6
src/core/libs/CMakeLists.txt
View File

@ -22,20 +22,20 @@ if(OPENSSL_FOUND)
add_definitions( -DUSE_OPENSSL_FALLBACK=1 )
endif(OPENSSL_FOUND)
set(CORE_LIBS_SOURCES
set(CORE_LIBS_SOURCES
ini.cc
INIReader.cc
string_converter.cc
gnss_sdr_supl_client.cc
)
set(CORE_LIBS_HEADERS
set(CORE_LIBS_HEADERS
ini.h
INIReader.h
string_converter.h
gnss_sdr_supl_client.h
)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/src/core/system_parameters

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

@ -39,13 +39,11 @@ include_directories(
if(CMAKE_C_COMPILER_ID MATCHES "Clang")
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(CMAKE_C_COMPILER_ID MATCHES "Clang")
endif(CMAKE_C_COMPILER_ID MATCHES "Clang")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_C_FLAGS}")
add_library (supl_library STATIC ${ASN_RRLP_SOURCES} ${ASN_SUPL_SOURCES} ${SUPL_SOURCES})
target_link_libraries (supl_library ${GNUTLS_LIBRARIES} ${GNUTLS_OPENSSL_LIBRARY} gnss_system_parameters)
target_link_libraries (supl_library ${GNUTLS_LIBRARIES} ${GNUTLS_OPENSSL_LIBRARY} gnss_system_parameters)
set_target_properties(supl_library PROPERTIES LINKER_LANGUAGE C)

6
src/core/monitor/CMakeLists.txt
View File

@ -17,12 +17,12 @@
#
set(CORE_MONITOR_LIBS_SOURCES
set(CORE_MONITOR_LIBS_SOURCES
gnss_synchro_monitor.cc
gnss_synchro_udp_sink.cc
)
set(CORE_MONITOR_LIBS_HEADERS
set(CORE_MONITOR_LIBS_HEADERS
gnss_synchro_monitor.h
gnss_synchro_udp_sink.h
)
@ -42,5 +42,5 @@ list(SORT CORE_MONITOR_LIBS_SOURCES)
add_library(core_monitor_lib ${CORE_MONITOR_LIBS_SOURCES} ${CORE_MONITOR_LIBS_HEADERS})
source_group(Headers FILES ${CORE_MONITOR_LIBS_HEADERS})
target_link_libraries(core_monitor_lib ${Boost_LIBRARIES})
target_link_libraries(core_monitor_lib ${Boost_LIBRARIES})
add_dependencies(core_monitor_lib glog-${glog_RELEASE})

4
src/utils/front-end-cal/CMakeLists.txt
View File

@ -67,7 +67,7 @@ target_link_libraries(front_end_cal_lib ${MAC_LIBRARIES}
gnss_rx
channel_fsm
)
add_dependencies(front_end_cal_lib glog-${glog_RELEASE} armadillo-${armadillo_RELEASE})
add_definitions( -DGNSS_SDR_VERSION="${VERSION}" )
@ -96,7 +96,7 @@ target_link_libraries(front-end-cal ${MAC_LIBRARIES}
front_end_cal_lib
)
install(TARGETS front-end-cal
RUNTIME DESTINATION bin
COMPONENT "front-end-cal"