Mirror/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2024-11-28 02:14:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Port yuzu-emu/yuzu#4290 and yuzu-emu/yuzu#4318: Changes for C++20 support (#5459)

Browse source 
Co-authored-by: Lioncash <mathew1800@gmail.com>
This commit is contained in:
Tobias 2022-11-06 03:35:20 +01:00 committed by GitHub
parent 3201943423
commit 92ad651890
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
CMakeLists.txt
View file

@ -1,11 +1,10 @@
# CMake 3.12 required for 20 to be a valid value for CXX_STANDARD # CMake 3.12 required for 20 to be a valid value for CXX_STANDARD
cmake_minimum_required(VERSION 3.12) cmake_minimum_required(VERSION 3.15)
if (${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.15)
# Don't override the warning flags in MSVC: # Don't override the warning flags in MSVC:
cmake_policy(SET CMP0092 NEW) cmake_policy(SET CMP0092 NEW)
# Enforce new LTO setting # Enforce new LTO setting
cmake_policy(SET CMP0069 NEW) cmake_policy(SET CMP0069 NEW)
endif()
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules")
@ -158,6 +157,8 @@ 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)
set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)