From 1868839dc6ae6969bfd73801b9fd9e6a615188c9 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 5 Dec 2023 15:42:47 +0100 Subject: [PATCH] Fix cmake with tags starting with `t` --- CMakeLists.txt | 2 +- Firmware/Configuration.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d24b8ddfd..a5af2c15e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,7 +47,7 @@ message(STATUS "Project version description......: ${PROJECT_VERSION_FULL}") # SET(FW_COMMIT_DSC "v3.13.0-1234") if(NOT "${PROJECT_VERSION_SUFFIX}" STREQUAL "UNKNOWN" AND NOT "${FW_COMMIT_DSC}" MATCHES ".+NOTFOUND.+") # else -> no commit hash is known... likely no git. -string(REGEX MATCH "v([0-9]+)\.([0-9]+)\.([0-9]+)-?(${DEV_TAG_REGEX})?([0-9]+)?-([0-9]+)" TAG_VERSION "${FW_COMMIT_DSC}") +string(REGEX MATCH "[v|t]([0-9]+)\.([0-9]+)\.([0-9]+)-?(${DEV_TAG_REGEX})?([0-9]+)?-([0-9]+)" TAG_VERSION "${FW_COMMIT_DSC}") if (CMAKE_MATCH_4) # Do we have a build type? decode_flavor_code(PROJECT_VER_TAG_FLV "${CMAKE_MATCH_4}" "${CMAKE_MATCH_5}") diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 4408f9e471..f464e182f5 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -21,7 +21,7 @@ extern const char _sPrinterMmuName[] PROGMEM; #define FW_MAJOR 3 #define FW_MINOR 14 #define FW_REVISION 0 -#define FW_COMMITNR 7943 +#define FW_COMMITNR 7945 #define FW_FLAVOR BETA //uncomment if DEV, ALPHA, BETA or RC #define FW_FLAVERSION 1 //uncomment if FW_FLAVOR is defined and versioning is needed. Limited to max 8. #endif