conan: update conan recipe versions

main
Luis Díaz Más 4 years ago
parent c372f2677d
commit f601d23d5e

@ -17,35 +17,29 @@ class Exiv2Conan(ConanFile):
) )
def configure(self): def configure(self):
self.options['libcurl'].shared = False self.options['libcurl'].shared = True
self.options['libcurl'].with_openssl = True self.options['gtest'].shared = True
self.options['gtest'].shared = False
def requirements(self): def requirements(self):
self.requires('zlib/1.2.11@conan/stable') self.requires('zlib/1.2.11')
self.requires('libcurl/7.75.0')
if os_info.is_windows and self.options.iconv: if os_info.is_windows and self.options.iconv:
self.requires('libiconv/1.15@bincrafters/stable') self.requires('libiconv/1.16')
if self.options.unitTests: if self.options.unitTests:
self.requires('gtest/1.8.1@bincrafters/stable') self.requires('gtest/1.10.0')
if self.options.webready and not os_info.is_macos: if self.options.webready and not os_info.is_macos:
# Note: This difference in versions is just due to a combination of corner cases in the
# recipes and the OS & compiler versions used in Travis and AppVeyor. In normal cases we
# could use any of the versions.Also note that the issue was not with libcurl but with
# libopenssl (a transitive dependency)
if os_info.is_windows: if os_info.is_windows:
self.requires('libcurl/7.69.1') self.options['libcurl'].with_ssl = 'darwinssl'
self.options['libcurl'].with_openssl = False
self.options['libcurl'].with_winssl = True
else: else:
self.requires('libcurl/7.64.1@bincrafters/stable') self.options['libcurl'].with_ssl = 'openssl'
if self.options.xmp: if self.options.xmp:
self.requires('XmpSdk/2016.7@piponazo/stable') # from conan-piponazo self.requires('XmpSdk/2016.7@piponazo/stable') # from conan-piponazo
else: else:
self.requires('Expat/2.2.6@pix4d/stable') self.requires('expat/2.3.0')
def imports(self): def imports(self):
self.copy('*.dll', dst='conanDlls', src='bin') self.copy('*.dll', dst='conanDlls', src='bin')

@ -107,8 +107,6 @@ if (EXIV2_ENABLE_WEBREADY)
target_link_libraries(conntest PRIVATE ${CONAN_EXE_LINKER_FLAGS_LIBCURL}) target_link_libraries(conntest PRIVATE ${CONAN_EXE_LINKER_FLAGS_LIBCURL})
if ( MSVC ) if ( MSVC )
target_link_libraries(conntest PRIVATE Crypt32 Ws2_32 ${CURL_LIBRARIES}) target_link_libraries(conntest PRIVATE Crypt32 Ws2_32 ${CURL_LIBRARIES})
elseif (NOT APPLE)
target_link_libraries(conntest PRIVATE CONAN_PKG::OpenSSL)
endif() endif()
endif() endif()
endif() endif()

@ -168,8 +168,6 @@ if (EXIV2_ENABLE_WEBREADY)
target_link_libraries(exiv2lib PRIVATE ${CONAN_EXE_LINKER_FLAGS_LIBCURL}) target_link_libraries(exiv2lib PRIVATE ${CONAN_EXE_LINKER_FLAGS_LIBCURL})
if ( MSVC ) if ( MSVC )
target_link_libraries(exiv2lib PRIVATE Crypt32) target_link_libraries(exiv2lib PRIVATE Crypt32)
elseif (NOT APPLE)
target_link_libraries(exiv2lib PRIVATE CONAN_PKG::OpenSSL)
endif() endif()
endif() endif()
endif() endif()

Loading…
Cancel
Save