From e94b2f89900527ca69bbb7766bad46d09c6e06b4 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 18 Nov 2018 21:24:54 +0100 Subject: [PATCH] Remove blanks --- CMakeLists.txt | 8 +++++--- src/algorithms/PVT/libs/CMakeLists.txt | 15 ++++++++------- src/algorithms/acquisition/CMakeLists.txt | 1 - .../acquisition/adapters/CMakeLists.txt | 8 ++++---- src/algorithms/channel/CMakeLists.txt | 2 +- src/algorithms/channel/libs/CMakeLists.txt | 13 ++++++------- src/algorithms/conditioner/CMakeLists.txt | 1 - .../conditioner/adapters/CMakeLists.txt | 6 +++--- src/algorithms/data_type_adapter/CMakeLists.txt | 1 - .../data_type_adapter/adapters/CMakeLists.txt | 12 ++++++------ .../gnuradio_blocks/CMakeLists.txt | 4 ++-- src/algorithms/input_filter/CMakeLists.txt | 2 +- .../input_filter/adapters/CMakeLists.txt | 4 ++-- src/algorithms/observables/CMakeLists.txt | 2 +- src/algorithms/resampler/CMakeLists.txt | 2 +- .../resampler/gnuradio_blocks/CMakeLists.txt | 6 +++--- .../signal_generator/adapters/CMakeLists.txt | 8 ++++---- .../signal_source/adapters/CMakeLists.txt | 2 +- .../signal_source/gnuradio_blocks/CMakeLists.txt | 6 +++--- src/algorithms/signal_source/libs/CMakeLists.txt | 2 +- src/algorithms/telemetry_decoder/CMakeLists.txt | 2 +- .../telemetry_decoder/adapters/CMakeLists.txt | 8 ++++---- .../libs/libswiftcnav/CMakeLists.txt | 10 +++++----- src/algorithms/tracking/adapters/CMakeLists.txt | 6 +++--- .../tracking/gnuradio_blocks/CMakeLists.txt | 4 ++-- src/core/libs/CMakeLists.txt | 6 +++--- src/core/libs/supl/CMakeLists.txt | 8 +++----- src/core/monitor/CMakeLists.txt | 6 +++--- src/utils/front-end-cal/CMakeLists.txt | 4 ++-- 29 files changed, 78 insertions(+), 81 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9caeece66..53daece1f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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}) diff --git a/src/algorithms/PVT/libs/CMakeLists.txt b/src/algorithms/PVT/libs/CMakeLists.txt index 6807e9602..ed69cabab 100644 --- a/src/algorithms/PVT/libs/CMakeLists.txt +++ b/src/algorithms/PVT/libs/CMakeLists.txt @@ -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} diff --git a/src/algorithms/acquisition/CMakeLists.txt b/src/algorithms/acquisition/CMakeLists.txt index 5cf06e3e8..96259341c 100644 --- a/src/algorithms/acquisition/CMakeLists.txt +++ b/src/algorithms/acquisition/CMakeLists.txt @@ -19,4 +19,3 @@ add_subdirectory(adapters) add_subdirectory(gnuradio_blocks) add_subdirectory(libs) - diff --git a/src/algorithms/acquisition/adapters/CMakeLists.txt b/src/algorithms/acquisition/adapters/CMakeLists.txt index b44f7d6f2..b27cb9cb3 100644 --- a/src/algorithms/acquisition/adapters/CMakeLists.txt +++ b/src/algorithms/acquisition/adapters/CMakeLists.txt @@ -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) diff --git a/src/algorithms/channel/CMakeLists.txt b/src/algorithms/channel/CMakeLists.txt index 077b74808..cd5604218 100644 --- a/src/algorithms/channel/CMakeLists.txt +++ b/src/algorithms/channel/CMakeLists.txt @@ -17,4 +17,4 @@ # add_subdirectory(adapters) -add_subdirectory(libs) \ No newline at end of file +add_subdirectory(libs) diff --git a/src/algorithms/channel/libs/CMakeLists.txt b/src/algorithms/channel/libs/CMakeLists.txt index 308e97833..7965cea70 100644 --- a/src/algorithms/channel/libs/CMakeLists.txt +++ b/src/algorithms/channel/libs/CMakeLists.txt @@ -16,15 +16,15 @@ # along with GNSS-SDR. If not, see . # -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) - diff --git a/src/algorithms/conditioner/CMakeLists.txt b/src/algorithms/conditioner/CMakeLists.txt index de941b536..166f27d36 100644 --- a/src/algorithms/conditioner/CMakeLists.txt +++ b/src/algorithms/conditioner/CMakeLists.txt @@ -17,4 +17,3 @@ # add_subdirectory(adapters) -#add_subdirectory(gnuradio_blocks) \ No newline at end of file diff --git a/src/algorithms/conditioner/adapters/CMakeLists.txt b/src/algorithms/conditioner/adapters/CMakeLists.txt index fea88dd0a..def069263 100644 --- a/src/algorithms/conditioner/adapters/CMakeLists.txt +++ b/src/algorithms/conditioner/adapters/CMakeLists.txt @@ -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}) \ No newline at end of file +add_dependencies(conditioner_adapters glog-${glog_RELEASE}) diff --git a/src/algorithms/data_type_adapter/CMakeLists.txt b/src/algorithms/data_type_adapter/CMakeLists.txt index 6037ad61f..1c15cc0ca 100644 --- a/src/algorithms/data_type_adapter/CMakeLists.txt +++ b/src/algorithms/data_type_adapter/CMakeLists.txt @@ -19,4 +19,3 @@ add_subdirectory(adapters) add_subdirectory(gnuradio_blocks) - diff --git a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt index 26eb01b83..419e1a271 100644 --- a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt +++ b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt @@ -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} diff --git a/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt b/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt index 1bb51014b..2253ce5f8 100644 --- a/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt @@ -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 diff --git a/src/algorithms/input_filter/CMakeLists.txt b/src/algorithms/input_filter/CMakeLists.txt index 64cb2a571..1841d3dfc 100644 --- a/src/algorithms/input_filter/CMakeLists.txt +++ b/src/algorithms/input_filter/CMakeLists.txt @@ -17,4 +17,4 @@ # add_subdirectory(adapters) -add_subdirectory(gnuradio_blocks) \ No newline at end of file +add_subdirectory(gnuradio_blocks) diff --git a/src/algorithms/input_filter/adapters/CMakeLists.txt b/src/algorithms/input_filter/adapters/CMakeLists.txt index a2520bf39..959c1ba88 100644 --- a/src/algorithms/input_filter/adapters/CMakeLists.txt +++ b/src/algorithms/input_filter/adapters/CMakeLists.txt @@ -16,7 +16,7 @@ # along with GNSS-SDR. If not, see . # -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 diff --git a/src/algorithms/observables/CMakeLists.txt b/src/algorithms/observables/CMakeLists.txt index 64cb2a571..1841d3dfc 100644 --- a/src/algorithms/observables/CMakeLists.txt +++ b/src/algorithms/observables/CMakeLists.txt @@ -17,4 +17,4 @@ # add_subdirectory(adapters) -add_subdirectory(gnuradio_blocks) \ No newline at end of file +add_subdirectory(gnuradio_blocks) diff --git a/src/algorithms/resampler/CMakeLists.txt b/src/algorithms/resampler/CMakeLists.txt index 64cb2a571..1841d3dfc 100644 --- a/src/algorithms/resampler/CMakeLists.txt +++ b/src/algorithms/resampler/CMakeLists.txt @@ -17,4 +17,4 @@ # add_subdirectory(adapters) -add_subdirectory(gnuradio_blocks) \ No newline at end of file +add_subdirectory(gnuradio_blocks) diff --git a/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt b/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt index 81c9e3deb..26233f3fd 100644 --- a/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt @@ -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}) \ No newline at end of file +add_dependencies(resampler_gr_blocks glog-${glog_RELEASE}) diff --git a/src/algorithms/signal_generator/adapters/CMakeLists.txt b/src/algorithms/signal_generator/adapters/CMakeLists.txt index 6562a410c..c248171d9 100644 --- a/src/algorithms/signal_generator/adapters/CMakeLists.txt +++ b/src/algorithms/signal_generator/adapters/CMakeLists.txt @@ -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} ) diff --git a/src/algorithms/signal_source/adapters/CMakeLists.txt b/src/algorithms/signal_source/adapters/CMakeLists.txt index 7d37b139f..6fc6b11ed 100644 --- a/src/algorithms/signal_source/adapters/CMakeLists.txt +++ b/src/algorithms/signal_source/adapters/CMakeLists.txt @@ -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( diff --git a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt index 5c16fac07..9f9c174c7 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt @@ -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} ) diff --git a/src/algorithms/signal_source/libs/CMakeLists.txt b/src/algorithms/signal_source/libs/CMakeLists.txt index a7e5c8495..ef15705fe 100644 --- a/src/algorithms/signal_source/libs/CMakeLists.txt +++ b/src/algorithms/signal_source/libs/CMakeLists.txt @@ -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 diff --git a/src/algorithms/telemetry_decoder/CMakeLists.txt b/src/algorithms/telemetry_decoder/CMakeLists.txt index ea74d8ec3..96259341c 100644 --- a/src/algorithms/telemetry_decoder/CMakeLists.txt +++ b/src/algorithms/telemetry_decoder/CMakeLists.txt @@ -18,4 +18,4 @@ add_subdirectory(adapters) add_subdirectory(gnuradio_blocks) -add_subdirectory(libs) \ No newline at end of file +add_subdirectory(libs) diff --git a/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt b/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt index db68a7cce..7c4e4b53a 100644 --- a/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt +++ b/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt @@ -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( diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt b/src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt index 8dba92115..ad356be81 100644 --- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt +++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/CMakeLists.txt @@ -16,19 +16,19 @@ # along with GNSS-SDR. If not, see . # -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( diff --git a/src/algorithms/tracking/adapters/CMakeLists.txt b/src/algorithms/tracking/adapters/CMakeLists.txt index e8d12d844..5ac4ec00b 100644 --- a/src/algorithms/tracking/adapters/CMakeLists.txt +++ b/src/algorithms/tracking/adapters/CMakeLists.txt @@ -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 diff --git a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt index d31676a64..9ac1a4e26 100644 --- a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt @@ -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 diff --git a/src/core/libs/CMakeLists.txt b/src/core/libs/CMakeLists.txt index 45c7477ab..0c6bbd4c2 100644 --- a/src/core/libs/CMakeLists.txt +++ b/src/core/libs/CMakeLists.txt @@ -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 diff --git a/src/core/libs/supl/CMakeLists.txt b/src/core/libs/supl/CMakeLists.txt index 6d0edd576..4faecafda 100644 --- a/src/core/libs/supl/CMakeLists.txt +++ b/src/core/libs/supl/CMakeLists.txt @@ -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) - - diff --git a/src/core/monitor/CMakeLists.txt b/src/core/monitor/CMakeLists.txt index ccbdd9f44..8bba7c587 100644 --- a/src/core/monitor/CMakeLists.txt +++ b/src/core/monitor/CMakeLists.txt @@ -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}) diff --git a/src/utils/front-end-cal/CMakeLists.txt b/src/utils/front-end-cal/CMakeLists.txt index a9d1d455a..252131884 100644 --- a/src/utils/front-end-cal/CMakeLists.txt +++ b/src/utils/front-end-cal/CMakeLists.txt @@ -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"