This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch feature/conan_support in repository https://gitbox.apache.org/repos/asf/celix.git
commit ecd4a51068d1a86902dc3497a9b515c4dc0bac6e Author: PengZheng <[email protected]> AuthorDate: Fri Mar 4 21:56:20 2022 +0800 Use CelixConfig.cmake instead of conan's own mechanism, and add missing dependency. --- cmake/CelixConfig.cmake | 1 + conanfile.py | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/cmake/CelixConfig.cmake b/cmake/CelixConfig.cmake index 36905ec..67e202a 100644 --- a/cmake/CelixConfig.cmake +++ b/cmake/CelixConfig.cmake @@ -76,6 +76,7 @@ include(CMakeFindDependencyMacro) find_dependency(ZLIB REQUIRED) #Needed by framework find_dependency(UUID REQUIRED) #Needed by framework find_dependency(CURL REQUIRED) #Needed by framework (used for curl initialization) +find_dependency(LIBZIP) #Needed by utils find_dependency(Jansson REQUIRED) #Needed by dfi, etcdlib, remote services, pubsub if (TARGET Celix::dfi) diff --git a/conanfile.py b/conanfile.py index 7657aea..6fe7d2c 100644 --- a/conanfile.py +++ b/conanfile.py @@ -172,11 +172,7 @@ class CelixConan(ConanFile): self.copy("LICENSE", dst="licenses", src=self.source_folder) cmake = self._configure_cmake() cmake.install() - # tools.rmdir(os.path.join(self.package_folder, "lib", "cmake")) def package_info(self): - self.cpp_info.builddirs = [os.path.join("share", self.name, "cmake")]; self.cpp_info.bindirs = ["bin", os.path.join("share", self.name, "bundles")] - self.cpp_info.build_modules["cmake"].append(os.path.join("share", self.name, "cmake", "cmake_celix", "UseCelix.cmake")) - self.cpp_info.build_modules["cmake"].append(os.path.join("share", self.name, "cmake", "Targets.cmake")) - self.cpp_info.build_modules["cmake"].append(os.path.join("share", self.name, "cmake", "CelixTargets.cmake")) + self.cpp_info.build_modules["cmake"].append(os.path.join("lib", "cmake", "Celix", "CelixConfig.cmake"))
