feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'contrib/github_pr_14733' into 'master'

Browse Source 
fix(cmake): Prevent overwriting of component properties in output file (GitHub PR)

Closes IDFGH-13891

See merge request espressif/esp-idf!34807
This commit is contained in:
Roland Dobai
2024-11-12 22:48:54 +08:00
parent 05beacad73 bdf0821f97
commit 542a5d280c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/cmake/component.cmake
View File

@@ -122,6 +122,7 @@ endfunction()
# keeps a list of all its properties. # keeps a list of all its properties.
# #
function(__component_write_properties output_file) function(__component_write_properties output_file)
set(component_properties_text "")
idf_build_get_property(component_targets __COMPONENT_TARGETS) idf_build_get_property(component_targets __COMPONENT_TARGETS)
foreach(component_target ${component_targets}) foreach(component_target ${component_targets})
__component_get_property(component_properties ${component_target} __COMPONENT_PROPERTIES) __component_get_property(component_properties ${component_target} __COMPONENT_PROPERTIES)
@@ -130,8 +131,8 @@ function(__component_write_properties output_file)
set(component_properties_text set(component_properties_text
"${component_properties_text}\nset(__component_${component_target}_${property} \"${val}\")") "${component_properties_text}\nset(__component_${component_target}_${property} \"${val}\")")
endforeach() endforeach()
file(WRITE ${output_file} "${component_properties_text}")
endforeach() endforeach()
file(WRITE ${output_file} "${component_properties_text}")
endfunction() endfunction()
# #