From ce1b454527efe36b216a8a98645bd0fc9fc2feda Mon Sep 17 00:00:00 2001 From: wboussafa Date: Wed, 6 Jul 2022 13:48:55 +0100 Subject: [PATCH] dont require non needed deps when multiconfiguration is set to True --- recipes/qt/5.x.x/conanfile.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes/qt/5.x.x/conanfile.py b/recipes/qt/5.x.x/conanfile.py index 2ef6dfb93b5d07..5096bb6ae1c707 100644 --- a/recipes/qt/5.x.x/conanfile.py +++ b/recipes/qt/5.x.x/conanfile.py @@ -351,24 +351,24 @@ def requirements(self): self.requires("glib/2.72.0") # if self.options.with_libiconv: # QTBUG-84708 # self.requires("libiconv/1.16")# QTBUG-84708 - if self.options.with_doubleconversion: + if self.options.with_doubleconversion and not self.options.multiconfiguration: self.requires("double-conversion/3.2.0") - if self.options.get_safe("with_freetype", False): + if self.options.get_safe("with_freetype", False) and not self.options.multiconfiguration: self.requires("freetype/2.11.1") if self.options.get_safe("with_fontconfig", False): self.requires("fontconfig/2.13.93") if self.options.get_safe("with_icu", False): self.requires("icu/71.1") - if self.options.get_safe("with_harfbuzz", False): + if self.options.get_safe("with_harfbuzz", False) and not self.options.multiconfiguration: self.requires("harfbuzz/4.2.0") - if self.options.get_safe("with_libjpeg", False): + if self.options.get_safe("with_libjpeg", False) and not self.options.multiconfiguration: if self.options.with_libjpeg == "libjpeg-turbo": self.requires("libjpeg-turbo/2.1.2") else: self.requires("libjpeg/9d") - if self.options.get_safe("with_libpng", False): + if self.options.get_safe("with_libpng", False) and not self.options.multiconfiguration: self.requires("libpng/1.6.37") - if self.options.with_sqlite3: + if self.options.with_sqlite3 and not self.options.multiconfiguration: self.requires("sqlite3/3.38.1") self.options["sqlite3"].enable_column_metadata = True if self.options.get_safe("with_mysql", False):