build: fix version substitution for appimage

Author: ARDev1161

CMakeLists.txt

@@ -168,8 +168,8 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
 
 set_target_properties(${PROJECT_NAME} PROPERTIES
     MACOSX_BUNDLE_GUI_IDENTIFIER AmurClient.online
-    MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
-    MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
+    MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION_SEMVER}
+    MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_SEMVER_MAJOR}.${PROJECT_VERSION_SEMVER_MINOR}
     MACOSX_BUNDLE TRUE
     WIN32_EXECUTABLE TRUE
 )
@@ -189,7 +189,7 @@ include(\"${CMAKE_SOURCE_DIR}/cmake/linuxdeploy.cmake\")
 
 build_appimage(
     APP_NAME         \"${PROJECT_NAME}\"
-    APP_VERSION      \"${PROJECT_VERSION}\"
+    APP_VERSION      \"${PROJECT_VERSION_SEMVER}\"
     EXECUTABLE       \"${PROJECT_NAME}\"
     ICON             \"${CMAKE_SOURCE_DIR}/data/images/logo.png\"
     APP_ARCH         \"${CMAKE_SYSTEM_PROCESSOR}\"

cmake/GetVersionFromGit.cmake

@@ -44,16 +44,14 @@ endif()
 # Сохраняем PARSED_VERSION в переменной PROJECT_VERSION_SEMVER (SemVer)
 set(PROJECT_VERSION_SEMVER "${PARSED_VERSION}" CACHE INTERNAL "Semver version X.Y.Z")
 
-# -------------------------------------------------------------------------
-# Дальше: используйте PROJECT_VERSION_SEMVER и PROJECT_VERSION_FULL
-#         в своем основном CMakeLists (или прямо тут).
-#
-# Например, можно прямо здесь объявить проект с нужной версией:
-#
-#   project(MyProject VERSION ${PROJECT_VERSION_SEMVER} LANGUAGES CXX)
-#
-# Но иногда это делают в главном CMakeLists, чтобы была гибкость.
-# -------------------------------------------------------------------------
+# Извлекаем Major и Minor версии
+string(REGEX MATCH "^[0-9]+" PROJECT_VERSION_SEMVER_MAJOR "${PROJECT_VERSION_SEMVER}")
+string(REGEX MATCH "^[0-9]+\\.[0-9]+" PROJECT_VERSION_SEMVER_MINOR_TMP "${PROJECT_VERSION_SEMVER}")
+string(REGEX MATCH "[0-9]+$" PROJECT_VERSION_SEMVER_MINOR "${PROJECT_VERSION_SEMVER_MINOR_TMP}")
+
+# Сохраняем их в кэше
+set(PROJECT_VERSION_SEMVER_MAJOR "${PROJECT_VERSION_SEMVER_MAJOR}" CACHE INTERNAL "Major version")
+set(PROJECT_VERSION_SEMVER_MINOR "${PROJECT_VERSION_SEMVER_MINOR}" CACHE INTERNAL "Minor version")
 
+# Выводим в консоль
 message(STATUS "Project semver parsed: ${PROJECT_VERSION_SEMVER}")
-message(STATUS "Project full version : ${PROJECT_VERSION_FULL}")