fsfw/fsfw
fsfw/fsfw
10
3
Fork 6
Code Issues 31 Pull Requests 4 Releases 10 Wiki Activity

Tests can now be built as part of FSFW and versioning moved to CMake #500

Merged
mohr merged 33 commits from KSat/fsfw:mueller/integrated-unittests into development 2021-10-18 14:42:53 +02:00
Conversation 6 Commits 33 Files Changed 56 +1 -3
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 306a4b647f - Show all commits

2
CMakeLists.txt
View File

@ -320,7 +320,7 @@ target_link_libraries(${LIB_FSFW_NAME} PRIVATE
string(CONCAT POST_BUILD_COMMENT
"######################################################################\n"
"Building FSFW v${FSFW_VERSION}.${FSFW_SUBVERSION}.${FSFW_REVISION}, "
"Built FSFW v${FSFW_VERSION}.${FSFW_SUBVERSION}.${FSFW_REVISION}, "
"Target OSAL: ${FSFW_OS_NAME}\n"
"######################################################################\n"
)

2
src/fsfw/FSFWVersion.h.in
View File

@ -1,8 +1,6 @@
#ifndef FSFW_VERSION_H_
#define FSFW_VERSION_H_
const char* const FSFW_VERSION_NAME = "ASTP";
// Versioning is kept in project CMakeLists.txt file
mohr marked this conversation as resolved
mohr commented 2021-10-11 14:23:15 +02:00
Review
Copy Link

I think we should remove this as well, not specific to the PR but as we are touching the version anyway...

I think we should remove this as well, not specific to the PR but as we are touching the version anyway...
#define FSFW_VERSION @FSFW_VERSION@
#define FSFW_SUBVERSION @FSFW_SUBVERSION@