mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2025-11-06 10:13:04 +00:00
Merged with github next
This commit is contained in:
@@ -17,8 +17,8 @@
|
||||
#
|
||||
|
||||
if(ENABLE_CUDA)
|
||||
FIND_PACKAGE(CUDA REQUIRED)
|
||||
set(OPT_TRACKING_ADAPTERS ${OPT_TRACKING_ADAPTERS} gps_l1_ca_dll_pll_tracking_gpu.cc)
|
||||
set(OPT_TRACKING_ADAPTERS ${OPT_TRACKING_ADAPTERS} gps_l1_ca_dll_pll_tracking_gpu.cc)
|
||||
set(OPT_TRACKING_INCLUDE_DIRS ${OPT_TRACKING_INCLUDE_DIRS} ${CUDA_INCLUDE_DIRS})
|
||||
endif(ENABLE_CUDA)
|
||||
|
||||
set(TRACKING_ADAPTER_SOURCES
|
||||
@@ -45,7 +45,7 @@ include_directories(
|
||||
${GLOG_INCLUDE_DIRS}
|
||||
${GFlags_INCLUDE_DIRS}
|
||||
${GNURADIO_RUNTIME_INCLUDE_DIRS}
|
||||
${CUDA_INCLUDE_DIRS}
|
||||
${OPT_TRACKING_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
file(GLOB TRACKING_ADAPTER_HEADERS "*.h")
|
||||
|
||||
@@ -51,7 +51,6 @@ class ConfigurationInterface;
|
||||
class GpsL1CaDllPllTrackingGPU : public TrackingInterface
|
||||
{
|
||||
public:
|
||||
|
||||
GpsL1CaDllPllTrackingGPU(ConfigurationInterface* configuration,
|
||||
std::string role,
|
||||
unsigned int in_streams,
|
||||
@@ -65,7 +64,7 @@ public:
|
||||
return role_;
|
||||
}
|
||||
|
||||
//! Returns "GPS_L1_CA_DLL_PLL_Tracking"
|
||||
//! Returns "GPS_L1_CA_DLL_PLL_Tracking_GPU"
|
||||
std::string implementation()
|
||||
{
|
||||
return "GPS_L1_CA_DLL_PLL_Tracking_GPU";
|
||||
|
||||
Reference in New Issue
Block a user