change version number set direct

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d43dc86af1611ebb27e847b9e28f5406a7e03a5d..d0d163b48993302ff2ea61a1748dadf221e652f0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,8 @@
 cmake_minimum_required(VERSION 3.25.1)
 
-set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "build type [Debug|Release]")
+set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "[Debug|Release]")
 
-project(sane-kds-s2000w-net)
-set(PROJECT_VERSION_MAJOR 1)
-set(PROJECT_VERSION_MINOR 1)
-set(PROJECT_VERSION_PATCH 32)
-set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
+project(sane-kds-s2000w-net VERSION 1.1.32)
 message(STATUS "PROJECT_VERSION ${PROJECT_VERSION}")
 
 if(${CMAKE_BUILD_TYPE} STREQUAL Release)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7e2294323b85ad7cb30a7707e722279dc49c005c..1952955b39d9ac6b73be1d54e9365083ee6f4d70 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,7 +9,7 @@ if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git)
                OUTPUT_VARIABLE PROJECT_VERSION_TWEAK
                OUTPUT_STRIP_TRAILING_WHITESPACE)
        if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
-               set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.${PROJECT_VERSION_TWEAK})
+               set(PROJECT_VERSION ${PROJECT_VERSION}.${PROJECT_VERSION_TWEAK})
                message(STATUS "Debug PROJECT_VERSION: ${PROJECT_VERSION}")
        endif()
 endif()