Просмотр исходного кода

Merge branch 'bugfix/monitor_args' into 'master'

tools: Fix Cmake arguments for IDF Monitor

Closes IDFGH-5169

See merge request espressif/esp-idf!13383
Ivan Grokhotkov 4 лет назад
Родитель
Сommit
4faba8aecf
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      components/esptool_py/project_include.cmake

+ 2 - 2
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}