mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-10-30 23:03:05 +00:00
Code Issues Releases Wiki Activity

Merge branch 'next' into release0011

Browse Source
This commit is contained in:
Carles Fernandez
2019-08-04 08:28:19 +02:00
parent ef90e09a36 2e93dbe8dc
commit 75c71afd30
11 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@@ -875,14 +875,10 @@ if(NOT VOLKGNSSSDR_FOUND)
)
endif()
set(READ_ENVIRO "")
if(ENABLE_PACKAGING)
if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
set(STRIP_VOLK_GNSSSDR_PROFILE "-DENABLE_STRIP=ON -DCMAKE_VERBOSE_MAKEFILE=ON")
endif()
if(NOT DEFINED ENV{PROTECT_PASSWORDS})
set(READ_ENVIRO ${CMAKE_COMMAND} -E environment)
endif()
endif()
set(VOLK_GNSSSDR_BUILD_COMMAND "${CMAKE_MAKE_PROGRAM}")
@@ -920,11 +916,11 @@ if(NOT VOLKGNSSSDR_FOUND)
PREFIX ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/build
CMAKE_ARGS ${READ_ENVIRO} ${VOLK_GNSSSDR_CMAKE_ARGS}
CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS}
DOWNLOAD_COMMAND ""
UPDATE_COMMAND ""
PATCH_COMMAND ""
BUILD_COMMAND ${READ_ENVIRO} ${VOLK_GNSSSDR_BUILD_COMMAND} volk_gnsssdr_profile
BUILD_COMMAND ${VOLK_GNSSSDR_BUILD_COMMAND} volk_gnsssdr_profile
INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install
)
else()
@@ -932,11 +928,11 @@ if(NOT VOLKGNSSSDR_FOUND)
PREFIX ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/build
CMAKE_ARGS ${READ_ENVIRO} ${VOLK_GNSSSDR_CMAKE_ARGS}
CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS}
DOWNLOAD_COMMAND ""
UPDATE_COMMAND ""
PATCH_COMMAND ""
BUILD_COMMAND ${READ_ENVIRO} ${VOLK_GNSSSDR_BUILD_COMMAND} volk_gnsssdr_profile
BUILD_COMMAND ${VOLK_GNSSSDR_BUILD_COMMAND} volk_gnsssdr_profile
BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}volk_gnsssdr${CMAKE_STATIC_LIBRARY_SUFFIX}
${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install/bin/volk_gnsssdr_profile
INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install

4
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt
View File

@@ -163,6 +163,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MY_CXX_FLAGS} -Wall")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
option(ENABLE_STRIP "Create a stripped volk_gnsssdr_profile binary (without shared libraries)" OFF)
if(ENABLE_STRIP)
set(CMAKE_VERBOSE_MAKEFILE ON)
endif()
include(VolkBuildTypes)
# select the release build type by default to get optimization flags
@@ -181,7 +184,6 @@ include(VolkVersion) # setup version info
########################################################################
# Environment setup
########################################################################

1
src/algorithms/signal_source/adapters/gen_signal_source.cc
View File

@@ -32,7 +32,6 @@
#include "gen_signal_source.h"
#include <boost/lexical_cast.hpp>
#include <boost/thread/thread.hpp>
#include <glog/logging.h>
#include <gnuradio/io_signature.h>
#include <gnuradio/message.h>

2
src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h
View File

@@ -44,8 +44,6 @@
#include "gnss_synchro.h"
#include "tracking_2nd_DLL_filter.h"
#include "tracking_FLL_PLL_filter.h"
#include <boost/thread/mutex.hpp>
#include <boost/thread/thread.hpp>
#include <gnuradio/block.h>
#include <volk_gnsssdr/volk_gnsssdr.h>
#include <fstream>

2
src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h
View File

@@ -42,8 +42,6 @@
#include "gnss_synchro.h"
#include "tracking_2nd_DLL_filter.h"
#include "tracking_FLL_PLL_filter.h"
#include <boost/thread/mutex.hpp>
#include <boost/thread/thread.hpp>
#include <gnuradio/block.h>
#include <volk_gnsssdr/volk_gnsssdr.h>
#include <fstream>

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

