Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-03 03:31:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(cmakev2): integrate manager-injected dependencies with idf_component_register

Browse Source 
Move managed-dependency injection and recursive inclusion to BEFORE the
component's add_subdirectory() call, so its CMakeLists.txt can resolve
managed-dep targets at register time. Inside idf_component_register,
union the manager-injected REQUIRES/PRIV_REQUIRES with what the
component author wrote instead of overwriting them.
This commit is contained in:
Sudeep Mohanty
2026-06-15 14:58:46 +02:00
parent 3f40e1c83a
commit 49efbb1191
2 changed files with 49 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/cmakev2/compat.cmake
+24 -2
View File
@@ -702,8 +702,30 @@ function(idf_component_register)
# Embedded files are managed in the idf_component_include function.
idf_component_set_property("${COMPONENT_NAME}" EMBED_FILES "${ARG_EMBED_FILES}")
idf_component_set_property("${COMPONENT_NAME}" EMBED_TXTFILES "${ARG_EMBED_TXTFILES}")
idf_component_set_property("${COMPONENT_NAME}" REQUIRES "${ARG_REQUIRES}")
idf_component_set_property("${COMPONENT_NAME}" PRIV_REQUIRES "${ARG_PRIV_REQUIRES}")
# The component manager's dependency injection runs before this component's
# CMakeLists.txt is evaluated (see idf_component_include() in
# component.cmake), and writes the manifest-derived names into both the
# MANAGED_* properties and the regular REQUIRES / PRIV_REQUIRES properties.
# The latter must not be overwritten by the component's own register call,
# else the manifest-derived transitive deps disappear from the build. Union
# the two so the persisted property is what the component author wrote
# PLUS what the manifest contributed.
idf_component_get_property(__existing_requires "${COMPONENT_NAME}" REQUIRES)
idf_component_get_property(__existing_priv_requires "${COMPONENT_NAME}" PRIV_REQUIRES)
set(__merged_requires "${ARG_REQUIRES}")
set(__merged_priv_requires "${ARG_PRIV_REQUIRES}")
foreach(__r IN LISTS __existing_requires)
if(__r AND NOT __r IN_LIST __merged_requires)
list(APPEND __merged_requires "${__r}")
endif()
endforeach()
foreach(__r IN LISTS __existing_priv_requires)
if(__r AND NOT __r IN_LIST __merged_priv_requires)
list(APPEND __merged_priv_requires "${__r}")
endif()
endforeach()
idf_component_set_property("${COMPONENT_NAME}" REQUIRES "${__merged_requires}")
idf_component_set_property("${COMPONENT_NAME}" PRIV_REQUIRES "${__merged_priv_requires}")
idf_component_set_property("${COMPONENT_NAME}" REQUIRED_IDF_TARGETS "${ARG_REQUIRED_IDF_TARGETS}")
idf_component_set_property("${COMPONENT_NAME}" COMPONENT_TYPE "${component_type}")
endfunction()