Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 03:00:34 +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-29 22:10:21 +08:00
committed by BOT
parent 797d8deb5b
commit e7dca1a3f8
2 changed files with 49 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/cmakev2/component.cmake
+25 -11
View File
@@ -891,6 +891,29 @@ function(idf_component_include name)
endif()
list(APPEND __DEPENDENCY_CHAIN "${component_interface}")
# Inject managed dependencies BEFORE add_subdirectory() evaluates the
# component's CMakeLists.txt — otherwise any component that queries a
# managed dependency at register time via
# idf_component_get_property(... COMPONENT_LIB) finds nothing because the
# target hasn't been created yet.
idf_build_get_property(idf_component_manager IDF_COMPONENT_MANAGER)
if(idf_component_manager EQUAL 1)
idf_component_get_property(_comp_dir "${component_name}" COMPONENT_DIR)
if(EXISTS "${_comp_dir}/idf_component.yml")
__inject_requirements_for_component_from_manager("${component_name}")
idf_component_get_property(_managed_req "${component_name}" MANAGED_REQUIRES)
idf_component_get_property(_managed_priv_req "${component_name}" MANAGED_PRIV_REQUIRES)
foreach(_dep IN LISTS _managed_req _managed_priv_req)
if(_dep)
idf_component_include("${_dep}")
endif()
endforeach()
endif()
endif()
# Evaluate the CMakeLists.txt file of the component.
idf_component_get_property(component_build_dir "${component_name}" COMPONENT_BUILD_DIR)
add_subdirectory("${component_directory}" "${component_build_dir}")
@@ -977,25 +1000,16 @@ function(idf_component_include name)
target_add_binary_data(${COMPONENT_TARGET} "${file}" "TEXT")
endforeach()
# Inject managed dependencies if component manager is enabled
# Link managed dependencies for cmakev1 components (backward compat).
# The injection and inclusion already happened before add_subdirectory().
idf_build_get_property(idf_component_manager IDF_COMPONENT_MANAGER)
idf_component_get_property(component_format "${component_name}" COMPONENT_FORMAT)
if(idf_component_manager EQUAL 1)
idf_component_get_property(component_dir "${component_name}" COMPONENT_DIR)
# Check if component has manifest for managed dependency injection
if(EXISTS "${component_dir}/idf_component.yml")
__inject_requirements_for_component_from_manager("${component_name}")
# Include any managed dependencies
idf_component_get_property(managed_requires "${component_name}" MANAGED_REQUIRES)
idf_component_get_property(managed_priv_requires "${component_name}" MANAGED_PRIV_REQUIRES)
foreach(dep IN LISTS managed_requires managed_priv_requires)
if(dep)
idf_component_include("${dep}")
endif()
endforeach()
# For cmakev1 components, automatically link managed dependencies to maintain
# backward compatibility.
if("${component_format}" STREQUAL "CMAKEV1")