This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch hotfix/conan-private-dep in repository https://gitbox.apache.org/repos/asf/celix.git
commit 52eaaf835d74789ac062126271a86344101b7f1c Author: PengZheng <[email protected]> AuthorDate: Wed Mar 6 22:02:07 2024 +0800 Revert "Fix copy error in generate method." This reverts commit 6f147b8b26c474544238a8e8a8f52fc7fb279bcb. --- conanfile.py | 3 +-- examples/conan_test_package_v2/conanfile.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index e1b8003b..79db0fb3 100644 --- a/conanfile.py +++ b/conanfile.py @@ -345,8 +345,7 @@ class CelixConan(ConanFile): # tc.cache_variables["CMAKE_PROJECT_Celix_INCLUDE"] = os.path.join(self.build_folder, "conan_paths.cmake") # the following is workaround for https://github.com/conan-io/conan/issues/7192 for dep in self.dependencies.host.values(): - copy(self, "*.dylib", dep.cpp_info.libdir, os.path.join(self.build_folder, "lib")) - copy(self, "*.so*", dep.cpp_info.libdir, os.path.join(self.build_folder, "lib")) + copy(self, "*", dep.cpp_info.libdir, os.path.join(self.build_folder, "lib")) tc.cache_variables["CMAKE_BUILD_RPATH"] = os.path.join(self.build_folder, "lib") v = Version(self.version) tc.cache_variables["CELIX_MAJOR"] = str(v.major.value) diff --git a/examples/conan_test_package_v2/conanfile.py b/examples/conan_test_package_v2/conanfile.py index 3906d3f0..d64d38b9 100644 --- a/examples/conan_test_package_v2/conanfile.py +++ b/examples/conan_test_package_v2/conanfile.py @@ -67,8 +67,7 @@ class TestPackageConan(ConanFile): tc.cache_variables["TEST_COMPONENTS_READY_CHECK"] = celix_options.build_components_ready_check # the following is workaround https://github.com/conan-io/conan/issues/7192 for dep in self.dependencies.host.values(): - copy(self, "*.dylib", dep.cpp_info.libdir, os.path.join(self.build_folder, "lib")) - copy(self, "*.so*", dep.cpp_info.libdir, os.path.join(self.build_folder, "lib")) + copy(self, "*", dep.cpp_info.libdir, os.path.join(self.build_folder, "lib")) tc.cache_variables["CMAKE_BUILD_RPATH"] = os.path.join(self.build_folder, "lib") tc.user_presets_path = False tc.generate()
