Skip to content

Commit 8624d91

Browse files
committed
Stop using AutoPackager, do manual copies instead
CURA-12897 It was deprecated in conan2, and is now removed in most recent versions
1 parent 751ae2e commit 8624d91

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

conanfile.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from conan import ConanFile
66
from conan.errors import ConanInvalidConfiguration
77
from conan.tools.cmake import CMakeToolchain, CMakeDeps, CMake, cmake_layout
8-
from conan.tools.files import AutoPackager, files, collect_libs, copy, update_conandata
8+
from conan.tools.files import files, collect_libs, copy, update_conandata
99
from conan.tools.build import check_min_cppstd
1010
from conan.tools.microsoft import check_min_vs, is_msvc
1111
from conan.tools.scm import Version, Git
@@ -173,8 +173,12 @@ def package(self):
173173
copy(self, f"*.d.ts", src=self.build_folder, dst=os.path.join(self.package_folder, "bin"), keep_path = False)
174174
copy(self, f"*.js", src=self.build_folder, dst=os.path.join(self.package_folder, "bin"), keep_path = False)
175175
copy(self, f"*.wasm", src=self.build_folder, dst=os.path.join(self.package_folder, "bin"), keep_path = False)
176-
packager = AutoPackager(self)
177-
packager.run()
176+
copy(self, pattern="*.hpp", src=os.path.join(self.source_folder, "include"), dst=os.path.join(self.package_folder, "include"))
177+
copy(self, pattern="*.a", src=self.build_folder, dst=os.path.join(self.package_folder, "lib"), keep_path=False)
178+
copy(self, pattern="*.so", src=self.build_folder, dst=os.path.join(self.package_folder, "lib"), keep_path=False)
179+
copy(self, pattern="*.lib", src=self.build_folder, dst=os.path.join(self.package_folder, "lib"), keep_path=False)
180+
copy(self, pattern="*.dll", src=self.build_folder, dst=os.path.join(self.package_folder, "bin"), keep_path=False)
181+
copy(self, pattern="*.dylib", src=self.build_folder, dst=os.path.join(self.package_folder, "lib"), keep_path=False)
178182

179183
# Remove the header files from options not used in this package
180184
if self.options.geometries != "clipper":

0 commit comments

Comments
 (0)