Copy dependent libraries in Pythonic way.

apache · Mar 7, 2024 · 3bd5474 · 3bd5474
1 parent acabf59
commit 3bd5474
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/conanfile.py b/conanfile.py
@@ -345,8 +345,8 @@ def generate(self):
         # 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
@@ -65,8 +65,8 @@ def generate(self):
         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
@@ -67,8 +67,8 @@ def generate(self):
         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()