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

Update minimum Boost version to 1.54

Browse Source
This commit is contained in:
Carles Fernandez
2019-02-05 00:01:04 +01:00
parent ce83462f85
commit f509ebe49c
11 changed files with 13 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@@ -329,7 +329,7 @@ set(GNSSSDR_GCC_MIN_VERSION "4.7.2")
set(GNSSSDR_CLANG_MIN_VERSION "3.4.0")
set(GNSSSDR_APPLECLANG_MIN_VERSION "500")
set(GNSSSDR_GNURADIO_MIN_VERSION "3.7.3")
set(GNSSSDR_BOOST_MIN_VERSION "1.45")
set(GNSSSDR_BOOST_MIN_VERSION "1.54")
set(GNSSSDR_PYTHON_MIN_VERSION "2.7")
set(GNSSSDR_PYTHON3_MIN_VERSION "3.4")
set(GNSSSDR_MAKO_MIN_VERSION "0.4.2")
@@ -490,8 +490,7 @@ if(UNIX AND EXISTS "/usr/lib64")
list(APPEND BOOST_LIBRARYDIR "/usr/lib64") # Fedora 64-bit fix
endif()
set(Boost_ADDITIONAL_VERSIONS
"1.45.0" "1.45" "1.46.0" "1.46" "1.48.0" "1.48" "1.49.0" "1.49"
"1.50.0" "1.50" "1.51.0" "1.51" "1.53.0" "1.53" "1.54.0" "1.54"
"1.54.0" "1.54"
"1.55.0" "1.55" "1.56.0" "1.56" "1.57.0" "1.57" "1.58.0" "1.58" "1.59.0" "1.59"
"1.60.0" "1.60" "1.61.0" "1.61" "1.62.0" "1.62" "1.63.0" "1.63" "1.64.0" "1.64"
"1.65.0" "1.65" "1.66.0" "1.66" "1.67.0" "1.67" "1.68.0" "1.68" "1.69.0" "1.69"
@@ -501,7 +500,7 @@ set(Boost_ADDITIONAL_VERSIONS
)
set(Boost_USE_MULTITHREAD ON)
set(Boost_USE_STATIC_LIBS OFF)
find_package(Boost COMPONENTS date_time system filesystem thread serialization chrono atomic REQUIRED)
find_package(Boost COMPONENTS atomic chrono date_time filesystem serialization system thread REQUIRED)
if(NOT Boost_FOUND)
message(FATAL_ERROR "Fatal error: Boost (version >=${GNSSSDR_BOOST_MIN_VERSION}) required.")
endif()

2
src/algorithms/PVT/adapters/CMakeLists.txt
View File

@@ -42,7 +42,7 @@ target_link_libraries(pvt_adapters
)
if(Boost_VERSION LESS 105800)
target_compile_definitions(pvt_adapters PUBLIC -DOLD_BOOST=1)
target_compile_definitions(pvt_adapters PRIVATE -DOLD_BOOST=1)
endif()
set_property(TARGET pvt_adapters

2
src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
View File

@@ -49,7 +49,7 @@ target_include_directories(pvt_gr_blocks
)
if(Boost_VERSION LESS 105800)
target_compile_definitions(pvt_gr_blocks PUBLIC -DOLD_BOOST=1)
target_compile_definitions(pvt_gr_blocks PRIVATE -DOLD_BOOST=1)
endif()
set_property(TARGET pvt_gr_blocks

4
src/core/receiver/CMakeLists.txt
View File

@@ -80,10 +80,6 @@ if(ENABLE_RAW_UDP)
target_compile_definitions(gnss_rx PRIVATE -DRAW_UDP=1)
endif()
if(Boost_VERSION LESS 105000)
target_compile_definitions(gnss_rx PRIVATE -DOLD_BOOST=1)
endif()
if(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.3)
target_compile_definitions(gnss_rx PRIVATE -DMODERN_GNURADIO=1)
endif()

9
src/core/receiver/control_thread.cc
View File

@@ -276,17 +276,10 @@ int ControlThread::run()
stop_ = true;
flowgraph_->disconnect();
// Join keyboard thread
#ifdef OLD_BOOST
keyboard_thread_.timed_join(boost::posix_time::seconds(1));
sysv_queue_thread_.timed_join(boost::posix_time::seconds(1));
cmd_interface_thread_.timed_join(boost::posix_time::seconds(1));
#endif
#ifndef OLD_BOOST
// Join keyboard thread
keyboard_thread_.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(1000));
sysv_queue_thread_.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(1000));
cmd_interface_thread_.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(1000));
#endif
LOG(INFO) << "Flowgraph stopped";

3
src/tests/CMakeLists.txt
View File

@@ -133,9 +133,6 @@ if(ENABLE_GPERFTOOLS)
endif()
endif()
if(Boost_VERSION LESS 105000)
add_definitions(-DOLD_BOOST=1)
endif()
if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
add_definitions(-DGR_GREATER_38=1)

5
src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc
View File

