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

feat(cmakev2/component): create component alias only after it has been included

Browse Source 
Add a component interface alias only after the actual target is created,
meaning the component is included. The alias has a well-defined name and
can be used in generator expressions like
`$<$<TARGET_EXISTS:idf::esp_netif>:>` without needing to retrieve the
COMPONENT_ALIAS property.

Signed-off-by: Frantisek Hrbata <frantisek.hrbata@espressif.com>
This commit is contained in:
Frantisek Hrbata
2025-10-30 17:17:49 +08:00
committed by BOT
parent 1129e8b8d4
commit 4c88b9c31b
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/cmakev2/component.cmake
+8 -2
View File
@@ -420,7 +420,6 @@ function(__init_component)
# Interface target is used to attach all component properties and is also # Interface target is used to attach all component properties and is also
# used when the component is linked to other targets. # used when the component is linked to other targets.
add_library("${component_interface}" INTERFACE) add_library("${component_interface}" INTERFACE)
add_library("${component_alias}" ALIAS "${component_interface}")
idf_build_set_property(COMPONENTS_DISCOVERED "${component_name}" APPEND) idf_build_set_property(COMPONENTS_DISCOVERED "${component_name}" APPEND)
idf_build_set_property(COMPONENT_INTERFACES "${component_interface}" APPEND) idf_build_set_property(COMPONENT_INTERFACES "${component_interface}" APPEND)
@@ -565,8 +564,8 @@ function(idf_component_include name)
list(APPEND components_included "${component_name}") list(APPEND components_included "${component_name}")
idf_build_set_property(COMPONENTS_INCLUDED "${components_included}") idf_build_set_property(COMPONENTS_INCLUDED "${components_included}")
idf_component_get_property(component_interface "${name}" COMPONENT_INTERFACE)
if(DEFINED ARG_INTERFACE) if(DEFINED ARG_INTERFACE)
idf_component_get_property(component_interface "${name}" COMPONENT_INTERFACE)
set(${ARG_INTERFACE} ${component_interface} PARENT_SCOPE) set(${ARG_INTERFACE} ${component_interface} PARENT_SCOPE)
endif() endif()
@@ -587,6 +586,13 @@ function(idf_component_include name)
__get_real_target(TARGET "${component_target}" OUTPUT component_real_target) __get_real_target(TARGET "${component_target}" OUTPUT component_real_target)
idf_component_set_property("${component_name}" COMPONENT_REAL_TARGET "${component_real_target}") idf_component_set_property("${component_name}" COMPONENT_REAL_TARGET "${component_real_target}")
# Create a component interface alias, but only after the real target is
# known, meaning the component is included. The alias has a well-defined
# name and can be used, for example, in generator expressions without
# needing to get the COMPONENT_ALIAS property.
idf_component_get_property(component_alias "${name}" COMPONENT_ALIAS)
add_library("${component_alias}" ALIAS "${component_interface}")
# Set component target type as COMPONENT_REAL_TARGET_TYPE property. # Set component target type as COMPONENT_REAL_TARGET_TYPE property.
get_target_property(component_real_target_type "${component_real_target}" TYPE) get_target_property(component_real_target_type "${component_real_target}" TYPE)
idf_component_set_property("${component_name}" COMPONENT_REAL_TARGET_TYPE "${component_real_target_type}") idf_component_set_property("${component_name}" COMPONENT_REAL_TARGET_TYPE "${component_real_target_type}")