chore: update the script

x-tools-author · Oct 1, 2024 · c88cadd · c88cadd
1 parent da191fe
commit c88cadd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/CMake/xToolsGitInfo.cmake b/CMake/xToolsGitInfo.cmake
@@ -1,5 +1,4 @@
 # Get the last tag.
-set(GIT_TAG "x.x.x")
 function(x_tools_git_get_latest_tag working_dir prefix)
   execute_process(
     COMMAND git tag
@@ -15,8 +14,10 @@ function(x_tools_git_get_latest_tag working_dir prefix)
     set(GIT_LATEST_TAG ${target_version})
   endif()
   message("Latest git tag: ${GIT_LATEST_TAG}")
-  set(${prefix}_GIT_TAG="${GIT_LATEST_TAG}")
-  set(GIT_TAG "${GIT_LATEST_TAG}")
+  set(${prefix}_GIT_TAG="${GIT_LATEST_TAG}" CACHE STRING "Latest git tag" FORCE)
+  set(GIT_TAG
+      "${GIT_LATEST_TAG}"
+      PARENT_SCOPE)
   add_compile_definitions(${prefix}_GIT_TAG="${GIT_LATEST_TAG}")
 endfunction()
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -60,11 +60,10 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/CMake/xToolsThirdParty.cmake)
 # --------------------------------------------------------------------------------------------------
 # Git module
 # cmake-format: off
+set(GIT_TAG "x.x.x")
 x_tools_git_get_latest_tag(${CMAKE_CURRENT_SOURCE_DIR} "X_TOOLS")
 x_tools_git_get_latest_commit(${CMAKE_CURRENT_SOURCE_DIR} "X_TOOLS")
 x_tools_git_get_latest_commit_time(${CMAKE_CURRENT_SOURCE_DIR} "X_TOOLS")
-
-set(X_TOOLS_VERSION ${GIT_TAG} CACHE STRING "The version of applicaion")
 # cmake-format: on
 
 # --------------------------------------------------------------------------------------------------
@@ -305,16 +304,16 @@ endif()
 option(X_TOOLS_ENABLE_TARGET_XTOOLS "Enable xTools applications" ON)
 if(X_TOOLS_ENABLE_TARGET_XTOOLS)
   x_tools_add_executable(xTools ${CMAKE_CURRENT_SOURCE_DIR}/Source/main.cpp xTools.rc)
+  target_link_libraries(xTools PRIVATE xToolsCore)
+
   x_tools_add_stylesheet_resources(xTools)
   x_tools_deploy_qt(xTools)
   x_tools_tar_target(xTools)
 
-  target_link_libraries(xTools PRIVATE xToolsCore)
-
-  option(X_TOOLS_ENABLE_TARGET_XTOOLS_INSTALLER "Enable xTools applications" OFF)
-  if(X_TOOLS_ENABLE_TARGET_XTOOLS_INSTALLER)
-    x_tools_generate_installer(xTools ${X_TOOLS_VERSION})
-  endif()
+  # remove "v" from version
+  set(version ${GIT_TAG})
+  string(SUBSTRING ${version} 1 -1 version)
+  x_tools_generate_installer(xTools ${version})
 endif()
 
 # --------------------------------------------------------------------------------------------------