diff options
| author | j.spijker@ultimaker.com <jelle spijker> | 2022-06-30 17:40:24 +0300 |
|---|---|---|
| committer | Jelle Spijker <j.spijker@ultimaker.com> | 2022-06-30 17:40:24 +0300 |
| commit | b4f3d5cbab87fb5d8ba40d353ae4cddda6d7080a (patch) | |
| tree | 92153b50d0c06a53bf67e83eb19de4437131b949 /conanfile.py | |
| parent | 2739057a97e1cbed0191989440ce2a0bf207a3ee (diff) | |
Use correct paths
Contributes to CURA-9365
Diffstat (limited to 'conanfile.py')
| -rw-r--r-- | conanfile.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/conanfile.py b/conanfile.py index 55cd662214..7f02db2729 100644 --- a/conanfile.py +++ b/conanfile.py @@ -214,8 +214,8 @@ class CuraConan(ConanFile): if self.options.devtools: self._generate_pyinstaller_spec(self.generators_folder, - os.path.join(self.source_folder, self._um_data(self.version)["runinfo"]["entrypoint"]), - os.path.join(self.source_folder, "packaging", self._um_data(self.version)["pyinstaller"]["icon"][str(self.settings.os)])) + Path(self.source_folder, self._um_data(self.version)["runinfo"]["entrypoint"]), + Path(self.source_folder, "packaging", self._um_data(self.version)["pyinstaller"]["icon"][str(self.settings.os)])) def imports(self): self.copy("CuraEngine.exe", root_package = "curaengine", src = "@bindirs", dst = "", keep_path = False) @@ -289,8 +289,8 @@ class CuraConan(ConanFile): self._generate_cura_version(Path(self._site_packages, "cura")) self._generate_pyinstaller_spec(self._base_dir, - os.path.join(self.cpp_info.bindirs[0], self._um_data(self.version)["runinfo"]["entrypoint"]), - os.path.join(self.cpp_info.resdirs[2], self._um_data(self.version)["pyinstaller"]["icon"][str(self.settings.os)])) + Path(self.cpp_info.bin_paths[0], self._um_data(self.version)["runinfo"]["entrypoint"]), + Path(self.cpp_info.res_paths[2], self._um_data(self.version)["pyinstaller"]["icon"][str(self.settings.os)])) def package(self): |