Michal
/
Prusa-Firmware-MMU
mirror of https://github.com/prusa3d/Prusa-Firmware-MMU
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update CMakeFiles.txt and temporarily fix compilation of unit tests

pull/10/head
D.R.racer 2021-05-18 08:58:23 +02:00
parent fe0ac4f9f9
commit 6ebb281eda
2 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
CMakeLists.txt
View File

@ -98,17 +98,6 @@ if(CUSTOM_COMPILE_OPTIONS)
add_compile_options(${CUSTOM_COMPILE_OPTIONS}) add_compile_options(${CUSTOM_COMPILE_OPTIONS})
endif() endif()
#
# MMUHeaders
#
# add_library(MMUHeaders INTERFACE) target_include_directories( MMUHeaders INTERFACE include
# include/stm32f4_hal include/usb_host include/usb_device include/marlin include/freertos )
# target_link_libraries(A3idesHeaders INTERFACE STM32F4::HAL FreeRTOS::FreeRTOS)
# target_compile_definitions( A3idesHeaders INTERFACE PRINTER_TYPE=PRINTER_PRUSA_${PRINTER} )
# #
# Global Compiler & Linker Configuration # Global Compiler & Linker Configuration
# #
@ -174,29 +163,38 @@ set_target_properties(firmware PROPERTIES CXX_STANDARD 14)
if(CMAKE_CROSSCOMPILING) if(CMAKE_CROSSCOMPILING)
# generate firmware.bin file # generate firmware.bin file
objcopy(firmware "ihex" ".hex") objcopy(firmware "ihex" ".hex")
# produce ASM listing
add_custom_command( add_custom_command(
TARGET firmware POST_BUILD COMMAND avr-objdump ARGS -CSd firmware > firmware.txt TARGET firmware POST_BUILD COMMAND avr-objdump ARGS -CSd firmware > firmware.asm
) )
# inform about the firmware's size in terminal
add_custom_command(TARGET firmware POST_BUILD COMMAND avr-size ARGS -C --mcu=atmega32u4 firmware)
report_size(firmware)
# generate linker map file
target_link_options(firmware PUBLIC -Wl,-Map=firmware.map)
target_sources(firmware PRIVATE src/main.cpp src/hal/avr/cpu.cpp src/modules/protocol.cpp)
else()
enable_testing()
add_subdirectory(tests)
# TODO - still need to decide about the dummy_main.cpp - for unit tests it should not be necessary
# to make a separate main.cpp file
target_sources(
firmware PRIVATE tests/unit/dummy_main.cpp src/hal/avr/cpu.cpp src/modules/protocol.cpp
)
endif() endif()
add_custom_command(TARGET firmware POST_BUILD COMMAND avr-size ARGS -C --mcu=atmega32u4 firmware)
# generate linker map file
target_link_options(firmware PUBLIC -Wl,-Map=firmware.map)
# inform about the firmware's size in terminal
report_size(firmware)
# add_link_dependency(firmware "${LINKER_SCRIPT}") # add_link_dependency(firmware "${LINKER_SCRIPT}")
target_include_directories(firmware PRIVATE include src) target_include_directories(firmware PRIVATE include src)
target_compile_options(firmware PRIVATE -Wdouble-promotion) target_compile_options(firmware PRIVATE -Wdouble-promotion)
# target_link_libraries( firmware PRIVATE A3idesHeaders )
target_sources(firmware PRIVATE src/main.cpp src/hal/avr/cpu.cpp src/modules/protocol.cpp)
set_property( set_property(
SOURCE src/version.c SOURCE src/version.c
APPEND APPEND
@ -207,8 +205,3 @@ set_property(
FW_VERSION_SUFFIX=${PROJECT_VERSION_SUFFIX} FW_VERSION_SUFFIX=${PROJECT_VERSION_SUFFIX}
FW_VERSION_SUFFIX_SHORT=${PROJECT_VERSION_SUFFIX_SHORT} FW_VERSION_SUFFIX_SHORT=${PROJECT_VERSION_SUFFIX_SHORT}
) )
if(NOT CMAKE_CROSSCOMPILING)
enable_testing()
add_subdirectory(tests)
endif()

1
tests/unit/dummy_main.cpp Normal file
View File

@ -0,0 +1 @@
int main() {}