Skip to content

Commit d83dbaf

Browse files
authored
Merge pull request #165 from Ultimaker/CURA-12897_bump-conan
Stop using AutoPackager, do manual copies instead
2 parents 51982a1 + 97e8716 commit d83dbaf

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

conanfile.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from conan.tools.build import check_min_cppstd
77
from conan.tools.cmake import CMakeToolchain, CMakeDeps, CMake, cmake_layout
88
from conan.tools.env import VirtualBuildEnv
9-
from conan.tools.files import copy, AutoPackager, update_conandata
9+
from conan.tools.files import copy, update_conandata
1010
from conan.tools.microsoft import check_min_vs, is_msvc, is_msvc_static_runtime
1111
from conan.tools.scm import Version, Git
1212

@@ -143,5 +143,10 @@ def build(self):
143143

144144
def package(self):
145145
copy(self, pattern="LICENSE*", dst="licenses", src=self.source_folder)
146-
packager = AutoPackager(self)
147-
packager.run()
146+
copy(self, pattern="*.h", src=os.path.join(self.source_folder, "include"), dst=os.path.join(self.package_folder, "include"))
147+
copy(self, pattern="*.a", src=self.build_folder, dst=os.path.join(self.package_folder, "lib"), keep_path=False)
148+
copy(self, pattern="*.so", src=self.build_folder, dst=os.path.join(self.package_folder, "lib"), keep_path=False)
149+
copy(self, pattern="*.lib", src=self.build_folder, dst=os.path.join(self.package_folder, "lib"), keep_path=False)
150+
copy(self, pattern="*.dll", src=self.build_folder, dst=os.path.join(self.package_folder, "bin"), keep_path=False)
151+
copy(self, pattern="*.dylib", src=self.build_folder, dst=os.path.join(self.package_folder, "lib"), keep_path=False)
152+

0 commit comments

Comments
 (0)