third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Discussion: https://github.com/Exiv2/exiv2/issues/1200#issuecomment-623975537

Browse Source
This commit is contained in:
Robin Mills 2020-05-05 11:58:55 +01:00
parent 6667e13c4b
commit a1abe21a71
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conanfile.py
View File

@ -40,6 +40,8 @@ class Exiv2Conan(ConanFile):
# libopenssl (a transitive dependency)
if os_info.is_windows:
self.requires('libcurl/7.69.1')
self.options['libcurl'].with_openssl = False
self.options['libcurl'].with_winssl = True
else:
self.requires('libcurl/7.64.1@bincrafters/stable')

4
samples/CMakeLists.txt
View File

@ -105,7 +105,9 @@ if (EXIV2_ENABLE_WEBREADY)
if (USING_CONAN)
target_compile_definitions(conntest PRIVATE ${CONAN_COMPILE_DEFINITIONS_LIBCURL})
target_link_libraries(conntest PRIVATE ${CONAN_EXE_LINKER_FLAGS_LIBCURL})
if (NOT APPLE)
if ( MSVC )
target_link_libraries(conntest PRIVATE Crypt32 Ws2_32 ${CURL_LIBRARIES})
elseif (NOT APPLE)
target_link_libraries(conntest PRIVATE CONAN_PKG::OpenSSL)
endif()
endif()

4
src/CMakeLists.txt
View File

@ -182,7 +182,9 @@ if (EXIV2_ENABLE_WEBREADY)
if (USING_CONAN)
target_compile_definitions(exiv2lib PRIVATE ${CONAN_COMPILE_DEFINITIONS_LIBCURL})
target_link_libraries(exiv2lib PRIVATE ${CONAN_EXE_LINKER_FLAGS_LIBCURL})
if (NOT APPLE)
if ( MSVC )
target_link_libraries(exiv2lib PRIVATE Crypt32)
elseif (NOT APPLE)
target_link_libraries(exiv2lib PRIVATE CONAN_PKG::OpenSSL)
endif()
endif()