From ccea542280a341f6e78941cea5846f725a5d51fd Mon Sep 17 00:00:00 2001
From: Joey de l'Arago <joeydelarago@gmail.com>
Date: Tue, 4 Oct 2022 14:40:13 +0200
Subject: [PATCH] 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
---
 conandata.yml | 5 +++++
 conanfile.py  | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/conandata.yml b/conandata.yml
index daceec0349..aca3d52105 100644
--- a/conandata.yml
+++ b/conandata.yml
@@ -87,6 +87,11 @@
                 src: "bin"
                 dst: "."
                 binary: "CuraEngine"
+            spdlog:
+                package: "spdlog"
+                src: "lib"
+                dst: "."
+                binary: "libspdlog"
         hiddenimports:
             - "pySavitar"
             - "pyArcus"
diff --git a/conanfile.py b/conanfile.py
index c032d6d83f..4334db0a9e 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -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"]))