Skip to content

Commit

Permalink
correct mac build with_vulkan=True
Browse files Browse the repository at this point in the history
  • Loading branch information
AndreyMlashkin committed Aug 31, 2021
1 parent 23e7843 commit 7118282
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions recipes/qt/5.x.x/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -300,10 +300,11 @@ 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.68.3")
self.requires("glib/2.69.2")
# if self.options.with_libiconv: # QTBUG-84708
# self.requires("libiconv/1.16")# QTBUG-84708
if self.options.with_doubleconversion and not self.options.multiconfiguration:
Expand Down Expand Up @@ -868,6 +869,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 7118282

Please sign in to comment.