diff options
| author | JosJuice <josjuice@gmail.com> | 2021-03-04 09:29:30 +0100 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2021-03-04 09:29:30 +0100 |
| commit | 0cb71d3f47bc1e87048a91e7a421bb0296fa3536 (patch) | |
| tree | 9452ba9f16da5dcd7174602f8cb8ac7ab64d7a4c /Source/Core | |
| parent | 1c3f594087a54966b525ecb6a73031a05608632b (diff) | |
CMake: Disable warning C5054 on DolphinQt
Same as 33c0abd.
Also removing -D_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING
to match MSBuild. Qt is no longer triggering that warning.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinQt/CMakeLists.txt | 9 |
1 files changed, 7 insertions, 2 deletions
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" |