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
The following commit(s) were added to refs/heads/hotfix/conan-private-dep by
this push:
new 3bd54746 Copy dependent libraries in Pythonic way.
3bd54746 is described below
commit 3bd54746b5c87f4793f57468c439e2c2258aedfd
Author: PengZheng <[email protected]>
AuthorDate: Thu Mar 7 09:34:22 2024 +0800
Copy dependent libraries in Pythonic way.
---
conanfile.py | 4 ++--
examples/conan_test_package/conanfile.py | 4 ++--
examples/conan_test_package_v2/conanfile.py | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/conanfile.py b/conanfile.py
index e91dd796..a1653a98 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -345,8 +345,8 @@ 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():
- if dep.cpp_info.libdirs:
- copy(self, "*", dep.cpp_info.libdir,
os.path.join(self.build_folder, "lib"))
+ for ld in dep.cpp_info.libdirs:
+ copy(self, "*", ld, 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/conanfile.py
b/examples/conan_test_package/conanfile.py
index 3fe91593..c2c081d9 100644
--- a/examples/conan_test_package/conanfile.py
+++ b/examples/conan_test_package/conanfile.py
@@ -65,8 +65,8 @@ class TestPackageConan(ConanFile):
tc.cache_variables["TEST_COMPONENTS_READY_CHECK"] =
self.options["celix"].build_components_ready_check
# the following is workaround
https://github.com/conan-io/conan/issues/7192
for dep in self.dependencies.host.values():
- if dep.cpp_info.libdirs:
- copy(self, "*", dep.cpp_info.libdir,
os.path.join(self.build_folder, "lib"))
+ for ld in dep.cpp_info.libdirs:
+ copy(self, "*", ld, 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()
diff --git a/examples/conan_test_package_v2/conanfile.py
b/examples/conan_test_package_v2/conanfile.py
index f44a5ca3..dce06ae1 100644
--- a/examples/conan_test_package_v2/conanfile.py
+++ b/examples/conan_test_package_v2/conanfile.py
@@ -67,8 +67,8 @@ 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():
- if dep.cpp_info.libdirs:
- copy(self, "*", dep.cpp_info.libdir,
os.path.join(self.build_folder, "lib"))
+ for ld in dep.cpp_info.libdirs:
+ copy(self, "*", ld, 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()
