Skip to content

Commit 1b0b093

Browse files
committed
gh-769: Update conan libuv dep to build_utils
1 parent e2d3cee commit 1b0b093

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

conanfile.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,7 @@ def configure(self):
309309
# https://github.com/conan-io/conan/issues/14528#issuecomment-1685344080
310310
if self.options.build_utils:
311311
self.options['libzip'].shared = True
312+
self.options['libuv'].shared = True
312313
if self.options.build_framework:
313314
self.options['util-linux-libuuid'].shared = True
314315
if ((self.options.build_framework and self.options.framework_curlinit)
@@ -336,12 +337,11 @@ def configure(self):
336337
self.options['mosquitto'].shared = True
337338
if self.options.enable_testing:
338339
self.options['mosquitto'].broker = True
339-
if self.options.build_experimental:
340-
self.options['libuv'].shared = True
341340

342341
def requirements(self):
343342
if self.options.build_utils:
344343
self.requires("libzip/[>=1.7.3 <2.0.0]")
344+
self.requires("libuv/[>=1.49.2 <2.0.0]")
345345
if self.options.build_framework:
346346
self.requires("util-linux-libuuid/[>=2.39 <3.0.0]")
347347
if self.settings.os == "Macos":
@@ -372,8 +372,6 @@ def requirements(self):
372372
self.requires("zlib/1.3.1", override=True)
373373
if self.options.build_event_admin_remote_provider_mqtt:
374374
self.requires("mosquitto/[>=2.0.3 <3.0.0]")
375-
if self.options.build_experimental:
376-
self.requires("libuv/[>=1.49.2 <2.0.0]")
377375
self.validate()
378376

379377
def generate(self):

0 commit comments

Comments
 (0)