eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

Merge pull request 'Small update, Submodule updates' (#15) from mueller/master into develop

Browse Source 
Reviewed-on: eive/eive_obsw#15
This commit is contained in:
Jakob Meier 2021-02-14 08:37:55 +01:00
commit 7c255508d5
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -162,16 +162,18 @@ else()
set(TARGET_STRING "Target BSP: Hosted") set(TARGET_STRING "Target BSP: Hosted")
endif() endif()
string(CONCAT POST_BUILD_COMMENT
"Build directory: ${CMAKE_BINARY_DIR}\n"
"Target OSAL: ${OS_FSFW}\n"
"Target Build Type: ${CMAKE_BUILD_TYPE}\n"
"${TARGET_STRING}"
)
add_custom_command( add_custom_command(
TARGET ${TARGET_NAME} TARGET ${TARGET_NAME}
POST_BUILD POST_BUILD
#COMMAND echo "Build directory: ${CMAKE_BINARY_DIR}"
#COMMAND echo "Target OSAL: ${OS_FSFW}"
#COMMAND echo "Target Build Type: ${CMAKE_BUILD_TYPE}"
#COMMAND echo "${TARGET_STRING}"
COMMAND ${CMAKE_SIZE} ${TARGET_NAME}${FILE_SUFFIX} COMMAND ${CMAKE_SIZE} ${TARGET_NAME}${FILE_SUFFIX}
COMMENT "Build directory: ${CMAKE_BINARY_DIR}\nTarget OSAL: ${OS_FSFW}\n" COMMENT ${POST_BUILD_COMMENT}
"Target Build Type: ${CMAKE_BUILD_TYPE}\n${TARGET_STRING}"
) )
include (${CMAKE_SCRIPT_PATH}/BuildType.cmake) include (${CMAKE_SCRIPT_PATH}/BuildType.cmake)

2
fsfw

@ -1 +1 @@
Subproject commit 8c5e261a0db46e53a7655c98766ebd65a13dc10a Subproject commit c28398257b68facbabb19d7228b045f1388305df

2
tmtc

@ -1 +1 @@
Subproject commit 361eb39aa12cf99cc6fd3931dc829d5de6a09b94 Subproject commit c10fbe7fbec6b32ceb725da62e18e4db5dc112a7