Skip to content

Commit 63a340d

Browse files
committed
Merge remote-tracking branch 'origin/NP-1250-create-emscripten-binding-II' into NP-1250-create-emscripten-binding-II
2 parents 8c483b0 + 229a2da commit 63a340d

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

conanfile.py

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

@@ -174,8 +174,12 @@ def package(self):
174174
copy(self, pattern="uvula_js.*", src=os.path.join(self.build_folder, "UvulaJS"), dst=os.path.join(self.package_folder, "lib"))
175175
copy(self, f"*.d.ts", src=self.build_folder, dst=os.path.join(self.package_folder, "bin"), keep_path = False)
176176
copy(self, f"*.js", src=self.build_folder, dst=os.path.join(self.package_folder, "bin"), keep_path = False)
177-
packager = AutoPackager(self)
178-
packager.run()
177+
copy(self, pattern="*.h", src=os.path.join(self.source_folder, "include"), dst=os.path.join(self.package_folder, "include"))
178+
copy(self, pattern="*.a", src=self.build_folder, dst=os.path.join(self.package_folder, "lib"), keep_path=False)
179+
copy(self, pattern="*.so", src=self.build_folder, dst=os.path.join(self.package_folder, "lib"), keep_path=True)
180+
copy(self, pattern="*.lib", src=self.build_folder, dst=os.path.join(self.package_folder, "lib"), keep_path=False)
181+
copy(self, pattern="*.dll", src=self.build_folder, dst=os.path.join(self.package_folder, "bin"), keep_path=True)
182+
copy(self, pattern="*.dylib", src=self.build_folder, dst=os.path.join(self.package_folder, "lib"), keep_path=True)
179183

180184
def package_info(self):
181185
if self.options.get_safe("with_python_bindings", False):

0 commit comments

Comments
 (0)