Skip to content

Commit

Permalink
Qt6: make d3d12 conditional on Qt version
Browse files Browse the repository at this point in the history
d3d12.dll was added with Windows 10. Don't want to potentially limit the range of supported OS versions unnecessarily.
  • Loading branch information
valgur committed Jan 20, 2024
1 parent 368e279 commit ad656af
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion recipes/qt/6.x.x/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -1039,7 +1039,9 @@ def _create_plugin(pluginname, libname, plugintype, requires):

if self.settings.os == "Windows":
self.cpp_info.components["qtGui"].system_libs = ["advapi32", "gdi32", "ole32", "shell32", "user32", "d3d11",
"dxgi", "dxguid", "d2d1", "dwrite", "d3d9", "setupapi", "SHCore", "d3d12"]
"dxgi", "dxguid", "d2d1", "dwrite", "d3d9", "setupapi", "SHCore"]
if Version(self.version) >= "6.6.0":
self.cpp_info.components["qtGui"].system_libs.append("d3d12")
if self.settings.compiler == "gcc":
self.cpp_info.components["qtGui"].system_libs.append("uuid")
_create_plugin("QWindowsIntegrationPlugin", "qwindows", "platforms", ["Core", "Gui"])
Expand Down

0 comments on commit ad656af

Please sign in to comment.