From: Angus Gratton <gus@projectgus.com>
Date: Sun, 14 Oct 2018 23:25:44 +0000 (+1100)
Subject: cmake: Handle ESPPORT environment variable correctly
X-Git-Tag: v3.2-beta1~50^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=897670b0abaa69b3094718b06486be06f0f121e5;p=esp-idf

cmake: Handle ESPPORT environment variable correctly

Closes https://github.com/espressif/esp-idf/issues/2553
---

diff --git a/components/esptool_py/run_esptool.cmake b/components/esptool_py/run_esptool.cmake
index db4cf20310..a63eb55f0b 100644
--- a/components/esptool_py/run_esptool.cmake
+++ b/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})