From ac84b9f273aabeba961fcf9e39228b6ad995413c Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 20 Feb 2023 15:47:06 +0200 Subject: [PATCH] Use conanfile.txt to control package options. --- conanfile.txt | 6 ++++++ valentina.qbs | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conanfile.txt b/conanfile.txt index df6ca348b..4abaebf03 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,2 +1,8 @@ [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 f74a9cd49..7ac80c7f3 100644 --- a/valentina.qbs +++ b/valentina.qbs @@ -10,12 +10,6 @@ Project { id: thirdPartyConanPackages condition: enableConan conanfilePath: project.sourceDirectory + "/conanfile.txt" - options: { - if (qbs.targetOS.contains("unix") && !qbs.targetOS.contains("macos")) - return ({"xerces-c:shared": "False"}); - - return ({"xerces-c:shared": "True"}); - } } references: [