Merge pull request #10302 from RA-Kooi/CMakeQt

DolphinQt: Fix generation of /external:I flags
dolphin-emu · Dec 28, 2021 · 68fd94e · 68fd94e
2 parents 3b5a612 + d6c9831
commit 68fd94e
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt
@@ -369,8 +369,15 @@ if (MSVC)
   # Don't propogate warnings in qt headers to Dolphin
   target_compile_options(dolphin-emu PRIVATE /experimental:external)
   target_compile_options(dolphin-emu PRIVATE /external:W0)
-  target_compile_options(dolphin-emu PRIVATE "/external:I${Qt5Gui_PRIVATE_INCLUDE_DIRS}")
-  target_compile_options(dolphin-emu PRIVATE "/external:I${Qt5Widgets_PRIVATE_INCLUDE_DIRS}")
+  set(qtGui "")
+  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()
 
 if(WIN32)