From 3a948c1455c42e66fda2e092d6185eaffa0b6d35 Mon Sep 17 00:00:00 2001 From: Roland Dobai Date: Wed, 28 Apr 2021 11:19:50 +0200 Subject: [PATCH] tools: Fix Cmake arguments for IDF Monitor SERIAL_TOOL_ARGS is post-processed with the spaces2list cmake function. Therefore, it should be a list of arguments because spaces are replaced with semicolons. Regression of b77addea2fc44d1a336070e156d1c4deb50f752e and c425ac7bed1a63bb9332bd83a6e075499a244078. Closes https://github.com/espressif/esp-idf/issues/6946 --- components/esptool_py/project_include.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/esptool_py/project_include.cmake b/components/esptool_py/project_include.cmake index 58b54af5b3..838461c14a 100644 --- a/components/esptool_py/project_include.cmake +++ b/components/esptool_py/project_include.cmake @@ -49,7 +49,7 @@ endif() if(min_rev) list(APPEND esptool_elf2image_args --min-rev ${min_rev}) - set(monitor_rev_args --revision ${min_rev}) + set(monitor_rev_args "--revision;${min_rev}") unset(min_rev) endif() @@ -155,7 +155,7 @@ add_custom_target(monitor COMMAND ${CMAKE_COMMAND} -D IDF_PATH="${idf_path}" -D SERIAL_TOOL="${ESPMONITOR}" - -D SERIAL_TOOL_ARGS="--target ${target} ${monitor_rev_args} ${elf_dir}/${elf}" + -D SERIAL_TOOL_ARGS="--target;${target};${monitor_rev_args};${elf_dir}/${elf}" -D WORKING_DIRECTORY="${build_dir}" -P run_serial_tool.cmake WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}