update cmake file

Author: khumnath

CMakeLists.txt

@@ -3,17 +3,28 @@ cmake_minimum_required(VERSION 3.16)
 #=============================================================================
 # Project Metadata and Versioning
 #=============================================================================
+
+execute_process(
+    COMMAND bash "${CMAKE_CURRENT_SOURCE_DIR}/update_version.sh"
+    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+    RESULT_VARIABLE VERSION_SCRIPT_RESULT
+)
+if(NOT VERSION_SCRIPT_RESULT EQUAL 0)
+    message(WARNING "The version update script failed to run. Version info may be stale or incorrect.")
+endif()
+
 set(VERSION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/resources/version.conf")
+
 if(EXISTS "${VERSION_FILE}")
     file(READ "${VERSION_FILE}" PROJECT_VERSION_STRING)
     string(STRIP "${PROJECT_VERSION_STRING}" PROJECT_VERSION_STRING)
 else()
-    set(PROJECT_VERSION_STRING "unknown")
+    set(PROJECT_VERSION_STRING "0.0.0")
     message(WARNING "Could not find version file: ${VERSION_FILE}. Defaulting to version ${PROJECT_VERSION_STRING}.")
 endif()
 
 project(bikram-calendar VERSION ${PROJECT_VERSION_STRING} LANGUAGES CXX)
-message(STATUS "Configuring bikram-calendar version: ${PROJECT_VERSION}")
+message(STATUS "Configuring bikram-calendar version: ${PROJECT_VERSION_STRING}")
 
 #=============================================================================
 # C++ Standard and Qt Setup
@@ -36,18 +47,6 @@ find_package(Qt6 REQUIRED COMPONENTS
 qt_policy(SET QTP0001 NEW)
 qt_policy(SET QTP0004 NEW)
 
-#=============================================================================
-# Run Versioning Script Before Build
-#=============================================================================
-execute_process(
-    COMMAND bash "${CMAKE_CURRENT_SOURCE_DIR}/update_version.sh"
-    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-    RESULT_VARIABLE VERSION_SCRIPT_RESULT
-)
-if(NOT VERSION_SCRIPT_RESULT EQUAL 0)
-    message(WARNING "The version update script failed to run. Version info may be stale or incorrect.")
-endif()
-
 #=============================================================================
 # Source Files
 #=============================================================================

resources/build_info.conf

@@ -1 +1 @@
-Built from Git source at Wed Aug 20 08:22:30 AM +0545 2025
+Built from Git source at Wed Aug 20 09:33:02 AM +0545 2025 (2.2.4)

resources/version.conf

@@ -1 +1 @@
-2.1.1-3-g8bc
+2.2.4

update_version.sh

@@ -6,17 +6,22 @@ BUILD_INFO_FILE="resources/build_info.conf"
 GIT_BUILD_MSG="Built from Git source at $(date)"
 NON_GIT_BUILD_MSG="(*built from non-Git environment $(date), version may not be correct)"
 
-
 if command -v git &> /dev/null && git rev-parse --is-inside-work-tree &> /dev/null; then
-
     echo "Git environment detected. Overwriting version files."
-    GIT_VERSION=$(git describe --tags | sed -E 's/-g([0-9a-f]{3}).*/-g\1/')
-    echo "$GIT_VERSION" > "$VERSION_FILE"
-    echo "$GIT_BUILD_MSG" > "$BUILD_INFO_FILE"
+
+    # Full version with Git metadata
+    FULL_VERSION=$(git describe --tags | sed -E 's/-g([0-9a-f]{3,}).*/-g\1/')
+
+    # Clean semantic version
+    CLEAN_VERSION=$(echo "$FULL_VERSION" | grep -oE '^[0-9]+\.[0-9]+\.[0-9]+')
+
+    # Write both
+    echo "$CLEAN_VERSION" > "$VERSION_FILE"
+    echo "$GIT_BUILD_MSG ($FULL_VERSION)" > "$BUILD_INFO_FILE"
 
 else
     echo "Non-Git environment detected. Overwriting with fallback versions."
     echo "$NON_GIT_BUILD_MSG" > "$BUILD_INFO_FILE"
-
 fi
-exit 0
+
+exit 0