Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

esptool+cmake: Fix path generation for args.in2 file

Browse source 
Path was accidentally generated as build/<absolute path to input file> which creates unexpected path structure on Linux/macOS and breaks Windows (as can't have a directory named "C:".

Regression in e8582e9aa4

Closes https://github.com/espressif/esp-idf/issues/3687
Closes IDFGH-1409
This commit is contained in:
Angus Gratton 2019-06-26 14:55:20 +10:00 committed by Angus Gratton
parent 12f4541f19
commit 83ba2e082c
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
components/esptool_py/project_include.cmake
View file

@ -183,12 +183,16 @@ function(esptool_py_flash_project_args entry offset image)
else() else()
set(OFFSET ${offset}) set(OFFSET ${offset})
set(IMAGE ${image}) set(IMAGE ${image})
get_filename_component(template "${__FLASH_FILE_TEMPLATE}" ABSOLUTE)
configure_file(${template} ${CMAKE_CURRENT_BINARY_DIR}/${template}.in2) get_filename_component(template_in "${__FLASH_FILE_TEMPLATE}" ABSOLUTE)
file(GENERATE OUTPUT ${entry_flash_args} INPUT ${CMAKE_CURRENT_BINARY_DIR}/${template}.in2) get_filename_component(template_name "${template_in}" NAME)
set(template_partial "${CMAKE_CURRENT_BINARY_DIR}/${template_name}.in2")
configure_file("${template_in}" "${template_partial}")
file(GENERATE OUTPUT ${entry_flash_args} INPUT "${template_partial}")
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
APPEND PROPERTY APPEND PROPERTY
ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/${template}.in2}) ADDITIONAL_MAKE_CLEAN_FILES "${template_partial}")
unset(OFFSET) unset(OFFSET)
unset(IMAGE) unset(IMAGE)
endif() endif()