Skip to content

Commit

Permalink
Merge branch 'docs/extra_component_dirs_v4.4' into 'release/v4.4'
Browse files Browse the repository at this point in the history
docs: fixed EXTRA_COMPONENT_DIRS being mispelled as EXTRA_COMPONENTS_DIRS in build-system guide (v4.4)

See merge request espressif/esp-idf!22801
  • Loading branch information
zikalino committed Mar 27, 2023
2 parents c707cdd + 874371c commit e9e1f8e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion docs/en/api-guides/build-system.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1517,7 +1517,7 @@ This phase sets up necessary parameters for the build.
- Add components in :idf:`components` to the build.
- The initial part of the custom ``project()`` command performs the following steps:
- Set ``IDF_TARGET`` from environment variable or CMake cache and the corresponding ``CMAKE_TOOLCHAIN_FILE`` to be used.
- Add components in ``EXTRA_COMPONENTS_DIRS`` to the build.
- Add components in ``EXTRA_COMPONENT_DIRS`` to the build.
- Prepare arguments for calling command ``idf_build_process()`` from variables such as ``COMPONENTS``/``EXCLUDE_COMPONENTS``, ``SDKCONFIG``, ``SDKCONFIG_DEFAULTS``.

The call to ``idf_build_process()`` command marks the end of this phase.
Expand Down
2 changes: 1 addition & 1 deletion docs/zh_CN/api-guides/build-system.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1519,7 +1519,7 @@ ESP-IDF 构建系统的列表文件位于 :idf:`/tools/cmake` 中。实现构建
- 将 :idf:`components` 中的组件添加到构建中。
- 自定义 ``project()`` 命令的初始部分执行以下步骤:
- 在环境变量或 CMake 缓存中设置 ``IDF_TARGET`` 以及设置相应要使用的``CMAKE_TOOLCHAIN_FILE``。
- 添加 ``EXTRA_COMPONENTS_DIRS`` 中的组件至构建中
- 添加 ``EXTRA_COMPONENT_DIRS`` 中的组件至构建中
- 从 ``COMPONENTS``/``EXCLUDE_COMPONENTS``、``SDKCONFIG``、``SDKCONFIG_DEFAULTS`` 等变量中为调用命令 ``idf_build_process()`` 准备参数。

调用 ``idf_build_process()`` 命令标志着这个阶段的结束。
Expand Down

0 comments on commit e9e1f8e

Please sign in to comment.