Sfoglia il codice sorgente

cmake: Automatically pull in winpty for menuconfig, monitor if needed

Angus Gratton 7 anni fa
parent
commit
c7307de63e
2 ha cambiato i file con 5 aggiunte e 0 eliminazioni
  1. 3 0
      tools/cmake/kconfig.cmake
  2. 2 0
      tools/idf.py

+ 3 - 0
tools/cmake/kconfig.cmake

@@ -13,6 +13,7 @@ endmacro()
 
 if(CMAKE_HOST_WIN32)
     # Prefer a prebuilt mconf on Windows
+    find_program(WINPTY winpty)
     find_program(MCONF mconf)
 
     if(NOT MCONF)
@@ -23,6 +24,8 @@ if(CMAKE_HOST_WIN32)
                 "on the PATH, or an MSYS2 version of gcc on the PATH to build mconf. "
                 "Consult the setup docs for ESP-IDF on Windows.")
         endif()
+    elseif(WINPTY)
+        set(MCONF "${WINPTY}" "${MCONF}")
     endif()
 endif()
 

+ 2 - 0
tools/idf.py

@@ -267,6 +267,8 @@ def monitor(action, args):
         monitor_args += [ "-p", args.port ]
     monitor_args += [ "-b", project_desc["monitor_baud"] ]
     monitor_args += [ elf_file ]
+    if "MSYSTEM" is os.environ:
+        monitor_args = [ "winpty" ] + monitor_args
     _run_tool("idf_monitor", monitor_args, args.build_dir)