From 7b767b238aaa4aa99536116d10e9b6953e4f3164 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Tue, 10 May 2022 16:58:34 +0200
Subject: [PATCH] some more fixes

---
 CMakeLists.txt              | 20 ++++++++++----------
 src/fsfw/versionAutogen.cpp |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 578fff0f..3cb99bed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,14 +28,14 @@ if(GIT_INFO)
     list(GET FSFW_GIT_INFO 2 FSFW_VERSION_MINOR)
     list(GET FSFW_GIT_INFO 3 FSFW_VERSION_REVISION)
     list(GET FSFW_GIT_INFO 4 FSFW_VERSION_VCS_INFO)
-    if(NOT FSFW_VERSION)
-        set(FSFW_VERSION ${FSFW_VERSION_MAJOR_IF_GIT_FAILS})
+    if(NOT FSFW_VERSION_MAJOR)
+        set(FSFW_VERSION_MAJOR ${FSFW_VERSION_MAJOR_IF_GIT_FAILS})
     endif()
-    if(NOT FSFW_SUBVERSION)
-        set(FSFW_SUBVERSION ${FSFW_VERSION_MINOR_IF_GIT_FAILS})
+    if(NOT FSFW_VERSION_MINOR)
+        set(FSFW_VERSION_MINOR ${FSFW_VERSION_MINOR_IF_GIT_FAILS})
     endif()
-    if(NOT FSFW_REVISION)
-        set(FSFW_REVISION ${FSFW_VERSION_REVISION_IF_GIT_FAILS})
+    if(NOT FSFW_VERSION_REVISION)
+        set(FSFW_VERSION_REVISION ${FSFW_VERSION_REVISION_IF_GIT_FAILS})
     endif()
     set(FSFW_GIT_VER_HANDLING_OK TRUE)
 else()
@@ -43,9 +43,9 @@ else()
 endif()
 
 if(NOT FSFW_GIT_VER_HANDLING_OK)
-    set(FSFW_VERSION_MAJOR ${FSFW_VERSION_IF_GIT_FAILS})
-    set(FSFW_VERSION_MINOR ${FSFW_SUBVERSION_IF_GIT_FAILS})
-    set(FSFW_VERSION_REVISION ${FSFW_REVISION_IF_GIT_FAILS})
+    set(FSFW_VERSION_MAJOR ${FSFW_VERSION_MAJOR_IF_GIT_FAILS})
+    set(FSFW_VERSION_MINOR ${FSFW_VERSION_MINOR_IF_GIT_FAILS})
+    set(FSFW_VERSION_REVISION ${FSFW_VERSION_REVISION_IF_GIT_FAILS})
     set(GIT_REV "N/A")
     set(GIT_DIFF "")
     set(GIT_BRANCH "N/A")
@@ -53,7 +53,7 @@ endif()
 
 
 set(LIB_FSFW_NAME fsfw)
-project(${LIB_FSFW_NAME} VERSION ${FSFW_VERSION}.${FSFW_SUBVERSION}.${FSFW_REVISION})
+project(${LIB_FSFW_NAME} VERSION ${FSFW_VERSION_MAJOR}.${FSFW_VERSION_MINOR}.${FSFW_VERSION_REVISION})
 
 if(NOT CMAKE_CXX_STANDARD)
     set(CMAKE_CXX_STANDARD 17)
diff --git a/src/fsfw/versionAutogen.cpp b/src/fsfw/versionAutogen.cpp
index 0fe547b0..1b6f2130 100644
--- a/src/fsfw/versionAutogen.cpp
+++ b/src/fsfw/versionAutogen.cpp
@@ -5,6 +5,6 @@ namespace fsfw {
 const int FSFW_VERSION_MAJOR = 4;
 const int FSFW_VERSION_MINOR = 0;
 const int FSFW_VERSION_REVISION = 0;
-const char FSFW_VCS_INFO[] = "291-g1e5ba021";
+const char FSFW_VCS_INFO[] = "292-g42ac1af4";
 
 };