This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a commit to branch feature/remove_dfi_dep
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to refs/heads/feature/remove_dfi_dep by this
push:
new 65bc7c0f Jansson is no longer a mandatory requirement.
65bc7c0f is described below
commit 65bc7c0fd6df112e81afa8266a0cc48fc5379a30
Author: PengZheng <[email protected]>
AuthorDate: Thu Feb 9 20:16:22 2023 +0800
Jansson is no longer a mandatory requirement.
---
conanfile.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/conanfile.py b/conanfile.py
index 5e959cad..1f74ca2e 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -193,8 +193,6 @@ class CelixConan(ConanFile):
self.options.build_shell_bonjour = False
def requirements(self):
- self.requires("jansson/[>=2.12 <3.0.0]")
- self.options['jansson'].shared = True
self.requires("libcurl/[>=7.64.1 <8.0.0]")
self.options['libcurl'].shared = True
self.requires("zlib/[>=1.2.8 <2.0.0]")
@@ -229,6 +227,9 @@ class CelixConan(ConanFile):
if self.options.build_celix_dfi:
self.requires("libffi/[>=3.2.1 <4.0.0]")
self.options['libffi'].shared = True
+ if self.options.build_celix_dfi or self.options.build_celix_etcdlib:
+ self.requires("jansson/[>=2.12 <3.0.0]")
+ self.options['jansson'].shared = True
def _configure_cmake(self):
if self._cmake:
