ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
JosJuice 2021-03-04 09:29:30 +01:00
parent 1c3f594087
commit 0cb71d3f47
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/DolphinQt/CMakeLists.txt
View File

@ -347,6 +347,13 @@ if (WIN32)
) )
endif() 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) if(WIN32)
target_sources(dolphin-emu PRIVATE DolphinQt.manifest DolphinQt.rc) target_sources(dolphin-emu PRIVATE DolphinQt.manifest DolphinQt.rc)
@ -356,8 +363,6 @@ if(WIN32)
WIN32_EXECUTABLE TRUE WIN32_EXECUTABLE TRUE
) )
target_compile_options(dolphin-emu PRIVATE "-D_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING")
# Copy Sys dir # Copy Sys dir
add_custom_command(TARGET dolphin-emu POST_BUILD add_custom_command(TARGET dolphin-emu POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/Data/Sys" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Sys" COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/Data/Sys" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Sys"