Skip to content

Commit

Permalink
(#6835) [qt6] fix compilation of qt6 with_vulkan on MacOs
Browse files Browse the repository at this point in the history
* add moltenVk on MacOs, when building with_vulkan=True

* override vulkan-headers

* use latest moltenvk

* use latest vulkan and moltenvm
  • Loading branch information
AndreyMlashkin authored Sep 3, 2021
1 parent 7127e9c commit 66efdf1
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions recipes/qt/6.x.x/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,9 @@ def requirements(self):
if self.options.with_pcre2:
self.requires("pcre2/10.37")
if self.options.get_safe("with_vulkan"):
self.requires("vulkan-loader/1.2.172")

self.requires("vulkan-loader/1.2.182")
if tools.is_apple_os(self.settings.os):
self.requires("moltenvk/1.1.4")
if self.options.with_glib:
self.requires("glib/2.69.2")
if self.options.with_doubleconversion and not self.options.multiconfiguration:
Expand Down Expand Up @@ -747,6 +748,8 @@ def _create_plugin(pluginname, libname, type, requires):
gui_reqs.append("opengl::opengl")
if self.options.get_safe("with_vulkan", False):
gui_reqs.append("vulkan-loader::vulkan-loader")
if tools.is_apple_os(self.settings.os):
gui_reqs.append("moltenvk::moltenvk")
if self.options.with_harfbuzz:
gui_reqs.append("harfbuzz::harfbuzz")
if self.options.with_libjpeg == "libjpeg-turbo":
Expand Down

0 comments on commit 66efdf1

Please sign in to comment.