Merge pull request #10302 from RA-Kooi/CMakeQt
DolphinQt: Fix generation of /external:I flags
This commit is contained in:
commit
68fd94e063
|
@ -369,8 +369,15 @@ if (MSVC)
|
||||||
# Don't propogate warnings in qt headers to Dolphin
|
# Don't propogate warnings in qt headers to Dolphin
|
||||||
target_compile_options(dolphin-emu PRIVATE /experimental:external)
|
target_compile_options(dolphin-emu PRIVATE /experimental:external)
|
||||||
target_compile_options(dolphin-emu PRIVATE /external:W0)
|
target_compile_options(dolphin-emu PRIVATE /external:W0)
|
||||||
target_compile_options(dolphin-emu PRIVATE "/external:I${Qt5Gui_PRIVATE_INCLUDE_DIRS}")
|
set(qtGui "")
|
||||||
target_compile_options(dolphin-emu PRIVATE "/external:I${Qt5Widgets_PRIVATE_INCLUDE_DIRS}")
|
set(qtGuiPriv "")
|
||||||
|
set(qtWidgetsPriv "")
|
||||||
|
list(TRANSFORM Qt5Gui_INCLUDE_DIRS PREPEND "/external:I" OUTPUT_VARIABLE qtGui)
|
||||||
|
list(TRANSFORM Qt5Gui_PRIVATE_INCLUDE_DIRS PREPEND "/external:I" OUTPUT_VARIABLE qtGuiPriv)
|
||||||
|
list(TRANSFORM Qt5Widgets_PRIVATE_INCLUDE_DIRS PREPEND "/external:I" OUTPUT_VARIABLE qtWidgetsPriv)
|
||||||
|
target_compile_options(dolphin-emu PRIVATE "${qtGui}")
|
||||||
|
target_compile_options(dolphin-emu PRIVATE "${qtGuiPriv}")
|
||||||
|
target_compile_options(dolphin-emu PRIVATE "${qtWidgets}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
|
|
Loading…
Reference in New Issue