From 6220277305b329a8b4ec51b3cddbe5b0e779fe7b Mon Sep 17 00:00:00 2001
From: Syping <syping@syping.de>
Date: Wed, 6 Mar 2024 16:20:47 +0100
Subject: [PATCH] CMake: msys compatibility added/fixed

---
 CMakeLists.txt                   |  3 ++-
 cmake/DPPAsExternalProject.cmake | 17 +++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 264ff05..e09803d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,12 +98,13 @@ if (WITH_DPP_AS_EXTERNAL_PROJECT)
     add_dependencies(dtranslatebot DPP)
 endif()
 target_compile_definitions(dtranslatebot PRIVATE
+    ${DPP_DEFINITIONS}
     $<$<BOOL:${DTRANSLATEBOT_USE_BOOST_REGEX}>:DTRANSLATEBOT_USE_BOOST_REGEX>
 )
 if (MSVC AND MSVC_VERSION GREATER_EQUAL 1914)
     target_compile_options(dtranslatebot PRIVATE $<$<COMPILE_LANGUAGE:CXX>:/Zc:__cplusplus>)
 endif()
-target_link_libraries(dtranslatebot PRIVATE ${DPP_LIBRARIES} ${DTRANSLATEBOT_LIBRARIES} Threads::Threads)
+target_link_libraries(dtranslatebot PRIVATE ${DTRANSLATEBOT_LIBRARIES} ${DPP_LIBRARIES} Threads::Threads)
 target_include_directories(dtranslatebot PRIVATE ${DPP_INCLUDE_DIR})
 set_target_properties(dtranslatebot PROPERTIES
     CXX_STANDARD 17
diff --git a/cmake/DPPAsExternalProject.cmake b/cmake/DPPAsExternalProject.cmake
index 4b046a4..3c69b59 100644
--- a/cmake/DPPAsExternalProject.cmake
+++ b/cmake/DPPAsExternalProject.cmake
@@ -77,6 +77,7 @@ ExternalProject_Add(DPP
         -DBUILD_VOICE_SUPPORT=OFF
         "${CMAKE_PASSTHROUGH_ARGS}"
         "-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>"
+        -DDPP_BUILD_TEST=OFF
         -DDPP_NO_VCPKG=ON
         -DRUN_LDCONFIG=OFF
         "-DOpenSSL_ROOT=${OpenSSL_INSTALL_DIR}"
@@ -91,13 +92,21 @@ set(DPP_LIBRARIES
     -Wl,-Bstatic
     "-L${DPP_INSTALL_DIR}/lib"
     "-L${DPP_INSTALL_DIR}/lib64"
-    -ldpp
+    dpp
     "-L${OpenSSL_INSTALL_DIR}/lib"
     "-L${OpenSSL_INSTALL_DIR}/lib64"
-    -lssl
-    -lcrypto
+    ssl
+    crypto
     "-L${ZLIB_INSTALL_DIR}/lib"
     "-L${ZLIB_INSTALL_DIR}/lib64"
-    -lz
+    $<IF:$<BOOL:WIN32>,zlibstatic,z>
     -Wl,-Bdynamic
 )
+if (WIN32)
+    set(DPP_DEFINITIONS DPP_STATIC)
+    list(APPEND DPP_LIBRARIES
+        ws2_32
+        gdi32
+        crypt32
+    )
+endif()