mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-08-25 11:06:49 +00:00
Merge branch 'next' of https://github.com/carlesfernandez/gnss-sdr into next
This commit is contained in:
commit
cc474881f2
@ -23,7 +23,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
|
|||||||
message(FATAL_ERROR "Prevented in-tree build, it is bad practice.\nTry 'cd build && cmake ..' instead.")
|
message(FATAL_ERROR "Prevented in-tree build, it is bad practice.\nTry 'cd build && cmake ..' instead.")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 2.8.12...3.14.5)
|
cmake_minimum_required(VERSION 2.8.12...3.15)
|
||||||
project(gnss-sdr CXX C)
|
project(gnss-sdr CXX C)
|
||||||
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
|
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
|
||||||
|
|
||||||
@ -682,15 +682,12 @@ set_package_properties(Boost PROPERTIES
|
|||||||
TYPE REQUIRED
|
TYPE REQUIRED
|
||||||
)
|
)
|
||||||
|
|
||||||
if(CMAKE_VERSION VERSION_GREATER 3.14)
|
if(CMAKE_VERSION VERSION_LESS 3.14)
|
||||||
set_package_properties(Boost PROPERTIES
|
set(Boost_VERSION_STRING "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
|
||||||
DESCRIPTION "Portable C++ source libraries (found: v${Boost_VERSION_STRING})"
|
|
||||||
)
|
|
||||||
else()
|
|
||||||
set_package_properties(Boost PROPERTIES
|
|
||||||
DESCRIPTION "Portable C++ source libraries (found: v${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION})"
|
|
||||||
)
|
|
||||||
endif()
|
endif()
|
||||||
|
set_package_properties(Boost PROPERTIES
|
||||||
|
DESCRIPTION "Portable C++ source libraries (found: v${Boost_VERSION_STRING})"
|
||||||
|
)
|
||||||
|
|
||||||
if(CMAKE_VERSION VERSION_LESS 3.5)
|
if(CMAKE_VERSION VERSION_LESS 3.5)
|
||||||
if(NOT TARGET Boost::boost)
|
if(NOT TARGET Boost::boost)
|
||||||
@ -761,7 +758,7 @@ if(CMAKE_VERSION VERSION_LESS 3.5)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Fix for Boost Asio < 1.70 when using Clang in macOS
|
# Fix for Boost Asio < 1.70 when using Clang in macOS
|
||||||
if(${Boost_VERSION} VERSION_LESS 107000)
|
if(Boost_VERSION_STRING VERSION_LESS 1.70.0)
|
||||||
# Check if we have std::string_view
|
# Check if we have std::string_view
|
||||||
include(CheckCXXSourceCompiles)
|
include(CheckCXXSourceCompiles)
|
||||||
check_cxx_source_compiles("
|
check_cxx_source_compiles("
|
||||||
|
@ -44,7 +44,7 @@ target_include_directories(pvt_adapters
|
|||||||
${CMAKE_SOURCE_DIR}/src/core/interfaces
|
${CMAKE_SOURCE_DIR}/src/core/interfaces
|
||||||
)
|
)
|
||||||
|
|
||||||
if(Boost_VERSION LESS 105800)
|
if(Boost_VERSION_STRING VERSION_LESS 1.58.0)
|
||||||
target_compile_definitions(pvt_adapters PRIVATE -DOLD_BOOST=1)
|
target_compile_definitions(pvt_adapters PRIVATE -DOLD_BOOST=1)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -62,7 +62,7 @@ if(ENABLE_CLANG_TIDY)
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(Boost_VERSION LESS 105800)
|
if(Boost_VERSION_STRING VERSION_LESS 1.58.0)
|
||||||
target_compile_definitions(pvt_gr_blocks PRIVATE -DOLD_BOOST=1)
|
target_compile_definitions(pvt_gr_blocks PRIVATE -DOLD_BOOST=1)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -95,7 +95,7 @@ target_include_directories(pvt_libs
|
|||||||
|
|
||||||
target_compile_definitions(pvt_libs PRIVATE -DGNSS_SDR_VERSION="${VERSION}")
|
target_compile_definitions(pvt_libs PRIVATE -DGNSS_SDR_VERSION="${VERSION}")
|
||||||
|
|
||||||
if(Boost_VERSION VERSION_GREATER "106599")
|
if(Boost_VERSION_STRING VERSION_GREATER 1.65.99)
|
||||||
target_compile_definitions(pvt_libs
|
target_compile_definitions(pvt_libs
|
||||||
PUBLIC
|
PUBLIC
|
||||||
-DBOOST_GREATER_1_65
|
-DBOOST_GREATER_1_65
|
||||||
@ -104,7 +104,7 @@ endif()
|
|||||||
|
|
||||||
# Fix for Boost Asio < 1.70
|
# Fix for Boost Asio < 1.70
|
||||||
if(OS_IS_MACOSX)
|
if(OS_IS_MACOSX)
|
||||||
if((CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (${Boost_VERSION} VERSION_LESS 107000))
|
if((CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (Boost_VERSION_STRING VERSION_LESS 1.70.0))
|
||||||
if(${has_string_view})
|
if(${has_string_view})
|
||||||
target_compile_definitions(pvt_libs
|
target_compile_definitions(pvt_libs
|
||||||
PUBLIC
|
PUBLIC
|
||||||
|
@ -73,23 +73,21 @@ if(ENABLE_BAD_BOOST)
|
|||||||
message(STATUS "Enabling use of known bad versions of Boost.")
|
message(STATUS "Enabling use of known bad versions of Boost.")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# For any unsuitable Boost version, add the version number below in
|
|
||||||
# the following format: XXYYZZ
|
|
||||||
# Where:
|
|
||||||
# XX is the major version ('10' for version 1)
|
|
||||||
# YY is the minor version number ('46' for 1.46)
|
|
||||||
# ZZ is the patcher version number (typically just '00')
|
|
||||||
set(Boost_NOGO_VERSIONS
|
set(Boost_NOGO_VERSIONS
|
||||||
104600 104601 104700 105200
|
"1.46.0" "1.46.1" "1.47.0" "1.52.0"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if(CMAKE_VERSION VERSION_LESS 3.14)
|
||||||
|
set(Boost_VERSION_STRING "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
|
||||||
|
endif()
|
||||||
|
|
||||||
foreach(ver ${Boost_NOGO_VERSIONS})
|
foreach(ver ${Boost_NOGO_VERSIONS})
|
||||||
if("${Boost_VERSION}" STREQUAL "${ver}")
|
if("${Boost_VERSION_STRING}" STREQUAL "${ver}")
|
||||||
if(NOT ENABLE_BAD_BOOST)
|
if(NOT ENABLE_BAD_BOOST)
|
||||||
message(STATUS "WARNING: Found a known bad version of Boost (v${Boost_VERSION}). Disabling.")
|
message(STATUS "WARNING: Found a known bad version of Boost (v${Boost_VERSION_STRING}). Disabling.")
|
||||||
set(Boost_FOUND FALSE)
|
set(Boost_FOUND FALSE)
|
||||||
else()
|
else()
|
||||||
message(STATUS "WARNING: Found a known bad version of Boost (v${Boost_VERSION}). Continuing anyway.")
|
message(STATUS "WARNING: Found a known bad version of Boost (v${Boost_VERSION_STRING}). Continuing anyway.")
|
||||||
set(Boost_FOUND TRUE)
|
set(Boost_FOUND TRUE)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
@ -83,7 +83,7 @@ endif()
|
|||||||
|
|
||||||
# Fix for Boost Asio < 1.70
|
# Fix for Boost Asio < 1.70
|
||||||
if(OS_IS_MACOSX)
|
if(OS_IS_MACOSX)
|
||||||
if((CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (${Boost_VERSION} VERSION_LESS 107000))
|
if((CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (Boost_VERSION_STRING VERSION_LESS 1.70.0))
|
||||||
if(${has_string_view})
|
if(${has_string_view})
|
||||||
target_compile_definitions(signal_source_gr_blocks
|
target_compile_definitions(signal_source_gr_blocks
|
||||||
PUBLIC
|
PUBLIC
|
||||||
@ -98,7 +98,7 @@ if(OS_IS_MACOSX)
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(Boost_VERSION VERSION_GREATER "106599")
|
if(Boost_VERSION_STRING VERSION_GREATER 1.65.99)
|
||||||
target_compile_definitions(signal_source_gr_blocks
|
target_compile_definitions(signal_source_gr_blocks
|
||||||
PUBLIC
|
PUBLIC
|
||||||
-DBOOST_GREATER_1_65
|
-DBOOST_GREATER_1_65
|
||||||
|
@ -110,7 +110,7 @@ if(NOT CMAKE_VERSION VERSION_GREATER 3.11)
|
|||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(Boost_VERSION VERSION_GREATER "106599")
|
if(Boost_VERSION_STRING VERSION_GREATER 1.65.99)
|
||||||
target_compile_definitions(tracking_libs
|
target_compile_definitions(tracking_libs
|
||||||
PUBLIC
|
PUBLIC
|
||||||
-DBOOST_GREATER_1_65
|
-DBOOST_GREATER_1_65
|
||||||
@ -119,7 +119,7 @@ endif()
|
|||||||
|
|
||||||
# Fix for Boost Asio < 1.70
|
# Fix for Boost Asio < 1.70
|
||||||
if(OS_IS_MACOSX)
|
if(OS_IS_MACOSX)
|
||||||
if((CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (${Boost_VERSION} VERSION_LESS 107000))
|
if((CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (Boost_VERSION_STRING VERSION_LESS 1.70.0))
|
||||||
if(${has_string_view})
|
if(${has_string_view})
|
||||||
target_compile_definitions(tracking_libs
|
target_compile_definitions(tracking_libs
|
||||||
PUBLIC
|
PUBLIC
|
||||||
|
@ -60,7 +60,7 @@ target_include_directories(core_monitor
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
if(Boost_VERSION VERSION_GREATER "106599")
|
if(Boost_VERSION_STRING VERSION_GREATER 1.65.99)
|
||||||
target_compile_definitions(core_monitor
|
target_compile_definitions(core_monitor
|
||||||
PUBLIC
|
PUBLIC
|
||||||
-DBOOST_GREATER_1_65
|
-DBOOST_GREATER_1_65
|
||||||
@ -70,7 +70,7 @@ endif()
|
|||||||
|
|
||||||
# Fix for Boost Asio < 1.70
|
# Fix for Boost Asio < 1.70
|
||||||
if(OS_IS_MACOSX)
|
if(OS_IS_MACOSX)
|
||||||
if((CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (${Boost_VERSION} VERSION_LESS 107000))
|
if((CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (Boost_VERSION_STRING VERSION_LESS 1.70.0))
|
||||||
if(${has_string_view})
|
if(${has_string_view})
|
||||||
target_compile_definitions(core_monitor
|
target_compile_definitions(core_monitor
|
||||||
PUBLIC
|
PUBLIC
|
||||||
@ -96,7 +96,6 @@ if(ENABLE_CLANG_TIDY)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
set_property(TARGET core_monitor
|
set_property(TARGET core_monitor
|
||||||
APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
|
APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
|
||||||
$<BUILD_INTERFACE:${PROTO_INCLUDE_HEADERS}>
|
$<BUILD_INTERFACE:${PROTO_INCLUDE_HEADERS}>
|
||||||
|
@ -124,7 +124,7 @@ if(ENABLE_CUDA)
|
|||||||
target_compile_definitions(core_receiver PRIVATE -DCUDA_GPU_ACCEL=1)
|
target_compile_definitions(core_receiver PRIVATE -DCUDA_GPU_ACCEL=1)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(Boost_VERSION VERSION_GREATER "106599")
|
if(Boost_VERSION_STRING VERSION_GREATER 1.65.99)
|
||||||
target_compile_definitions(core_receiver
|
target_compile_definitions(core_receiver
|
||||||
PRIVATE
|
PRIVATE
|
||||||
-DBOOST_GREATER_1_65
|
-DBOOST_GREATER_1_65
|
||||||
@ -158,7 +158,7 @@ target_link_libraries(core_receiver
|
|||||||
|
|
||||||
# Fix for Boost Asio < 1.70
|
# Fix for Boost Asio < 1.70
|
||||||
if(OS_IS_MACOSX)
|
if(OS_IS_MACOSX)
|
||||||
if((CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (${Boost_VERSION} VERSION_LESS 107000))
|
if((CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (Boost_VERSION_STRING VERSION_LESS 1.70.0))
|
||||||
if(${has_string_view})
|
if(${has_string_view})
|
||||||
target_compile_definitions(core_receiver
|
target_compile_definitions(core_receiver
|
||||||
PUBLIC
|
PUBLIC
|
||||||
|
@ -367,7 +367,6 @@ int main(int argc, char** argv)
|
|||||||
int64_t fs_in_ = configuration->property("GNSS-SDR.internal_fs_sps", 2048000);
|
int64_t fs_in_ = configuration->property("GNSS-SDR.internal_fs_sps", 2048000);
|
||||||
configuration->set_property("Acquisition.max_dwells", "10");
|
configuration->set_property("Acquisition.max_dwells", "10");
|
||||||
|
|
||||||
GNSSBlockFactory block_factory;
|
|
||||||
acquisition = new GpsL1CaPcpsAcquisitionFineDoppler(configuration.get(), "Acquisition", 1, 1);
|
acquisition = new GpsL1CaPcpsAcquisitionFineDoppler(configuration.get(), "Acquisition", 1, 1);
|
||||||
|
|
||||||
acquisition->set_channel(1);
|
acquisition->set_channel(1);
|
||||||
|
Loading…
Reference in New Issue
Block a user