mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-11-14 14:17:11 +00:00
Code Issues Releases Wiki Activity

Merge branch 'next' of https://github.com/mmajoral/gnss-sdr into fpga_extended_coherent_integration

Browse Source
This commit is contained in:
Marc Majoral
2019-07-24 11:30:04 +02:00
parent 48fe6086e4 bd99a0674c
commit ad7c1afea1
45 changed files with 472 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,7 +83,7 @@ endif()
# Fix for Boost Asio < 1.70
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})
target_compile_definitions(signal_source_gr_blocks
PUBLIC
@@ -98,7 +98,7 @@ if(OS_IS_MACOSX)
endif()
endif()
if(Boost_VERSION VERSION_GREATER "106599")
if(Boost_VERSION_STRING VERSION_GREATER 1.65.99)
target_compile_definitions(signal_source_gr_blocks
PUBLIC
-DBOOST_GREATER_1_65