Add spdlog to binaries list.

Add warning for missing binary

Update pattern matching for binaries glob in bin paths. It will now match .so.X files that it would not before.

CURA-9711
This commit is contained in:
Joey de l'Arago 2022-10-04 14:40:13 +02:00
parent d0ddb5fafe
commit ccea542280
2 changed files with 8 additions and 1 deletions

View file

@ -87,6 +87,11 @@
src: "bin"
dst: "."
binary: "CuraEngine"
spdlog:
package: "spdlog"
src: "lib"
dst: "."
binary: "libspdlog"
hiddenimports:
- "pySavitar"
- "pyArcus"

View file

@ -208,8 +208,10 @@ class CuraConan(ConanFile):
else:
continue
if not src_path.exists():
self.output.warning(f"Source path for binary {binary['binary']} does not exist")
continue
for bin in src_path.glob(binary["binary"] + ".*[exe|dll|so|dylib]"):
for bin in src_path.glob(binary["binary"] + "*[.exe|.dll|.so|.dylib|.so.]*"):
binaries.append((str(bin), binary["dst"]))
for bin in src_path.glob(binary["binary"]):
binaries.append((str(bin), binary["dst"]))