Always link OpenSSL with Crypt32 on Windows.

GitOrigin-RevId: 56dd9e21c8175f291222c8d42153dcd50cf57ed9
DrDub · Oct 11, 2020 · 8b40856 · 8b40856
1 parent 22be9b9
commit 8b40856
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -316,6 +316,12 @@ target_include_directories(tdutils PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOUR
 if (OPENSSL_FOUND)
   target_link_libraries(tdutils PRIVATE ${OPENSSL_CRYPTO_LIBRARY} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES})
   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()
 
 if (ZLIB_FOUND)