add twak version

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c8c15e29b131d0df3dfe07c93db70a2756e0234e..81c76b3328a33dfb8b78bafb61c3717f1a350478 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,6 +2,23 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.25.1)
 
 PROJECT("sane-kds-s2000w-net" VERSION "1.0.0")
 
+FIND_PACKAGE(Git)
+IF(GIT_FOUND)
+       EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} branch --show-current
+               WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+               OUTPUT_VARIABLE CURRENT_BRANCH
+               OUTPUT_STRIP_TRAILING_WHITESPACE)
+       EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-list --count ${CURRENT_BRANCH}...master
+               WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+               OUTPUT_VARIABLE PROJECT_VERSION_TWEAK
+               OUTPUT_STRIP_TRAILING_WHITESPACE)
+       if (NOT "${CURRENT_BRANCH}" STREQUAL "master")
+               SET(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.${PROJECT_VERSION_TWEAK})
+       endif()
+ENDIF()
+
+MESSAGE(STATUS "PROJECT_VERSION " ${PROJECT_VERSION})
+
 FIND_LIBRARY(SANE NAMES sane REQUIRED ONLY_CMAKE_FIND_ROOT_PATH)
 MESSAGE(STATUS "find sane: " ${SANE})
 FIND_LIBRARY(MATH NAMES m REQUIRED)

diff --git a/src/config.h.in b/src/config.h.in
index d65590e08f90de7591247241b4cf1adecf634e00..a1938936c31a7a2ea50cc10d046cbbbac7874cbd 100644 (file)
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -1,4 +1,5 @@
 #define MAJOR @PROJECT_VERSION_MAJOR@
 #define MINOR @PROJECT_VERSION_MINOR@
 #define PATCH @PROJECT_VERSION_PATCH@
+#define TWEAK @PROJECT_VERSION_TWEAK@
 #define CONFIG_FILE "@CONFIG_FILE@"
\ No newline at end of file