espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-09 15:44:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/monitor_args' into 'master'

Browse Source 
tools: Fix Cmake arguments for IDF Monitor

Closes IDFGH-5169

See merge request espressif/esp-idf!13383
This commit is contained in:
Ivan Grokhotkov
2021-04-29 15:30:32 +00:00
parent aa2655f13c 3a948c1455
commit 4faba8aecf
1 changed files with 2 additions and 2 deletions
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) if(min_rev)
list(APPEND esptool_elf2image_args --min-rev ${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) unset(min_rev)
endif() endif()
@@ -155,7 +155,7 @@ add_custom_target(monitor
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}
-D IDF_PATH="${idf_path}" -D IDF_PATH="${idf_path}"
-D SERIAL_TOOL="${ESPMONITOR}" -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}" -D WORKING_DIRECTORY="${build_dir}"
-P run_serial_tool.cmake -P run_serial_tool.cmake
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}