Merge branch 'bugfix/return_idf_component_manager_build_property_v4.4' into 'release/v4.4'
build & config: Add IDF_COMPONENT_MANAGER build property (v4.4) See merge request espressif/esp-idf!18286
This commit is contained in:
@@ -141,7 +141,7 @@ function(__build_init idf_path)
|
||||
|
||||
idf_build_set_property(__PREFIX idf)
|
||||
idf_build_set_property(__CHECK_PYTHON 1)
|
||||
idf_build_set_property(__ENABLE_COMPONENT_MANAGER 0)
|
||||
idf_build_set_property(IDF_COMPONENT_MANAGER 0)
|
||||
|
||||
__build_set_default_build_specifications()
|
||||
|
||||
@@ -422,8 +422,8 @@ macro(idf_build_process target)
|
||||
endif()
|
||||
|
||||
# Call for component manager to download dependencies for all components
|
||||
idf_build_get_property(enable_component_manager __ENABLE_COMPONENT_MANAGER)
|
||||
if(enable_component_manager)
|
||||
idf_build_get_property(idf_component_manager IDF_COMPONENT_MANAGER)
|
||||
if(idf_component_manager EQUAL 1)
|
||||
idf_build_get_property(build_dir BUILD_DIR)
|
||||
set(managed_components_list_file ${build_dir}/managed_components_list.temp.cmake)
|
||||
set(local_components_list_file ${build_dir}/local_components_list.temp.yml)
|
||||
|
||||
@@ -219,9 +219,8 @@ function(__component_get_requirements)
|
||||
message(FATAL_ERROR "${error}")
|
||||
endif()
|
||||
|
||||
idf_build_get_property(enable_component_manager __ENABLE_COMPONENT_MANAGER)
|
||||
if(enable_component_manager)
|
||||
# Call for component manager once again to inject dependencies
|
||||
idf_build_get_property(idf_component_manager IDF_COMPONENT_MANAGER)
|
||||
if(idf_component_manager EQUAL 1)
|
||||
idf_build_get_property(python PYTHON)
|
||||
execute_process(COMMAND ${python}
|
||||
"-m"
|
||||
|
||||
@@ -41,7 +41,7 @@ endif()
|
||||
|
||||
# Enable the component manager for regular projects if not explicitly disabled.
|
||||
if(NOT "$ENV{IDF_COMPONENT_MANAGER}" EQUAL "0")
|
||||
idf_build_set_property(__ENABLE_COMPONENT_MANAGER 1)
|
||||
idf_build_set_property(IDF_COMPONENT_MANAGER 1)
|
||||
endif()
|
||||
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user