Skip to content
Permalink
Browse files
Use CelixConfig.cmake instead of conan's own mechanism, and add missi…
…ng dependency.
  • Loading branch information
PengZheng committed Mar 4, 2022
1 parent 1bbaba1 commit ecd4a51068d1a86902dc3497a9b515c4dc0bac6e
Showing 2 changed files with 2 additions and 5 deletions.
@@ -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)
@@ -172,11 +172,7 @@ def package(self):
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"))

0 comments on commit ecd4a51

Please sign in to comment.