Always link OpenSSL with Crypt32 on Windows.
GitOrigin-RevId: 56dd9e21c8175f291222c8d42153dcd50cf57ed9
This commit is contained in:
parent
22be9b95bf
commit
8b40856d6e
@ -809,9 +809,9 @@ target_include_directories(tdcore SYSTEM PRIVATE ${OPENSSL_INCLUDE_DIR})
|
|||||||
target_link_libraries(tdcore PUBLIC tdapi tdactor tdutils tdnet tddb PRIVATE ${OPENSSL_CRYPTO_LIBRARY} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES})
|
target_link_libraries(tdcore PUBLIC tdapi tdactor tdutils tdnet tddb PRIVATE ${OPENSSL_CRYPTO_LIBRARY} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES})
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
if (MINGW)
|
if (MINGW)
|
||||||
target_link_libraries(tdcore PRIVATE ws2_32 mswsock)
|
target_link_libraries(tdcore PRIVATE ws2_32 mswsock crypt32)
|
||||||
else()
|
else()
|
||||||
target_link_libraries(tdcore PRIVATE ws2_32 Mswsock)
|
target_link_libraries(tdcore PRIVATE ws2_32 Mswsock Crypt32)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -10,9 +10,9 @@ add_executable(bench_crypto bench_crypto.cpp)
|
|||||||
target_link_libraries(bench_crypto PRIVATE tdutils ${OPENSSL_CRYPTO_LIBRARY} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES})
|
target_link_libraries(bench_crypto PRIVATE tdutils ${OPENSSL_CRYPTO_LIBRARY} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES})
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
if (MINGW)
|
if (MINGW)
|
||||||
target_link_libraries(bench_crypto PRIVATE ws2_32 mswsock)
|
target_link_libraries(bench_crypto PRIVATE ws2_32 mswsock crypt32)
|
||||||
else()
|
else()
|
||||||
target_link_libraries(bench_crypto PRIVATE ws2_32 Mswsock)
|
target_link_libraries(bench_crypto PRIVATE ws2_32 Mswsock Crypt32)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
target_include_directories(bench_crypto SYSTEM PRIVATE ${OPENSSL_INCLUDE_DIR})
|
target_include_directories(bench_crypto SYSTEM PRIVATE ${OPENSSL_INCLUDE_DIR})
|
||||||
|
@ -23,9 +23,9 @@ target_include_directories(tdsqlite SYSTEM PRIVATE ${OPENSSL_INCLUDE_DIR})
|
|||||||
target_link_libraries(tdsqlite PRIVATE ${OPENSSL_CRYPTO_LIBRARY} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES})
|
target_link_libraries(tdsqlite PRIVATE ${OPENSSL_CRYPTO_LIBRARY} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES})
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
if (MINGW)
|
if (MINGW)
|
||||||
target_link_libraries(tdsqlite PRIVATE ws2_32 mswsock)
|
target_link_libraries(tdsqlite PRIVATE ws2_32 mswsock crypt32)
|
||||||
else()
|
else()
|
||||||
target_link_libraries(tdsqlite PRIVATE ws2_32 Mswsock)
|
target_link_libraries(tdsqlite PRIVATE ws2_32 Mswsock Crypt32)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -316,6 +316,12 @@ target_include_directories(tdutils PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOUR
|
|||||||
if (OPENSSL_FOUND)
|
if (OPENSSL_FOUND)
|
||||||
target_link_libraries(tdutils PRIVATE ${OPENSSL_CRYPTO_LIBRARY} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES})
|
target_link_libraries(tdutils PRIVATE ${OPENSSL_CRYPTO_LIBRARY} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES})
|
||||||
target_include_directories(tdutils SYSTEM PRIVATE ${OPENSSL_INCLUDE_DIR})
|
target_include_directories(tdutils SYSTEM PRIVATE ${OPENSSL_INCLUDE_DIR})
|
||||||
|
|
||||||
|
if (MINGW)
|
||||||
|
target_link_libraries(tdutils PRIVATE ws2_32 mswsock crypt32)
|
||||||
|
else()
|
||||||
|
target_link_libraries(tdutils PRIVATE ws2_32 Mswsock Crypt32)
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (ZLIB_FOUND)
|
if (ZLIB_FOUND)
|
||||||
|
Loading…
Reference in New Issue
Block a user