alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-09-20 00:36:01 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

tools: Fix Cmake arguments for IDF Monitor

Browse Source 
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 b77addea2f and
c425ac7bed.

Closes https://github.com/espressif/esp-idf/issues/6946
This commit is contained in:
Roland Dobai 2021-04-28 11:19:50 +02:00
parent 644f430a31
commit 3a948c1455
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/esptool_py/project_include.cmake
View File

@ -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}