From 2d5be9a88a0964c866de9163475b9da2404eaa8a Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Mon, 27 Mar 2023 13:44:26 +0200 Subject: [PATCH] copy cura from the package folder Contributes to CURA-10317 --- conanfile.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index 804340c666..461b34e6fd 100644 --- a/conanfile.py +++ b/conanfile.py @@ -368,10 +368,10 @@ class CuraConan(ConanFile): keep_path = False) # Copy resources of Cura (keep folder structure) - copy(self, "*", self.cpp_info.bindirs[0], str(self._base_dir), keep_path = False) - copy(self, "*", self.cpp_info.libdirs[0], str(self._site_packages.joinpath("cura")), keep_path = True) - copy(self, "*", self.cpp_info.resdirs[0], str(self._share_dir.joinpath("cura", "resources")), keep_path = True) - copy(self, "*", self.cpp_info.resdirs[1], str(self._share_dir.joinpath("cura", "plugins")), keep_path = True) + copy(self, "*", os.path.join(self.package_folder, self.cpp_info.bindirs[0]), str(self._base_dir), keep_path = False) + copy(self, "*", os.path.join(self.package_folder, self.cpp_info.libdirs[0]), str(self._site_packages.joinpath("cura")), keep_path = True) + copy(self, "*", os.path.join(self.package_folder, self.cpp_info.resdirs[0]), str(self._share_dir.joinpath("cura", "resources")), keep_path = True) + copy(self, "*", os.path.join(self.package_folder, self.cpp_info.resdirs[1]), str(self._share_dir.joinpath("cura", "plugins")), keep_path = True) # Copy materials (flat) fdm_materials = self.dependencies["fdm_materials"].cpp_info