[celix] branch feature/604-global-initialization-of-curl updated: Specify all components that depend on libcurl.

[pengzheng]

This is an automated email from the ASF dual-hosted git repository.

pengzheng pushed a commit to branch feature/604-global-initialization-of-curl
in repository https://gitbox.apache.org/repos/asf/celix.git


The following commit(s) were added to 
refs/heads/feature/604-global-initialization-of-curl by this push:
     new f243a11e Specify all components that depend on libcurl.
f243a11e is described below

commit f243a11e237b5faba2845ff2156050941eaefcba
Author: PengZheng <howto...@gmail.com>
AuthorDate: Fri Aug 4 10:12:17 2023 +0800

    Specify all components that depend on libcurl.
---
 cmake/CelixDeps.cmake.in | 2 ++
 conanfile.py             | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/cmake/CelixDeps.cmake.in b/cmake/CelixDeps.cmake.in
index c4c09755..804a4aba 100644
--- a/cmake/CelixDeps.cmake.in
+++ b/cmake/CelixDeps.cmake.in
@@ -8,6 +8,8 @@ 
$<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::dfi>>:find_dependency(jansson)>
 $<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::etcdlib>>:find_dependency(jansson)>
 $<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::framework>>:find_dependency(CURL)>
 $<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::etcdlib>>:find_dependency(CURL)>
+$<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::deployment_admin>>:find_dependency(CURL)>
+$<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::rsa_dfi>>:find_dependency(CURL)>
 
$<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::RsaConfiguredDiscovery>>:find_dependency(RapidJSON)>
 
$<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::rsa_discovery>>:find_dependency(LibXml2)>
 
$<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::bonjour_shell>>:find_dependency(LibXml2)>
diff --git a/conanfile.py b/conanfile.py
index aa8444ee..a077e6ba 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -383,7 +383,9 @@ class CelixConan(ConanFile):
         if self.options.build_framework or self.options.build_pubsub:
             self.requires("libuuid/1.0.3")
             self.options['libuuid'].shared = True
-        if self.options.build_framework or self.options.build_celix_etcdlib:
+        if (self.options.build_framework or self.options.build_celix_etcdlib
+                or self.options.build_deployment_admin or 
self.options.build_rsa_discovery_common
+                or self.options.build_rsa_remote_service_admin_dfi):
             self.requires("libcurl/[>=7.64.1 <8.0.0]")
             self.options['libcurl'].shared = True
         if self.options.build_deployment_admin: