summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodrigo Locatti <reinuseslisp@airmail.cc>2020-07-13 00:39:09 +0200
committerGitHub <noreply@github.com>2020-07-13 00:39:09 +0200
commitf1d8c83e1c3972a3500bc912b2217e81ddc08e13 (patch)
tree2043190f2c733a19915986428fd530bd65f74b05
parentMerge pull request #4317 from lioncash/boost (diff)
parentCMakeLists: Enable usage of C++20 on Linux (diff)
downloadyuzu-f1d8c83e1c3972a3500bc912b2217e81ddc08e13.tar
yuzu-f1d8c83e1c3972a3500bc912b2217e81ddc08e13.tar.gz
yuzu-f1d8c83e1c3972a3500bc912b2217e81ddc08e13.tar.bz2
yuzu-f1d8c83e1c3972a3500bc912b2217e81ddc08e13.tar.lz
yuzu-f1d8c83e1c3972a3500bc912b2217e81ddc08e13.tar.xz
yuzu-f1d8c83e1c3972a3500bc912b2217e81ddc08e13.tar.zst
yuzu-f1d8c83e1c3972a3500bc912b2217e81ddc08e13.zip
-rw-r--r--CMakeLists.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99476c55f..a5357335f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,15 +118,15 @@ message(STATUS "Target architecture: ${ARCHITECTURE}")
# Configure C++ standard
# ===========================
+# boost asio's concept usage doesn't play nicely with some compilers yet.
+add_definitions(-DBOOST_ASIO_DISABLE_CONCEPTS)
if (MSVC)
add_compile_options(/std:c++latest)
# cubeb and boost still make use of 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()
- set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
endif()