Skip to content

Commit 6bbdb62

Browse files
committed
Also respect EXECUTABLE_OUTPUT_PATH for uploads.
1 parent 040f29d commit 6bbdb62

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

cmake/Platform/Arduino.cmake

+13-3
Original file line numberDiff line numberDiff line change
@@ -1169,8 +1169,13 @@ function(setup_arduino_bootloader_upload TARGET_NAME BOARD_ID PORT AVRDUDE_FLAGS
11691169
return()
11701170
endif()
11711171

1172-
list(APPEND AVRDUDE_ARGS "-Uflash:w:${TARGET_NAME}.hex")
1173-
list(APPEND AVRDUDE_ARGS "-Ueeprom:w:${TARGET_NAME}.eep:i")
1172+
if(NOT EXECUTABLE_OUTPUT_PATH)
1173+
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
1174+
endif()
1175+
set(TARGET_PATH ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME})
1176+
1177+
list(APPEND AVRDUDE_ARGS "-Uflash:w:${TARGET_PATH}.hex")
1178+
list(APPEND AVRDUDE_ARGS "-Ueeprom:w:${TARGET_PATH}.eep:i")
11741179
add_custom_target(${UPLOAD_TARGET}
11751180
${ARDUINO_AVRDUDE_PROGRAM}
11761181
${AVRDUDE_ARGS}
@@ -1212,7 +1217,12 @@ function(setup_arduino_programmer_burn TARGET_NAME BOARD_ID PROGRAMMER PORT AVRD
12121217
return()
12131218
endif()
12141219

1215-
list(APPEND AVRDUDE_ARGS "-Uflash:w:${TARGET_NAME}.hex")
1220+
if(NOT EXECUTABLE_OUTPUT_PATH)
1221+
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
1222+
endif()
1223+
set(TARGET_PATH ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME})
1224+
1225+
list(APPEND AVRDUDE_ARGS "-Uflash:w:${TARGET_PATH}.hex")
12161226

12171227
add_custom_target(${PROGRAMMER_TARGET}
12181228
${ARDUINO_AVRDUDE_PROGRAM}

0 commit comments

Comments
 (0)