@@ -135,7 +135,6 @@ target_link_libraries(core_receiver
PUBLIC
core_libs
core_monitor
Boost::thread
Gnuradio::runtime
PRIVATE
signal_source_adapters
@@ -150,7 +149,6 @@ target_link_libraries(core_receiver
obs_adapters
pvt_adapters
Boost::boost
Boost::chrono
Gflags::gflags
Glog::glog
Armadillo::armadillo
@@ -179,6 +177,15 @@ if(OS_IS_MACOSX)
endif()
endif()
if(ENABLE_FPGA)
target_link_libraries(core_receiver
PUBLIC
Boost::thread
PRIVATE
Boost::chrono
)
endif()
if(ENABLE_FLEXIBAND AND TELEORBIT_FOUND)
target_link_libraries(core_receiver
PRIVATE

4
src/core/receiver/control_thread.cc
View File

@@ -65,7 +65,6 @@
#include "rtklib_ephemeris.h" // for alm2pos, eph2pos
#include "rtklib_rtkcmn.h" // for utc2gpst
#include <armadillo> // for interaction with geofunctions
#include <boost/chrono.hpp> // for steady_clock
#include <boost/lexical_cast.hpp> // for bad_lexical_cast
#include <glog/logging.h> // for LOG
#include <pmt/pmt.h> // for make_any
@@ -82,6 +81,9 @@
#include <sys/ipc.h> // for IPC_CREAT
#include <sys/msg.h> // for msgctl, msgget
#ifdef ENABLE_FPGA
#include <boost/chrono.hpp> // for steady_clock
#endif
extern Concurrent_Map<Gps_Acq_Assist> global_gps_acq_assist_map;
extern Concurrent_Queue<Gps_Acq_Assist> global_gps_acq_assist_queue;

14
src/core/receiver/control_thread.h
View File

@@ -40,7 +40,6 @@
#include "concurrent_queue.h" // for Concurrent_Queue
#include "gnss_sdr_supl_client.h" // for Gnss_Sdr_Supl_Client
#include "tcp_cmd_interface.h" // for TcpCmdInterface
#include <boost/thread.hpp> // for boost::thread
#include <pmt/pmt.h>
#include <array> // for array
#include <ctime> // for time_t (gmtime, strftime in implementation)
@@ -50,6 +49,11 @@
#include <utility> // for pair
#include <vector> // for vector
#ifdef ENABLE_FPGA
#include <boost/thread.hpp> // for boost::thread
#endif
class ConfigurationInterface;
class GNSSFlowgraph;
class Gnss_Satellite;
@@ -173,8 +177,6 @@ private:
unsigned int processed_control_messages_;
unsigned int applied_actions_;
boost::thread fpga_helper_thread_;
std::thread keyboard_thread_;
std::thread sysv_queue_thread_;
std::thread gps_acq_assist_data_collector_thread_;
@@ -201,6 +203,10 @@ private:
Agnss_Ref_Location agnss_ref_location_;
Agnss_Ref_Time agnss_ref_time_;
#ifdef ENABLE_FPGA
boost::thread fpga_helper_thread_;
#endif
};
#endif /*GNSS_SDR_CONTROL_THREAD_H_*/
#endif /* GNSS_SDR_CONTROL_THREAD_H_ */

4
src/main/CMakeLists.txt
View File

@@ -31,10 +31,12 @@ endif()
target_link_libraries(gnss-sdr
PUBLIC
core_receiver
Boost::boost
Boost::thread
Gflags::gflags
Glog::glog
Threads::Threads
core_receiver
)
target_compile_definitions(gnss-sdr PRIVATE -DGNSS_SDR_VERSION="${VERSION}")

2
src/main/main.cc
View File

@@ -43,7 +43,7 @@
#include "concurrent_queue.h"
#include "control_thread.h"
#include "gps_acq_assist.h"
#include <boost/exception/diagnostic_information.hpp> // for diagnostic_informatio
#include <boost/exception/diagnostic_information.hpp> // for diagnostic_information
#include <boost/exception/exception.hpp> // for exception
#include <boost/thread/exceptions.hpp> // for thread_resource_error
#include <gflags/gflags.h> // for ShutDownCommandLineFlags

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

@@ -27,10 +27,6 @@ target_link_libraries(front_end_cal_lib
PUBLIC
Armadillo::armadillo
Threads::Threads
Volkgnsssdr::volkgnsssdr ${ORC_LIBRARIES}
signal_source_adapters
signal_source_gr_blocks
signal_source_libs
acquisition_adapters
gnss_sdr_flags
channel_libs
@@ -68,11 +64,11 @@ endif()
target_link_libraries(front-end-cal
PUBLIC
Volkgnsssdr::volkgnsssdr ${ORC_LIBRARIES}
core_libs
core_receiver
front_end_cal_lib
gnss_sdr_flags
Boost::boost
PRIVATE
Gflags::gflags
Glog::glog