fixed merge conflicts

This commit is contained in:
Jakob Meier 2021-02-14 10:07:31 +01:00
commit 6c7b93642c

View File

@ -164,16 +164,18 @@ else()
set(TARGET_STRING "Target BSP: Hosted")
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(
TARGET ${TARGET_NAME}
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}
COMMENT "Build directory: ${CMAKE_BINARY_DIR}\nTarget OSAL: ${OS_FSFW}\n"
"Target Build Type: ${CMAKE_BUILD_TYPE}\n${TARGET_STRING}"
COMMENT ${POST_BUILD_COMMENT}
)
include (${CMAKE_SCRIPT_PATH}/BuildType.cmake)