alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/return_idf_component_manager_build_property' into 'master'

Browse Source 
build & config: Add IDF_COMPONENT_MANAGER build property

Closes PACMAN-356

See merge request espressif/esp-idf!18251
This commit is contained in:
Roland Dobai 2022-05-28 13:58:34 +08:00
commit c0a045793f
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en/api-guides/build-system.rst
View File

@ -1179,6 +1179,7 @@ These are properties that describe the build. Values of build properties can be
- EXECUTABLE - project executable; set by call to ``idf_build_executable``
- EXECUTABLE_NAME - name of project executable without extension; set by call to ``idf_build_executable``
- EXECUTABLE_DIR - path containing the output executable
- IDF_COMPONENT_MANAGER - the component manager is enabled by default, but if this property is set to ``0`` it was disabled by the IDF_COMPONENT_MANAGER environment variable
- IDF_PATH - ESP-IDF path; set from IDF_PATH environment variable, if not, inferred from the location of ``idf.cmake``
- IDF_TARGET - target chip for the build; set from the required target argument for ``idf_build_process``
- IDF_VER - ESP-IDF version; set from either a version file or the Git revision of the IDF_PATH repository

6
tools/cmake/build.cmake
View File

@ -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()
@ -434,8 +434,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)

5
tools/cmake/component.cmake
View File

@ -224,9 +224,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"

2
tools/cmake/project.cmake
View File

@ -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()
#