From fdf96fd138578576631473ecfbc710b335832b77 Mon Sep 17 00:00:00 2001 From: PengZheng Date: Wed, 6 Mar 2024 22:12:19 +0800 Subject: [PATCH] Fix assertion failure when dep.cpp_info.libdir is None. --- conanfile.py | 2 +- examples/conan_test_package_v2/conanfile.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index 35d4e2b91..e91dd7967 100644 --- a/conanfile.py +++ b/conanfile.py @@ -345,7 +345,7 @@ 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.libdir is not None: + if dep.cpp_info.libdirs: 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) diff --git a/examples/conan_test_package_v2/conanfile.py b/examples/conan_test_package_v2/conanfile.py index 9d0d63a3b..f44a5ca36 100644 --- a/examples/conan_test_package_v2/conanfile.py +++ b/examples/conan_test_package_v2/conanfile.py @@ -67,7 +67,7 @@ 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.libdir is not None: + if dep.cpp_info.libdirs: 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