diff options
| author | Léo Lam <leo@leolam.fr> | 2021-03-04 12:12:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-04 12:12:06 +0100 |
| commit | 9c6c77351fedb60d44bb09e241eb33a9823eb3d4 (patch) | |
| tree | 48067028f6220e891e7e7a5d827057386ba0fe34 /Source | |
| parent | 00db622d5048eaffe1cc5af85f5ac821f44bcbb5 (diff) | |
| parent | 0cb71d3f47bc1e87048a91e7a421bb0296fa3536 (diff) | |
Merge pull request #9556 from JosJuice/cmake-msvc-latest
CMake: Build with -std:c++latest for MSVC
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | Source/Core/DolphinQt/CMakeLists.txt | 9 |
2 files changed, 14 insertions, 3 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 61b3695cfe..3f0afcaf34 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -16,7 +16,13 @@ if(CMAKE_SYSTEM_NAME MATCHES "Windows") add_definitions(-D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING) endif() -set(CMAKE_CXX_STANDARD 17) +if (MSVC) + set(CMAKE_CXX_STANDARD 20) + set(CMAKE_CXX20_STANDARD_COMPILE_OPTION "-std:c++latest") +else() + set(CMAKE_CXX_STANDARD 17) +endif() + set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt index 2cb3397e33..ad248b320d 100644 --- a/Source/Core/DolphinQt/CMakeLists.txt +++ b/Source/Core/DolphinQt/CMakeLists.txt @@ -347,6 +347,13 @@ if (WIN32) ) endif() +if (MSVC) + # Disable some warnings + + # 5054: operator '+': deprecated between enumerations of different types (in Qt headers) + target_compile_options(dolphin-emu PRIVATE /wd5054) +endif() + if(WIN32) target_sources(dolphin-emu PRIVATE DolphinQt.manifest DolphinQt.rc) @@ -356,8 +363,6 @@ if(WIN32) WIN32_EXECUTABLE TRUE ) - target_compile_options(dolphin-emu PRIVATE "-D_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING") - # Copy Sys dir add_custom_command(TARGET dolphin-emu POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/Data/Sys" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Sys" |