eive/fsfw
eive
/
fsfw
forked from fsfw/fsfw
14
1
Fork 0
Code Issues Pull Requests 1 Releases 1 Wiki Activity

some more fixes

This commit is contained in:
Robin Müller 2022-05-10 16:58:34 +02:00
parent 42ac1af4b2
commit 7b767b238a
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@ -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)

2
src/fsfw/versionAutogen.cpp
View File

@ -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";
};