Jelajahi Sumber

Merge branch 'bugfix/run_esptool_espport' into 'master'

cmake: Handle ESPPORT environment variable correctly

See merge request idf/esp-idf!3482
Angus Gratton 7 tahun lalu
induk
melakukan
95e4bdf030
1 mengubah file dengan 3 tambahan dan 2 penghapusan
  1. 3 2
      components/esptool_py/run_esptool.cmake

+ 3 - 2
components/esptool_py/run_esptool.cmake

@@ -17,10 +17,11 @@ endif()
 # Note: we can't expand these environment variables in the main IDF CMake build,
 # because we want to expand them at flashing time not at CMake runtime (so they can change
 # without needing a CMake re-run)
-if(NOT ENV{ESPPORT})
+set(ESPPORT $ENV{ESPPORT})
+if(NOT ESPPORT)
     message("Note: esptool.py will search for a serial port. To specify a port, set the ESPPORT environment variable.")
 else()
-    set(port_arg "-p $ENV{ESPPORT}")
+    set(port_arg "-p ${ESPPORT}")
 endif()
 
 set(ESPBAUD $ENV{ESPBAUD})