GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-15 14:15:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/CURA-11622_conan_v2' into CURA-11622_conan_v2

Browse Source
This commit is contained in:
Erwan MATHIEU 2024-11-27 08:59:50 +01:00
commit 11579c23d2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conanfile.py
View File

@ -182,11 +182,11 @@ class CuraConan(ConanFile):
src_path = str(Path(cura_source_folder, data["src"])) src_path = str(Path(cura_source_folder, data["src"]))
else: else:
if data["package"] not in self.dependencies: if data["package"] not in self.dependencies:
raise ConanException(f"Required package {data["package"]} does not exist as a dependency") raise ConanException(f"Required package {data['package']} does not exist as a dependency")
package_folder = self.dependencies[data["package"]].package_folder package_folder = self.dependencies[data['package']].package_folder
if package_folder is None: if package_folder is None:
raise ConanException(f"Unable to find package_folder for {data["package"]}, check that it has not been skipped") raise ConanException(f"Unable to find package_folder for {data['package']}, check that it has not been skipped")
src_path = os.path.join(self.dependencies[data["package"]].package_folder, data["src"]) src_path = os.path.join(self.dependencies[data["package"]].package_folder, data["src"])
elif "root" in data: # get the paths relative from the install folder elif "root" in data: # get the paths relative from the install folder