From a8b9296dba43c2678fd74c9a53ee55f27a93c480 Mon Sep 17 00:00:00 2001
From: JackLee_CN <809262979@qq.com>
Date: Wed, 20 Aug 2025 21:06:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0QT=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt    | 20 ++++++++++++--------
 CMakePresets.json | 15 ++++++++++++++-
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e14e88..f50162d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,24 +47,27 @@ endif()
 SET(QT_STATU "static")
 
 if(QT_STATU STREQUAL "dynamic")
-   SET(QT_DIR "D:/Dev/Qt/6.8.0/mingw_64/lib/cmake")
+   SET(Qt6_DIR "D:/Dev/Qt/6.9.1/mingw_64/lib/cmake")
 else()
-   SET(QT_DIR "D:/Dev/Qt/6.8.0/mingw1310_static_x64/lib/cmake")
+   SET(Qt6_DIR "D:/Dev/Qt/6.9.1/mingw1310_static_x64/lib/cmake")
+   SET(MSYS_DIR "D:/Dev/msys64/ucrt64/lib")
 endif()
 
 #JSON库
 SET(JSON ${PROJECT_SOURCE_DIR}/3rdparty/json)
 include_directories(${JSON}/include)
 
-LIST(APPEND CMAKE_PREFIX_PATH ${QT_DIR} ${MSYS})
+LIST(APPEND CMAKE_PREFIX_PATH ${Qt6_DIR} ${MSYS_DIR})
 
 #查找QT模块
 FIND_PACKAGE(Qt6 REQUIRED Core Gui Widgets)
 
 #输出路径
 MESSAGE(STATUS "----------基础路径输出 START-------------")
-MESSAGE(STATUS "QT_DIR_PATH=${QT_DIR}")
+MESSAGE(STATUS "QT_DIR_PATH=${Qt6_DIR}")
+MESSAGE(STATUS "MSYS2_DIR_PATH=${MSYS_DIR}")
 MESSAGE(STATUS "JSON_DIR_PATH=${JSON}")
+MESSAGE(STATUS "CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}")
 MESSAGE(STATUS "----------基础路径输出 END---------------")
 
 
@@ -89,8 +92,7 @@ endif()
 if(WIN32)
     add_definitions("-DCURL_STATICLIB")   
 endif()
-
-find_package(PkgConfig REQUIRED)
+find_package(PkgConfig REQUIRED QUIET)
 pkg_check_modules(CURL REQUIRED IMPORTED_TARGET libcurl)
 if(CURL_FOUND) 
    include_directories(${CURL_INCLUDE_DIRS})
@@ -167,10 +169,12 @@ message(STATUS "Qt Version: ${QT_VERSION_STR}")
 configure_file (version.h.in version.h @ONLY)
 
 # 设置链接标志为静态链接
-SET(CMAKE_EXE_LINKER_FLAGS -static)
+#SET(CMAKE_EXE_LINKER_FLAGS -static)
 
 target_link_libraries(
-    ${PROJECT_NAME} PRIVATE Qt6::Core Qt6::Gui Qt6::Widgets PkgConfig::LIBGIT2 PkgConfig::CURL  
+    ${PROJECT_NAME} PRIVATE Qt6::Core Qt6::Gui Qt6::Widgets PkgConfig::LIBGIT2 PkgConfig::CURL
+    -lzstd
+    -lb2
 )
 
 
diff --git a/CMakePresets.json b/CMakePresets.json
index 1e7843a..10f80ac 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -1,6 +1,19 @@
 {
-    "version": 2,
+    "version": 8,
     "configurePresets": [
+        {
+            "name": "msys2-ucrt-mingw64",
+            "displayName": "GCC 14.2.0 x86_64-w64-mingw32 (ucrt64)",
+            "description": "正在使用编译器: C = D:\\Dev\\msys64\\ucrt64\\bin\\gcc.exe, CXX = D:\\Dev\\msys64\\ucrt64\\bin\\g++.exe",
+            "generator": "MinGW Makefiles",
+            "binaryDir": "${sourceDir}/out/build/${presetName}",
+            "cacheVariables": {
+                "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}",
+                "CMAKE_C_COMPILER": "D:/Dev/msys64/ucrt64/bin/gcc.exe",
+                "CMAKE_CXX_COMPILER": "D:/Dev/msys64/ucrt64/bin/g++.exe",
+                "CMAKE_BUILD_TYPE": "Release"
+            }
+        },
         {
             "name": "vcpkg-mingw-x64",
             "generator": "Ninja",