diff --git a/conanfile.py b/conanfile.py index c8b57dbd8..ef314487b 100644 --- a/conanfile.py +++ b/conanfile.py @@ -1,3 +1,5 @@ +import os + from conans import ConanFile class Recipe(ConanFile): @@ -7,4 +9,7 @@ class Recipe(ConanFile): def configure(self): if self.settings.os == "Linux": - self.options["xerces-c"].shared = False + self.options["xerces-c"].shared = False + + if self.settings.os == "Macos" and "MACOS_DEPLOYMENT_TARGET" in os.environ: + self.settings.os.version = os.environ["MACOS_DEPLOYMENT_TARGET"] diff --git a/valentina.qbs b/valentina.qbs index 2e58d19e6..03a36f94e 100644 --- a/valentina.qbs +++ b/valentina.qbs @@ -12,11 +12,6 @@ Project { condition: enableConan conanfilePath: project.sourceDirectory + "/conanfile.py" verbose: true - settings: { - if (qbs.targetOS.contains("macos") && project.minimumMacosVersion !== undefined) - return ({"os.version": project.minimumMacosVersion}); - return undefined; - } } references: [