From 5203caf27f968b73f29f9901edfe99a3679f059c Mon Sep 17 00:00:00 2001 From: Paul Harris Date: Thu, 9 Feb 2023 15:20:00 +0800 Subject: [PATCH 1/2] qt: don't use cmake 3.25.0, due to Ninja dependency cycle bug --- recipes/qt/6.x.x/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/qt/6.x.x/conanfile.py b/recipes/qt/6.x.x/conanfile.py index 439be2678870f..86674085fc6e2 100644 --- a/recipes/qt/6.x.x/conanfile.py +++ b/recipes/qt/6.x.x/conanfile.py @@ -433,7 +433,7 @@ def requirements(self): self.requires("md4c/0.4.8") def build_requirements(self): - self.tool_requires("cmake/3.25.0") + self.tool_requires("cmake/3.25.2") self.tool_requires("ninja/1.11.1") self.tool_requires("pkgconf/1.9.3") if self.settings.os == "Windows": From f09dd3a69a41ab53c94ecd59afdc092aa2df4929 Mon Sep 17 00:00:00 2001 From: Paul Harris Date: Fri, 10 Feb 2023 09:35:52 +0800 Subject: [PATCH 2/2] Update recipes/qt/6.x.x/conanfile.py Co-authored-by: SpaceIm <30052553+SpaceIm@users.noreply.github.com> --- recipes/qt/6.x.x/conanfile.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/qt/6.x.x/conanfile.py b/recipes/qt/6.x.x/conanfile.py index 86674085fc6e2..9e368533d2047 100644 --- a/recipes/qt/6.x.x/conanfile.py +++ b/recipes/qt/6.x.x/conanfile.py @@ -435,7 +435,8 @@ def requirements(self): def build_requirements(self): self.tool_requires("cmake/3.25.2") self.tool_requires("ninja/1.11.1") - self.tool_requires("pkgconf/1.9.3") + if not self.conf.get("tools.gnu:pkg_config", check_type=str): + self.tool_requires("pkgconf/1.9.3") if self.settings.os == "Windows": self.tool_requires('strawberryperl/5.32.1.1')