Merge branch 'dev' of git.shimatta.de:mhu/reflow-oven-control-sw into dev

This commit is contained in:
Mario Hüttel 2021-04-10 20:13:29 +02:00
commit 5776feee85

View File

@ -101,7 +101,6 @@ target_link_options(${ELFFILE} PRIVATE -mlittle-endian -mthumb -mcpu=cortex-m4 -
target_link_libraries(${ELFFILE} base64-lib) target_link_libraries(${ELFFILE} base64-lib)
target_include_directories(${ELFFILE} PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/updater/ram-code/include/") target_include_directories(${ELFFILE} PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/updater/ram-code/include/")
set(HEX_PATH "${CMAKE_CURRENT_BINARY_DIR}/${HEXFILE}") set(HEX_PATH "${CMAKE_CURRENT_BINARY_DIR}/${HEXFILE}")
add_custom_target(update-image ALL DEPENDS ${HEX_PATH}) add_custom_target(update-image ALL DEPENDS ${HEX_PATH})
add_custom_command( add_custom_command(