From ad65ffa76c1197ef81bc9d8df9332400b0639868 Mon Sep 17 00:00:00 2001 From: jelle Spijker Date: Wed, 5 Oct 2022 10:56:53 +0200 Subject: [PATCH] Fix check if option exist Contributes to CURA-9711 --- conanfile.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index f5c9fcd65f..47ca0354e3 100644 --- a/conanfile.py +++ b/conanfile.py @@ -7,7 +7,7 @@ from conan import ConanFile from conan.tools.files import copy, rmdir, save from conan.tools.env import VirtualRunEnv, Environment from conan.tools.scm import Version -from conan.errors import ConanInvalidConfiguration +from conan.errors import ConanInvalidConfiguration, ConanException required_conan_version = ">=1.50.0" @@ -218,7 +218,11 @@ class CuraConan(ConanFile): # Make sure all Conan dependencies which are shared are added to the binary list for pyinstaller for _, dependency in self.dependencies.host.items(): - if hasattr(dependency.options, "shared") and dependency.options.shared: + try: + is_shared = dependency.options.shared + except ConanException: + is_shared = False + if is_shared: for bin_paths in dependency.cpp_info.bindirs: binaries.extend([(f"{p}", ".") for p in Path(bin_paths).glob("**/*")]) for lib_paths in dependency.cpp_info.libdirs: