espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 20:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/cmake_esptool_args_path' into 'master'

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

Closes IDFGH-1409

See merge request idf/esp-idf!5353
This commit is contained in:
Angus Gratton
2019-06-27 13:12:26 +08:00
parent bbafd50662 83ba2e082c
commit 5d0eb95130
1 changed files with 8 additions and 4 deletions
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()