Skip to content

Commit 92dfdeb

Browse files
committed
Merge branch 'fix/md5_enabled_fix' into 'master'
fix: Fix MD5 option handling Closes ESF-143 See merge request espressif/esp-serial-flasher!110
2 parents 0945b52 + 09e1192 commit 92dfdeb

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

CMakeLists.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ if (DEFINED SERIAL_FLASHER_INTERFACE_UART OR CONFIG_SERIAL_FLASHER_INTERFACE_UAR
5252
list(APPEND defs
5353
SERIAL_FLASHER_INTERFACE_UART
5454
)
55-
add_option(MD5_ENABLED false)
55+
if (DEFINED MD5_ENABLED OR CONFIG_SERIAL_FLASHER_MD5_ENABLED)
56+
list(APPEND defs MD5_ENABLED=1)
57+
endif()
5658

5759
elseif(DEFINED SERIAL_FLASHER_INTERFACE_USB OR CONFIG_SERIAL_FLASHER_INTERFACE_USB STREQUAL "y")
5860
list(APPEND srcs
@@ -62,7 +64,9 @@ elseif(DEFINED SERIAL_FLASHER_INTERFACE_USB OR CONFIG_SERIAL_FLASHER_INTERFACE_U
6264
list(APPEND defs
6365
SERIAL_FLASHER_INTERFACE_USB
6466
)
65-
add_option(MD5_ENABLED false)
67+
if (DEFINED MD5_ENABLED OR CONFIG_SERIAL_FLASHER_MD5_ENABLED)
68+
list(APPEND defs MD5_ENABLED=1)
69+
endif()
6670

6771
elseif(DEFINED SERIAL_FLASHER_INTERFACE_SPI OR CONFIG_SERIAL_FLASHER_INTERFACE_SPI STREQUAL "y")
6872
list(APPEND srcs

0 commit comments

Comments
 (0)