From f3899ac07239c077d9a31d6b298510bb2f0e46a1 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 20 Feb 2023 16:40:38 +0200 Subject: [PATCH] Switch to conanfile.py. --- conanfile.py | 10 ++++++++++ conanfile.txt | 8 -------- valentina.qbs | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 conanfile.py delete mode 100644 conanfile.txt diff --git a/conanfile.py b/conanfile.py new file mode 100644 index 000000000..c8b57dbd8 --- /dev/null +++ b/conanfile.py @@ -0,0 +1,10 @@ +from conans import ConanFile + +class Recipe(ConanFile): + settings = "os" + requires = "xerces-c/[>=3.2,<4.0]" + default_options = {"xerces-c:shared": True} + + def configure(self): + if self.settings.os == "Linux": + self.options["xerces-c"].shared = False diff --git a/conanfile.txt b/conanfile.txt deleted file mode 100644 index 6811d5e52..000000000 --- a/conanfile.txt +++ /dev/null @@ -1,8 +0,0 @@ -[requires] -xerces-c/[>=3.2,<4.0] - -[options] -xerces-c:shared=True - -[options.linux.xerces-c] -shared=False diff --git a/valentina.qbs b/valentina.qbs index cc021d7f4..9790a75d5 100644 --- a/valentina.qbs +++ b/valentina.qbs @@ -10,7 +10,7 @@ Project { Probes.ConanfileProbe { id: thirdPartyConanPackages condition: enableConan - conanfilePath: project.sourceDirectory + "/conanfile.txt" + conanfilePath: project.sourceDirectory + "/conanfile.py" settings: { if (qbs.targetOS.contains("macos") && project.minimumMacosVersion !== undefined) return ({"os.version": project.minimumMacosVersion});