mirror of https://github.com/gnss-sdr/gnss-sdr
Fix building with CMake > 3, GCC 8 and old Boost version (e.g. CentOS 7 with cmake3 and gcc8)
This commit is contained in:
parent
d997f7bf56
commit
25da76d1a2
|
@ -579,6 +579,7 @@ if(NOT (GNURADIO_VERSION VERSION_LESS "3.8"))
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
# Log4cpp - http://log4cpp.sourceforge.net/
|
# Log4cpp - http://log4cpp.sourceforge.net/
|
||||||
################################################################################
|
################################################################################
|
||||||
|
@ -839,6 +840,11 @@ if(Boost_VERSION_STRING VERSION_LESS 1.70.0)
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# Fox for CentOS 7 with cmake3 and gcc8
|
||||||
|
if(Boost_VERSION_STRING VERSION_LESS "1.60")
|
||||||
|
set(USE_GENERIC_LAMBDAS OFF)
|
||||||
|
endif()
|
||||||
|
|
||||||
# Fix for Boost >= 1.73
|
# Fix for Boost >= 1.73
|
||||||
if(Boost_VERSION_STRING VERSION_GREATER 1.72.99)
|
if(Boost_VERSION_STRING VERSION_GREATER 1.72.99)
|
||||||
set(USE_BOOST_BIND_PLACEHOLDERS ON)
|
set(USE_BOOST_BIND_PLACEHOLDERS ON)
|
||||||
|
|
|
@ -111,7 +111,7 @@ GalileoE5bPcpsAcquisitionTest_msg_rx::GalileoE5bPcpsAcquisitionTest_msg_rx(Concu
|
||||||
#if HAS_GENERIC_LAMBDA
|
#if HAS_GENERIC_LAMBDA
|
||||||
[this](pmt::pmt_t&& PH1) { msg_handler_channel_events(PH1); });
|
[this](pmt::pmt_t&& PH1) { msg_handler_channel_events(PH1); });
|
||||||
#else
|
#else
|
||||||
#if BOOST_173_OR_GREATER
|
#if USE_BOOST_BIND_PLACEHOLDERS
|
||||||
boost::bind(&GalileoE5bPcpsAcquisitionTest_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1));
|
boost::bind(&GalileoE5bPcpsAcquisitionTest_msg_rx::msg_handler_channel_events, this, boost::placeholders::_1));
|
||||||
#else
|
#else
|
||||||
boost::bind(&GalileoE5bPcpsAcquisitionTest_msg_rx::msg_handler_channel_events, this, _1));
|
boost::bind(&GalileoE5bPcpsAcquisitionTest_msg_rx::msg_handler_channel_events, this, _1));
|
||||||
|
|
Loading…
Reference in New Issue