From 7118282756c375973d7367bee771b941ad75200f Mon Sep 17 00:00:00 2001 From: Andrei Malashkin Date: Tue, 31 Aug 2021 13:16:10 +0200 Subject: [PATCH] correct mac build with_vulkan=True --- recipes/qt/5.x.x/conanfile.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/recipes/qt/5.x.x/conanfile.py b/recipes/qt/5.x.x/conanfile.py index 342b3000a1357..9e7a72df69326 100644 --- a/recipes/qt/5.x.x/conanfile.py +++ b/recipes/qt/5.x.x/conanfile.py @@ -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: @@ -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":