mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-12-15 12:40:35 +00:00
Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into next
This commit is contained in:
commit
1033bb550a
@ -87,7 +87,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 "106500")
|
if(Boost_VERSION VERSION_GREATER "106599")
|
||||||
target_compile_definitions(pvt_libs
|
target_compile_definitions(pvt_libs
|
||||||
PUBLIC
|
PUBLIC
|
||||||
-DBOOST_GREATER_1_65
|
-DBOOST_GREATER_1_65
|
||||||
|
@ -85,7 +85,7 @@ if(OS_IS_MACOSX)
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(Boost_VERSION VERSION_GREATER "106500")
|
if(Boost_VERSION VERSION_GREATER "106599")
|
||||||
target_compile_definitions(signal_source_gr_blocks
|
target_compile_definitions(signal_source_gr_blocks
|
||||||
PUBLIC
|
PUBLIC
|
||||||
-DBOOST_GREATER_1_65
|
-DBOOST_GREATER_1_65
|
||||||
|
@ -93,7 +93,7 @@ target_include_directories(tracking_libs
|
|||||||
${OPT_TRACKING_INCLUDES}
|
${OPT_TRACKING_INCLUDES}
|
||||||
)
|
)
|
||||||
|
|
||||||
if(Boost_VERSION VERSION_GREATER "106500")
|
if(Boost_VERSION VERSION_GREATER "106599")
|
||||||
target_compile_definitions(tracking_libs
|
target_compile_definitions(tracking_libs
|
||||||
PUBLIC
|
PUBLIC
|
||||||
-DBOOST_GREATER_1_65
|
-DBOOST_GREATER_1_65
|
||||||
|
@ -60,7 +60,7 @@ target_include_directories(core_monitor
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
if(Boost_VERSION VERSION_GREATER "106500")
|
if(Boost_VERSION VERSION_GREATER "106599")
|
||||||
target_compile_definitions(core_monitor
|
target_compile_definitions(core_monitor
|
||||||
PUBLIC
|
PUBLIC
|
||||||
-DBOOST_GREATER_1_65
|
-DBOOST_GREATER_1_65
|
||||||
|
@ -129,7 +129,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 "106500")
|
if(Boost_VERSION VERSION_GREATER "106599")
|
||||||
target_compile_definitions(core_receiver
|
target_compile_definitions(core_receiver
|
||||||
PRIVATE
|
PRIVATE
|
||||||
-DBOOST_GREATER_1_65
|
-DBOOST_GREATER_1_65
|
||||||
|
Loading…
Reference in New Issue
Block a user