Skip to content

Commit

Permalink
Merge branch 'master' into feature/674-use-properties-type-in-filter
Browse files Browse the repository at this point in the history
  • Loading branch information
PengZheng committed Dec 5, 2023
2 parents 2f0c629 + b70af58 commit b43c420
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ def requirements(self):
if self.options.build_utils:
self.requires("libzip/[>=1.7.3 <2.0.0]")
if self.options.build_framework or self.options.build_pubsub:
self.requires("util-linux-libuuid/2.39")
self.requires("util-linux-libuuid/[>=2.39 <3.0.0]")
if ((self.options.build_framework and self.options.framework_curlinit)
or self.options.build_celix_etcdlib
or self.options.build_rsa_discovery_common or self.options.build_rsa_remote_service_admin_dfi
Expand All @@ -381,7 +381,7 @@ def requirements(self):
if self.options.build_cxx_remote_service_admin:
self.requires("rapidjson/[>=1.1.0 <2.0.0]")
if self.options.build_pubsub_psa_zmq:
self.requires("zeromq/4.3.4")
self.requires("zeromq/[>=4.3.4 <5.0.0]")
self.requires("czmq/4.2.0")
if self.options.build_http_admin or self.options.build_rsa_discovery_common \
or self.options.build_rsa_remote_service_admin_dfi:
Expand Down

0 comments on commit b43c420

Please sign in to comment.