From 46a8688382e457d7675afa2fecd6d6ecac5c52d9 Mon Sep 17 00:00:00 2001
From: x-tools-author <x-tools@outlook.com>
Date: Fri, 22 Mar 2024 10:28:20 +0800
Subject: [PATCH] chore: update files of project

---
 CMake/xToolsCommon.cmake | 10 +++++++++
 CMakeLists.txt           | 45 ++++++++++++++++++++--------------------
 2 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/CMake/xToolsCommon.cmake b/CMake/xToolsCommon.cmake
index 4fd4f938..b5a0c5be 100644
--- a/CMake/xToolsCommon.cmake
+++ b/CMake/xToolsCommon.cmake
@@ -138,3 +138,13 @@ function(x_tools_finalize_executable target)
     qt_finalize_executable(${target})
   endif()
 endfunction()
+
+function(x_tools_setup_translations target)
+  set(APP_TS_FILES "")
+  list(APPEND APP_TS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/Resources/Translations/app_en.ts)
+  list(APPEND APP_TS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/Resources/Translations/app_zh_CN.ts)
+  set(O_PATH "${CMAKE_CURRENT_SOURCE_DIR}/Resources/Translations")
+  qt_add_lupdate(${target} TS_FILES ${APP_TS_FILES})
+  set_source_files_properties(${APP_TS_FILES} PROPERTIES OUTPUT_LOCATION ${O_PATH})
+  qt_add_lrelease(${target} TS_FILES ${APP_TS_FILES})
+endfunction()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ed814e1..8ec25edf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ if(X_TOOLS_BUILD_FOR_STORE)
   add_compile_definitions(X_TOOLS_BUILD_FOR_STORE)
 endif()
 
-set(X_TOOLS_QT_COMPONENTS Core Gui Widgets WebSockets Network)
+set(X_TOOLS_QT_COMPONENTS Core Gui Widgets WebSockets Network LinguistTools)
 if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "iOS")
   list(APPEND X_TOOLS_QT_COMPONENTS SerialPort)
   list(APPEND X_TOOLS_QT_COMPONENTS SerialBus)
