diff --git a/conanfile.py b/conanfile.py index d161e655..ad76b393 100644 --- a/conanfile.py +++ b/conanfile.py @@ -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') diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index 7628110d..26393352 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt @@ -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() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7809863e..f6efba2a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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()