3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-14 10:17:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Don't check for shared

Browse source 
Contributes to CURA-9711
This commit is contained in:
jelle Spijker 2022-10-05 11:08:53 +02:00 • committed by jspijker
parent ad65ffa76c
commit e2cf889f7f
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
conanfile.py
View file

@ -218,15 +218,10 @@ class CuraConan(ConanFile):
# Make sure all Conan dependencies which are shared are added to the binary list for pyinstaller # Make sure all Conan dependencies which are shared are added to the binary list for pyinstaller
for _, dependency in self.dependencies.host.items(): for _, dependency in self.dependencies.host.items():
try: for bin_paths in dependency.cpp_info.bindirs:
is_shared = dependency.options.shared binaries.extend([(f"{p}", ".") for p in Path(bin_paths).glob("**/*")])
except ConanException: for lib_paths in dependency.cpp_info.libdirs:
is_shared = False binaries.extend([(f"{p}", ".") for p in Path(lib_paths).glob("**/*")])
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:
binaries.extend([(f"{p}", ".") for p in Path(lib_paths).glob("**/*")])
# Copy dynamic libs from lib path # Copy dynamic libs from lib path
binaries.extend([(f"{p}", ".") for p in Path(self._base_dir.joinpath("lib")).glob("**/*.dylib*")]) binaries.extend([(f"{p}", ".") for p in Path(self._base_dir.joinpath("lib")).glob("**/*.dylib*")])