@@ -54,9 +54,11 @@ file(GLOB X_TOOLS_ASSISTANT_SOURCE_H "${CMAKE_SOURCE_DIR}/Source/Assistants/*/So
 file(GLOB X_TOOLS_ASSISTANT_SOURCE_UI "${CMAKE_SOURCE_DIR}/Source/Assistants/*/Source/*.ui")
 file(GLOB X_TOOLS_ASSISTANT_SOURCE_CPP "${CMAKE_SOURCE_DIR}/Source/Assistants/*/Source/*.cpp")
 
-# * list(APPEND X_TOOLS_SOURCE ${X_TOOLS_COMMOM_SOURCE_H})
-# * list(APPEND X_TOOLS_SOURCE ${X_TOOLS_COMMOM_SOURCE_UI})
-# * list(APPEND X_TOOLS_SOURCE ${X_TOOLS_COMMOM_SOURCE_CPP})
+file(GLOB X_TOOLS_CMAKE_FILES "${CMAKE_SOURCE_DIR}/CMake/*.cmake")
+
+list(APPEND X_TOOLS_SOURCE ${X_TOOLS_COMMOM_SOURCE_H})
+list(APPEND X_TOOLS_SOURCE ${X_TOOLS_COMMOM_SOURCE_UI})
+list(APPEND X_TOOLS_SOURCE ${X_TOOLS_COMMOM_SOURCE_CPP})
 list(APPEND X_TOOLS_SOURCE ${X_TOOLS_TOOLS_SOURCE_H})
 list(APPEND X_TOOLS_SOURCE ${X_TOOLS_TOOLS_SOURCE_UI})
 list(APPEND X_TOOLS_SOURCE ${X_TOOLS_TOOLS_SOURCE_CPP})
@@ -167,30 +169,29 @@ sak_add_subdirectory("glog-0.7.0")
 sak_add_subdirectory("qmdnsengine-master")
 add_subdirectory(${CMAKE_SOURCE_DIR}/Source/Private)
 
-list(APPEND X_TOOLS_COMMOM_SOURCE ${X_TOOLS_COMMOM_SOURCE_H})
-list(APPEND X_TOOLS_COMMOM_SOURCE ${X_TOOLS_COMMOM_SOURCE_UI})
-list(APPEND X_TOOLS_COMMOM_SOURCE ${X_TOOLS_COMMOM_SOURCE_CPP})
-add_library(xToolsCommon STATIC ${X_TOOLS_COMMOM_SOURCE})
-target_link_libraries(xToolsCommon PRIVATE glog::glog)
-target_link_libraries(xToolsCommon PRIVATE qmdnsengine)
-target_link_libraries(xToolsCommon PRIVATE Qt${QT_VERSION_MAJOR}::Core)
-target_link_libraries(xToolsCommon PRIVATE Qt${QT_VERSION_MAJOR}::Gui)
-target_link_libraries(xToolsCommon PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)
-target_link_libraries(xToolsCommon PRIVATE Qt${QT_VERSION_MAJOR}::Network)
-if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "iOS")
-  target_link_libraries(xToolsCommon PRIVATE Qt${QT_VERSION_MAJOR}::SerialPort)
-  target_link_libraries(xToolsCommon PRIVATE Qt${QT_VERSION_MAJOR}::SerialBus)
-endif()
-if(Qt${QT_VERSION_MAJOR}Bluetooth_FOUND)
-  target_link_libraries(xToolsCommon PRIVATE Qt${QT_VERSION_MAJOR}::Bluetooth)
-endif()
+# * list(APPEND X_TOOLS_COMMOM_SOURCE ${X_TOOLS_COMMOM_SOURCE_H})
+# * list(APPEND X_TOOLS_COMMOM_SOURCE ${X_TOOLS_COMMOM_SOURCE_UI})
+# * list(APPEND X_TOOLS_COMMOM_SOURCE ${X_TOOLS_COMMOM_SOURCE_CPP})
+# * add_library(xToolsCommon STATIC ${X_TOOLS_COMMOM_SOURCE})
+# * target_link_libraries(xToolsCommon PRIVATE glog::glog)
+# * target_link_libraries(xToolsCommon PRIVATE qmdnsengine)
+# * target_link_libraries(xToolsCommon PRIVATE Qt${QT_VERSION_MAJOR}::Core)
+# * target_link_libraries(xToolsCommon PRIVATE Qt${QT_VERSION_MAJOR}::Gui)
+# * target_link_libraries(xToolsCommon PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)
+# * target_link_libraries(xToolsCommon PRIVATE Qt${QT_VERSION_MAJOR}::Network)
+# * if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "iOS")
+# * target_link_libraries(xToolsCommon PRIVATE Qt${QT_VERSION_MAJOR}::SerialPort)
+# * target_link_libraries(xToolsCommon PRIVATE Qt${QT_VERSION_MAJOR}::SerialBus)
+# * endif()
+# * if(Qt${QT_VERSION_MAJOR}Bluetooth_FOUND)
+# * target_link_libraries(xToolsCommon PRIVATE Qt${QT_VERSION_MAJOR}::Bluetooth)
+# * endif()
 
 qt_add_executable(xTools ${X_TOOLS_SOURCE})
 sak_git_get_last_commit(${CMAKE_SOURCE_DIR} "SAK")
 sak_git_get_last_commit_time(${CMAKE_SOURCE_DIR} "SAK")
 target_link_libraries(xTools PRIVATE glog::glog)
 target_link_libraries(xTools PRIVATE qmdnsengine)
-target_link_libraries(xTools PRIVATE xToolsCommon)
 target_link_libraries(xTools PRIVATE Qt${QT_VERSION_MAJOR}::Gui)
 target_link_libraries(xTools PRIVATE Qt${QT_VERSION_MAJOR}::Core)
 target_link_libraries(xTools PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)