From 8b40856d6e3d4f0929c41ccd08d4a7ab02d29888 Mon Sep 17 00:00:00 2001 From: levlam Date: Sun, 11 Oct 2020 23:48:17 +0300 Subject: [PATCH] Always link OpenSSL with Crypt32 on Windows. GitOrigin-RevId: 56dd9e21c8175f291222c8d42153dcd50cf57ed9 --- CMakeLists.txt | 4 ++-- benchmark/CMakeLists.txt | 4 ++-- sqlite/CMakeLists.txt | 4 ++-- tdutils/CMakeLists.txt | 6 ++++++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 86cdcabcd..5d5fc1639 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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}) if (WIN32) if (MINGW) - target_link_libraries(tdcore PRIVATE ws2_32 mswsock) + target_link_libraries(tdcore PRIVATE ws2_32 mswsock crypt32) else() - target_link_libraries(tdcore PRIVATE ws2_32 Mswsock) + target_link_libraries(tdcore PRIVATE ws2_32 Mswsock Crypt32) endif() endif() diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt index e175ee414..78bb649f5 100644 --- a/benchmark/CMakeLists.txt +++ b/benchmark/CMakeLists.txt @@ -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}) if (WIN32) if (MINGW) - target_link_libraries(bench_crypto PRIVATE ws2_32 mswsock) + target_link_libraries(bench_crypto PRIVATE ws2_32 mswsock crypt32) else() - target_link_libraries(bench_crypto PRIVATE ws2_32 Mswsock) + target_link_libraries(bench_crypto PRIVATE ws2_32 Mswsock Crypt32) endif() endif() target_include_directories(bench_crypto SYSTEM PRIVATE ${OPENSSL_INCLUDE_DIR}) diff --git a/sqlite/CMakeLists.txt b/sqlite/CMakeLists.txt index 67fdeaad1..a11f5c75f 100644 --- a/sqlite/CMakeLists.txt +++ b/sqlite/CMakeLists.txt @@ -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}) if (WIN32) if (MINGW) - target_link_libraries(tdsqlite PRIVATE ws2_32 mswsock) + target_link_libraries(tdsqlite PRIVATE ws2_32 mswsock crypt32) else() - target_link_libraries(tdsqlite PRIVATE ws2_32 Mswsock) + target_link_libraries(tdsqlite PRIVATE ws2_32 Mswsock Crypt32) endif() endif() diff --git a/tdutils/CMakeLists.txt b/tdutils/CMakeLists.txt index d3b12e6f3..1312c1dae 100644 --- a/tdutils/CMakeLists.txt +++ b/tdutils/CMakeLists.txt @@ -316,6 +316,12 @@ target_include_directories(tdutils PUBLIC $