Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorj.spijker@ultimaker.com <jelle spijker>2022-07-01 00:26:22 +0300
committerJelle Spijker <j.spijker@ultimaker.com>2022-07-01 00:26:22 +0300
commitc4aee2a6b612be72316e4222136d88cc6e66f3e8 (patch)
tree82a2b1961023d4da44ff782ef914db478b38000d
parent21e69a8c673ff2317c6283b68de344919e80c694 (diff)
Fixed Ultimaker-Cura spec
Contributes to CURA-9365
-rw-r--r--Ultimaker-Cura.spec.jinja2
-rw-r--r--conanfile.py2
2 files changed, 3 insertions, 1 deletions
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"))