mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-06-13 08:49:27 +00:00
Code Issues Releases Wiki Activity

Re-enable concepts for Boost Asio in version 1.73

Browse Source
This commit is contained in:
Carles Fernandez 2020-05-15 22:04:32 +02:00
parent dfd596fca7
commit 32e6a50b05
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -734,6 +734,7 @@ if(Boost_VERSION_STRING VERSION_GREATER 1.70.99)
endif() endif()
endif() endif()
if(Boost_VERSION_STRING VERSION_LESS 1.73)
# Disable concepts to address https://github.com/boostorg/asio/issues/312 # Disable concepts to address https://github.com/boostorg/asio/issues/312
if((CMAKE_CXX_COMPILER_ID STREQUAL GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.9) OR if((CMAKE_CXX_COMPILER_ID STREQUAL GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.9) OR
(CMAKE_CXX_COMPILER_ID MATCHES Clang)) (CMAKE_CXX_COMPILER_ID MATCHES Clang))
@ -742,6 +743,7 @@ if((CMAKE_CXX_COMPILER_ID STREQUAL GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_GR
-DBOOST_ASIO_DISABLE_CONCEPTS -DBOOST_ASIO_DISABLE_CONCEPTS
) )
endif() endif()
endif()
# Workaround for https://github.com/boostorg/format/issues/67 # Workaround for https://github.com/boostorg/format/issues/67
if(Boost_VERSION_STRING VERSION_GREATER 1.71) if(Boost_VERSION_STRING VERSION_GREATER 1.71)