Merge pull request #4318 from lioncash/cpp20

CMakeLists: Enable usage of C++20 on Linux
This commit is contained in:
Rodrigo Locatti 2020-07-12 19:39:09 -03:00 committed by GitHub
commit f1d8c83e1c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -118,15 +118,15 @@ message(STATUS "Target architecture: ${ARCHITECTURE}")
# Configure C++ standard # Configure C++ standard
# =========================== # ===========================
# boost asio's concept usage doesn't play nicely with some compilers yet.
add_definitions(-DBOOST_ASIO_DISABLE_CONCEPTS)
if (MSVC) if (MSVC)
add_compile_options(/std:c++latest) add_compile_options(/std:c++latest)
# cubeb and boost still make use of deprecated result_of. # cubeb and boost still make use of deprecated result_of.
add_definitions(-D_HAS_DEPRECATED_RESULT_OF) add_definitions(-D_HAS_DEPRECATED_RESULT_OF)
# boost asio's concept usage doesn't play nicely with MSVC yet.
add_definitions(-DBOOST_ASIO_DISABLE_CONCEPTS)
else() else()
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
endif() endif()