diff options
| author | j.spijker@ultimaker.com <jelle spijker> | 2022-06-30 17:55:56 +0300 |
|---|---|---|
| committer | Jelle Spijker <j.spijker@ultimaker.com> | 2022-06-30 17:55:56 +0300 |
| commit | 77a72fce254169bc1696f43fbe3a83d22cb1874b (patch) | |
| tree | 0de73f284cee339078db2115062ab8ea516029f0 /conanfile.py | |
| parent | b4f3d5cbab87fb5d8ba40d353ae4cddda6d7080a (diff) | |
Use correct paths
Contributes to CURA-9365
Diffstat (limited to 'conanfile.py')
| -rw-r--r-- | conanfile.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/conanfile.py b/conanfile.py index 7f02db2729..533b631abf 100644 --- a/conanfile.py +++ b/conanfile.py @@ -231,10 +231,10 @@ class CuraConan(ConanFile): self.copy("*", root_package = "cura_binary_data", src = self.deps_cpp_info["cura_binary_data"].resdirs[1], dst = "venv/share/uranium", keep_path = True) - self.copy_deps("*.dll", src = "@bindirs", dst = self._site_packages) - self.copy_deps("*.pyd", src = "@libdirs", dst = self._site_packages) - self.copy_deps("*.pyi", src = "@libdirs", dst = self._site_packages) - self.copy_deps("*.dylib", src = "@libdirs", dst = self._script_dir) + self.copy("*.dll", src = "@bindirs", dst = self._site_packages) + self.copy("*.pyd", src = "@libdirs", dst = self._site_packages) + self.copy("*.pyi", src = "@libdirs", dst = self._site_packages) + self.copy("*.dylib", src = "@libdirs", dst = self._script_dir) def deploy(self): # Copy CuraEngine.exe to bindirs of Virtual Python Environment @@ -278,11 +278,10 @@ class CuraConan(ConanFile): self.copy_deps("*", root_package = "cura_binary_data", src = self.deps_cpp_info["cura_binary_data"].resdirs[2], dst = self._share_dir.joinpath("windows"), keep_path = True) - for dep in ["arcus", "savitar", "pynest2d"]: - self.copy_deps("*.dll", root_package = dep, src = "@bindirs", dst = self._site_packages) - self.copy_deps("*.pyd", root_package = dep, src = "@libdirs", dst = self._site_packages) - self.copy_deps("*.pyi", root_package = dep, src = "@libdirs", dst = self._site_packages) - self.copy_deps("*.dylib", root_package = dep, src = "@libdirs", dst = self._script_dir) + self.copy_deps("*.dll", src = "@bindirs", dst = self._site_packages) + self.copy_deps("*.pyd", src = "@libdirs", dst = self._site_packages) + self.copy_deps("*.pyi", src = "@libdirs", dst = self._site_packages) + self.copy_deps("*.dylib", src = "@libdirs", dst = self._script_dir) # Copy requirements.txt's self.copy("*.txt", src = self.cpp_info.resdirs[-1], dst = self._base_dir.joinpath("pip_requirements")) |