@@ -636,12 +636,7 @@ int AcquisitionPerformanceTest::run_receiver()
top_block->run(); // Start threads and wait
#ifdef OLD_BOOST
ch_thread.timed_join(boost::posix_time::seconds(1));
#endif
#ifndef OLD_BOOST
ch_thread.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(50));
#endif
return 0;
}

8
src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc
View File

@@ -551,16 +551,10 @@ TEST_F(GalileoE1PcpsCccwsrAmbiguousAcquisitionTest, ValidationOfResults)
{
EXPECT_EQ(2, message) << "Acquisition failure. Expected message: 2=ACQ FAIL.";
}
#ifdef OLD_BOOST
ASSERT_NO_THROW({
ch_thread.timed_join(boost::posix_time::seconds(1));
}) << "Failure while waiting the queue to stop";
#endif
#ifndef OLD_BOOST
ASSERT_NO_THROW({
ch_thread.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(50));
}) << "Failure while waiting the queue to stop";
#endif
}
}

17
src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc
View File

@@ -553,16 +553,10 @@ TEST_F(GlonassL1CaPcpsAcquisitionGSoC2017Test, ValidationOfResults)
{
EXPECT_EQ(2, message) << "Acquisition failure. Expected message: 2=ACQ FAIL.";
}
#ifdef OLD_BOOST
ASSERT_NO_THROW({
ch_thread.timed_join(boost::posix_time::seconds(1));
}) << "Failure while waiting the queue to stop.";
#endif
#ifndef OLD_BOOST
ASSERT_NO_THROW({
ch_thread.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(50));
}) << "Failure while waiting the queue to stop";
#endif
}
delete acquisition;
@@ -649,18 +643,11 @@ TEST_F(GlonassL1CaPcpsAcquisitionGSoC2017Test, ValidationOfResultsProbabilities)
std::cout << "Estimated probability of false alarm (satellite absent) = " << Pfa_a << std::endl;
std::cout << "Mean acq time = " << mean_acq_time_us << " microseconds." << std::endl;
}
#ifdef OLD_BOOST
ASSERT_NO_THROW({
ch_thread.timed_join(boost::posix_time::seconds(1));
}) << "Failure while waiting the queue to stop"
<< std::endl;
#endif
#ifndef OLD_BOOST
ASSERT_NO_THROW({
ch_thread.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(50));
}) << "Failure while waiting the queue to stop"
<< std::endl;
#endif
}
delete acquisition;

16
src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l2_ca_pcps_acquisition_test.cc
View File

@@ -549,16 +549,10 @@ TEST_F(GlonassL2CaPcpsAcquisitionTest, ValidationOfResults)
{
EXPECT_EQ(2, message) << "Acquisition failure. Expected message: 2=ACQ FAIL.";
}
#ifdef OLD_BOOST
ASSERT_NO_THROW({
ch_thread.timed_join(boost::posix_time::seconds(1));
}) << "Failure while waiting the queue to stop.";
#endif
#ifndef OLD_BOOST
ASSERT_NO_THROW({
ch_thread.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(50));
}) << "Failure while waiting the queue to stop";
#endif
}
delete acquisition;
@@ -645,16 +639,10 @@ TEST_F(GlonassL2CaPcpsAcquisitionTest, ValidationOfResultsProbabilities)
std::cout << "Estimated probability of false alarm (satellite absent) = " << Pfa_a << std::endl;
std::cout << "Mean acq time = " << mean_acq_time_us << " microseconds." << std::endl;
}
#ifdef OLD_BOOST
ASSERT_NO_THROW({
ch_thread.timed_join(boost::posix_time::seconds(1));
}) << "Failure while waiting the queue to stop";
#endif
#ifndef OLD_BOOST
ASSERT_NO_THROW({
ch_thread.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(50));
}) << "Failure while waiting the queue to stop";
#endif
}
delete acquisition;

16
src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc
View File

@@ -546,16 +546,10 @@ TEST_F(GpsL1CaPcpsAcquisitionGSoC2013Test, ValidationOfResults)
{
EXPECT_EQ(2, message) << "Acquisition failure. Expected message: 2=ACQ FAIL.";
}
#ifdef OLD_BOOST
ASSERT_NO_THROW({
ch_thread.timed_join(boost::posix_time::seconds(1));
}) << "Failure while waiting the queue to stop";
#endif
#ifndef OLD_BOOST
ASSERT_NO_THROW({
ch_thread.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(50));
}) << "Failure while waiting the queue to stop";
#endif
}
delete acquisition;
@@ -642,16 +636,10 @@ TEST_F(GpsL1CaPcpsAcquisitionGSoC2013Test, ValidationOfResultsProbabilities)
std::cout << "Estimated probability of false alarm (satellite absent) = " << Pfa_a << std::endl;
std::cout << "Mean acq time = " << mean_acq_time_us << " microseconds." << std::endl;
}
#ifdef OLD_BOOST
ASSERT_NO_THROW({
ch_thread.timed_join(boost::posix_time::seconds(1));
}) << "Failure while waiting the queue to stop";
#endif
#ifndef OLD_BOOST
ASSERT_NO_THROW({
ch_thread.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(50));
}) << "Failure while waiting the queue to stop";
#endif
}
delete acquisition;