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 06:12:57 +0300
committerJelle Spijker <j.spijker@ultimaker.com>2022-07-01 06:25:25 +0300
commitcc8f0d30014be9650e79675e2f92dd286dbe19e4 (patch)
tree6e056e18f62e4350e5c61a3d078897536b1462d0 /conanfile.py
parente570e3bec64770c2fb30b6a87bfa92388e04d39c (diff)
Add conan binaries to binaries
Contributes to CURA-9365
Diffstat (limited to 'conanfile.py')
-rw-r--r--conanfile.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/conanfile.py b/conanfile.py
index 80917e504e..38228aeddc 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -168,14 +168,13 @@ class CuraConan(ConanFile):
for bin in src_path.glob(binary["binary"]):
binaries.append((str(bin), binary["dst"]))
- 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([(f"{p}", ".") for p in Path(bin_paths).glob("**/*.dll")])
- conan_binaries.extend([(f"{p}", ".") for p in Path(bin_paths).glob("**/*.dylib")])
- conan_binaries.extend([(f"{p}", ".") for p in Path(bin_paths).glob("**/*.so")])
+ binaries.extend([(f"{p}", ".") for p in Path(bin_paths).glob("**/*.dll")])
+ binaries.extend([(f"{p}", ".") for p in Path(bin_paths).glob("**/*.dylib")])
+ binaries.extend([(f"{p}", ".") for p in Path(bin_paths).glob("**/*.so")])
with open(Path(__file__).parent.joinpath("Ultimaker-Cura.spec.jinja"), "r") as f:
pyinstaller = Template(f.read())
@@ -186,7 +185,6 @@ class CuraConan(ConanFile):
entrypoint = entrypoint_location,
datas = datas,
binaries = binaries,
- conan_binaries = conan_binaries,
hiddenimports = pyinstaller_metadata["hiddenimports"],
collect_all = pyinstaller_metadata["collect_all"],
icon = icon_path