From 5563e609ec15cafdc568aabb4a00c772c5292d65 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 8 May 2019 19:28:53 +0200 Subject: [PATCH] Fix identification of Boost version --- src/algorithms/PVT/libs/CMakeLists.txt | 2 +- src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt | 2 +- src/algorithms/tracking/libs/CMakeLists.txt | 3 +-- src/core/monitor/CMakeLists.txt | 2 +- src/core/receiver/CMakeLists.txt | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/algorithms/PVT/libs/CMakeLists.txt b/src/algorithms/PVT/libs/CMakeLists.txt index 5248f6980..c5d72b587 100644 --- a/src/algorithms/PVT/libs/CMakeLists.txt +++ b/src/algorithms/PVT/libs/CMakeLists.txt @@ -87,7 +87,7 @@ target_include_directories(pvt_libs target_compile_definitions(pvt_libs PRIVATE -DGNSS_SDR_VERSION="${VERSION}") -if(Boost_VERSION VERSION_GREATER "1.65") +if(Boost_VERSION VERSION_GREATER "106500") target_compile_definitions(pvt_libs PUBLIC -DBOOST_GREATER_1_65 diff --git a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt index 9c6dec2c6..1f7df4995 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt @@ -85,7 +85,7 @@ if(OS_IS_MACOSX) endif() endif() -if(Boost_VERSION VERSION_GREATER "1.65") +if(Boost_VERSION VERSION_GREATER "106500") target_compile_definitions(signal_source_gr_blocks PUBLIC -DBOOST_GREATER_1_65 diff --git a/src/algorithms/tracking/libs/CMakeLists.txt b/src/algorithms/tracking/libs/CMakeLists.txt index c521ff555..062442d06 100644 --- a/src/algorithms/tracking/libs/CMakeLists.txt +++ b/src/algorithms/tracking/libs/CMakeLists.txt @@ -92,8 +92,7 @@ target_include_directories(tracking_libs PUBLIC ${OPT_TRACKING_INCLUDES} ) - -if(Boost_VERSION VERSION_GREATER "1.65") +if(Boost_VERSION VERSION_GREATER "106500") target_compile_definitions(tracking_libs PUBLIC -DBOOST_GREATER_1_65 diff --git a/src/core/monitor/CMakeLists.txt b/src/core/monitor/CMakeLists.txt index 83cf7d94c..94a1409f1 100644 --- a/src/core/monitor/CMakeLists.txt +++ b/src/core/monitor/CMakeLists.txt @@ -60,7 +60,7 @@ target_include_directories(core_monitor ) -if(Boost_VERSION VERSION_GREATER "1.65") +if(Boost_VERSION VERSION_GREATER "106500") target_compile_definitions(core_monitor PUBLIC -DBOOST_GREATER_1_65 diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt index 36b1c04f6..f233d0884 100644 --- a/src/core/receiver/CMakeLists.txt +++ b/src/core/receiver/CMakeLists.txt @@ -129,7 +129,7 @@ if(ENABLE_CUDA) target_compile_definitions(core_receiver PRIVATE -DCUDA_GPU_ACCEL=1) endif() -if(Boost_VERSION VERSION_GREATER "1.65") +if(Boost_VERSION VERSION_GREATER "106500") target_compile_definitions(core_receiver PRIVATE -DBOOST_GREATER_1_65