From c4aee2a6b612be72316e4222136d88cc6e66f3e8 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Thu, 30 Jun 2022 23:26:22 +0200 Subject: [PATCH] Fixed Ultimaker-Cura spec Contributes to CURA-9365 --- Ultimaker-Cura.spec.jinja | 2 +- conanfile.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Ultimaker-Cura.spec.jinja b/Ultimaker-Cura.spec.jinja index e6ad23bd91..239b1bf8aa 100644 --- a/Ultimaker-Cura.spec.jinja +++ b/Ultimaker-Cura.spec.jinja @@ -48,7 +48,7 @@ exe = EXE( target_arch=None, codesign_identity=None, entitlements_file=None, - icon='{{ icon }}' + icon=r'{{ icon }}' ) coll = COLLECT( exe, diff --git a/conanfile.py b/conanfile.py index 5bbc3310a7..d987e255c2 100644 --- a/conanfile.py +++ b/conanfile.py @@ -170,6 +170,8 @@ class CuraConan(ConanFile): conan_binaries = [] for _, dependency in self.dependencies.host.items(): + if dependency.ref.name == "cpython": + continue for bin_paths in dependency.cpp_info.bindirs: conan_binaries.extend(Path(bin_paths).glob("**/*.dll")) conan_binaries.extend(Path(bin_paths).glob("**/*.dylib"))