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 <shawn@frozen.ca>
This commit is contained in:
Shawn Baker 2021-11-03 04:42:32 -05:00 committed by GitHub
parent 5dca23bddc
commit b95e19e72a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -22,7 +22,9 @@ class Exiv2Conan(ConanFile):
def requirements(self):
self.requires('zlib/1.2.11')
self.requires('libcurl/7.75.0')
if self.options.webready:
self.requires('libcurl/7.79.0')
if os_info.is_windows and self.options.iconv:
self.requires('libiconv/1.16')
@ -35,7 +37,7 @@ class Exiv2Conan(ConanFile):
if self.options.xmp:
self.requires('XmpSdk/2016.7@piponazo/stable') # from conan-piponazo
else:
self.requires('expat/2.3.0')
self.requires('expat/2.4.1')
def imports(self):
self.copy('*.dll', dst='bin', src='bin')