From c2721abf87e0bce61c7baf2bd992981eda3ec42e Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Mon, 27 Mar 2023 11:24:24 +0200 Subject: [PATCH] use copy_deps for copying curaengine conf doesn't work as expected in Conan<2.0 Contributes to CURA-10317 --- conanfile.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index 7995a9be63..619d00b39b 100644 --- a/conanfile.py +++ b/conanfile.py @@ -362,8 +362,11 @@ class CuraConan(ConanFile): def deploy(self): # Copy CuraEngine.exe to bindirs of Virtual Python Environment - curaengine_exe = Path(self.conf.get("user.curaengine:curaengine")) - copy(self, "*", str(curaengine_exe.parent), self._base_dir, keep_path=False) + self.copy_deps("CuraEngine.exe", root_package = "curaengine", src = self.deps_cpp_info["curaengine"].bindirs[0], + dst = self._base_dir, + keep_path = False) + self.copy_deps("CuraEngine", root_package = "curaengine", src = self.deps_cpp_info["curaengine"].bindirs[0], dst = self._base_dir, + keep_path = False) # Copy resources of Cura (keep folder structure) copy(self, "*", self.cpp_info.bindirs[0], str(self._base_dir), keep_path = False)