|
3 | 3 | import os |
4 | 4 |
|
5 | 5 | from conan import ConanFile |
6 | | -from conan.errors import ConanInvalidConfiguration |
7 | | -from conan.tools.files import copy, mkdir, update_conandata |
8 | | -from conan.tools.cmake import CMakeToolchain, CMakeDeps, CMake, cmake_layout |
9 | 6 | from conan.tools.build import check_min_cppstd |
| 7 | +from conan.tools.cmake import CMakeToolchain, CMakeDeps, CMake, cmake_layout |
| 8 | +from conan.tools.files import copy, mkdir, update_conandata |
10 | 9 | from conan.tools.scm import Version, Git |
11 | 10 |
|
12 | 11 | required_conan_version = ">=2.7.0" |
@@ -61,8 +60,10 @@ def export_sources(self): |
61 | 60 | copy(self, "CuraEngine.rc", self.recipe_folder, self.export_sources_folder) |
62 | 61 | copy(self, "LICENSE", self.recipe_folder, self.export_sources_folder) |
63 | 62 | copy(self, "*", os.path.join(self.recipe_folder, "src"), os.path.join(self.export_sources_folder, "src")) |
64 | | - copy(self, "*", os.path.join(self.recipe_folder, "include"), os.path.join(self.export_sources_folder, "include")) |
65 | | - copy(self, "*", os.path.join(self.recipe_folder, "benchmark"), os.path.join(self.export_sources_folder, "benchmark")) |
| 63 | + copy(self, "*", os.path.join(self.recipe_folder, "include"), |
| 64 | + os.path.join(self.export_sources_folder, "include")) |
| 65 | + copy(self, "*", os.path.join(self.recipe_folder, "benchmark"), |
| 66 | + os.path.join(self.export_sources_folder, "benchmark")) |
66 | 67 | copy(self, "*", os.path.join(self.recipe_folder, "stress_benchmark"), |
67 | 68 | os.path.join(self.export_sources_folder, "stress_benchmark")) |
68 | 69 | copy(self, "*", os.path.join(self.recipe_folder, "tests"), os.path.join(self.export_sources_folder, "tests")) |
@@ -138,7 +139,8 @@ def generate(self): |
138 | 139 | tc.variables["ENABLE_TESTING"] = not self.conf.get("tools.build:skip_test", False, check_type=bool) |
139 | 140 | tc.variables["ENABLE_BENCHMARKS"] = self.options.enable_benchmarks |
140 | 141 | tc.variables["EXTENSIVE_WARNINGS"] = self.options.enable_extensive_warnings |
141 | | - tc.variables["OLDER_APPLE_CLANG"] = self.settings.compiler == "apple-clang" and Version(self.settings.compiler.version) < "14" |
| 142 | + tc.variables["OLDER_APPLE_CLANG"] = self.settings.compiler == "apple-clang" and Version( |
| 143 | + self.settings.compiler.version) < "14" |
142 | 144 | tc.variables["ENABLE_THREADING"] = not (self.settings.arch == "wasm" and self.settings.os == "Emscripten") |
143 | 145 | if self.options.enable_plugins: |
144 | 146 | tc.variables["ENABLE_PLUGINS"] = True |
@@ -182,7 +184,7 @@ def build(self): |
182 | 184 | cmake.configure() |
183 | 185 | cmake.build() |
184 | 186 |
|
185 | | - self.send_sentry_debug_files(binary_basename = "CuraEngine") |
| 187 | + self.send_sentry_debug_files(binary_basename="CuraEngine") |
186 | 188 |
|
187 | 189 | def deploy(self): |
188 | 190 | copy(self, "CuraEngine*", src=os.path.join(self.package_folder, "bin"), dst=self.deploy_folder) |
@@ -222,5 +224,4 @@ def package_info(self): |
222 | 224 | "package.json" |
223 | 225 | ] |
224 | 226 | } |
225 | | - |
226 | 227 | self.conf_info.define(f"user.{self.name.lower()}:package_json", package_json) |
0 commit comments