Skip to content

Commit b95e19e

Browse files
libcurl is now optional. Updated to the latest versions of libcurl and expat. (#1992)
* libcurl is now optional. Updated to the latest versions of libcurl and expat. * No need for a libcurl option, libcurl is now only required if webready is. Co-authored-by: shawn <[email protected]>
1 parent 5dca23b commit b95e19e

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

conanfile.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ def configure(self):
2222

2323
def requirements(self):
2424
self.requires('zlib/1.2.11')
25-
self.requires('libcurl/7.75.0')
25+
26+
if self.options.webready:
27+
self.requires('libcurl/7.79.0')
2628

2729
if os_info.is_windows and self.options.iconv:
2830
self.requires('libiconv/1.16')
@@ -35,7 +37,7 @@ def requirements(self):
3537
if self.options.xmp:
3638
self.requires('XmpSdk/2016.7@piponazo/stable') # from conan-piponazo
3739
else:
38-
self.requires('expat/2.3.0')
40+
self.requires('expat/2.4.1')
3941

4042
def imports(self):
4143
self.copy('*.dll', dst='bin', src='bin')

0 commit comments

Comments
 (0)