From a90054c800507390d91a271360f3d7607ebc3bf3 Mon Sep 17 00:00:00 2001
From: x-tools-author <x-tools@outlook.com>
Date: Mon, 25 Mar 2024 16:35:54 +0800
Subject: [PATCH] chore: update the script

---
 CMake/xToolsDeployQt.cmake | 24 +++++++++++++-----------
 CMakeLists.txt             |  1 +
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/CMake/xToolsDeployQt.cmake b/CMake/xToolsDeployQt.cmake
index e1b08471..a437b8d9 100644
--- a/CMake/xToolsDeployQt.cmake
+++ b/CMake/xToolsDeployQt.cmake
@@ -1,22 +1,20 @@
 function(x_tools_deploy_qt_for_windows target)
   if(WIN32)
-    set(SAK_WINDEPLOYQT_EXECUTABLE "${QT_DIR}/../../../bin/windeployqt.exe")
     set(QT_CORE_FILE Qt${QT_VERSION_MAJOR}Core${X_TOOLS_FILE_SUFFIX}.dll)
     set(depends_dll ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${QT_CORE_FILE})
-    if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/qml")
+    if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/Qml")
       add_custom_command(
         TARGET ${target}
         POST_BUILD
-        COMMAND "${SAK_WINDEPLOYQT_EXECUTABLE}" "$<TARGET_FILE:${target}>" --qmldir
-                "${CMAKE_CURRENT_SOURCE_DIR}/qml" --no-compiler-runtime DEPENDS ${depends_dll}
-        COMMENT "Deploy Qt for Windows..."
+        COMMAND "${WINDEPLOYQT_EXECUTABLE}" "$<TARGET_FILE:${target}>" --qmldir
+                "${CMAKE_CURRENT_SOURCE_DIR}/Qml" --no-compiler-runtime
+        COMMENT "Deploy Qt(with qml) for Windows..."
         VERBATIM)
     else()
       add_custom_command(
         TARGET ${target}
         POST_BUILD
-        COMMAND "${SAK_WINDEPLOYQT_EXECUTABLE}" $<TARGET_FILE:${target}> --no-compiler-runtime
-                DEPENDS ${depends_dll}
+        COMMAND "${WINDEPLOYQT_EXECUTABLE}" $<TARGET_FILE:${target}> --no-compiler-runtime
         COMMENT "Deploy Qt for Windows..."
         VERBATIM)
     endif()
@@ -43,7 +41,7 @@ function(x_tools_deploy_qt_for_windows target)
   endif()
 endfunction()
 
-function(sak_auto_execute_macdeployqt target)
+function(x_tools_deploy_qt_for_mac target)
   if(NOT ${target} STREQUAL "xTools")
     return()
   endif()
@@ -89,7 +87,7 @@ function(sak_auto_execute_macdeployqt target)
     VERBATIM)
 endfunction()
 
-function(sak_auto_execute_linuxdeployqt target)
+function(x_tools_deploy_qt_for_linux target)
   if(NOT ${target} STREQUAL "xTools")
     return()
   endif()
@@ -160,11 +158,15 @@ function(sak_auto_execute_linuxdeployqt target)
 endfunction()
 
 function(x_tools_deploy_qt target)
+  if(${WINDEPLOYQT_EXECUTABLE} STREQUAL "")
+    return()
+  endif()
+
   if(WIN32)
     x_tools_deploy_qt_for_windows(${target})
   elseif(UNIX AND NOT APPLE)
-    sak_auto_execute_linuxdeployqt(${target})
+    x_tools_deploy_qt_for_linux(${target})
   elseif(APPLE)
-    sak_auto_execute_macdeployqt(${target})
+    x_tools_deploy_qt_for_mac(${target})
   endif()
 endfunction()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c39bfe0e..03a4220b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -175,6 +175,7 @@ add_subdirectory(${CMAKE_SOURCE_DIR}/Source/Private)
 
 x_tools_add_executable(xTools ${X_TOOLS_SOURCE})
 x_tools_generate_translations(xTools)
+x_tools_deploy_qt(xTools)
 
 if(${CMAKE_BUILD_TYPE} STREQUAL "Release")
   add_compile_definitions(X_TOOLS_USING_GLOG)