From d0c3d3c5fda6c2b91917ddd881fb8e20ed658097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 28 Jan 2023 16:43:00 +0000 Subject: [PATCH 1/3] Fix an issue with using echo on Windows Use built-in echo command in cmake instead to ensure behavior is the same between different platforms --- cmake/Utilities.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Utilities.cmake b/cmake/Utilities.cmake index 1ae37d25c..e6669a18a 100644 --- a/cmake/Utilities.cmake +++ b/cmake/Utilities.cmake @@ -58,7 +58,7 @@ endfunction() function(report_size target) add_custom_command( TARGET ${target} POST_BUILD - COMMAND echo "" # visually separate the output + COMMAND ${CMAKE_COMMAND} -E echo "" # visually separate the output COMMAND "${CMAKE_SIZE_UTIL}" -B "$" USES_TERMINAL ) From 15932123dbad0dbbb0881bbbd56fe6f6d8efb96c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 28 Jan 2023 18:35:06 +0000 Subject: [PATCH 2/3] cmake: add target name to memory usage info --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index d33399b4a..b6d3b4e08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -306,6 +306,7 @@ function(add_base_binary variant_name) add_custom_command( TARGET ${variant_name} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E echo_append "${variant_name} " COMMAND ${CMAKE_SIZE_UTIL} -C --mcu=atmega2560 ${variant_name} ) report_size(${variant_name}) From f9b779e274a466cfeeadaaee96bf5b7a19b70a78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 28 Jan 2023 18:53:31 +0000 Subject: [PATCH 3/3] Remove echo in report_size function The output is separate by two lines anyway. --- cmake/Utilities.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/cmake/Utilities.cmake b/cmake/Utilities.cmake index e6669a18a..4fcfd322c 100644 --- a/cmake/Utilities.cmake +++ b/cmake/Utilities.cmake @@ -58,7 +58,6 @@ endfunction() function(report_size target) add_custom_command( TARGET ${target} POST_BUILD - COMMAND ${CMAKE_COMMAND} -E echo "" # visually separate the output COMMAND "${CMAKE_SIZE_UTIL}" -B "$" USES_TERMINAL )