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

cmake: set COMPONENT_DIR in early expansion

Browse Source 
Gives same treatment to COMPONENT_DIR as COMPONENT_PATH in
https://gitlab.espressif.cn:6688/espressif/esp-idf/merge_requests/4557

Closes https://github.com/espressif/esp-idf/issues/3771
This commit is contained in:
Renz Christian Bagaporo 2019-07-12 16:02:47 +08:00
parent 0114af25da
commit d3e814fe19
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -70,7 +70,7 @@ foreach(component_target ${build_component_targets})
set(COMPONENT_NAME ${_name}) set(COMPONENT_NAME ${_name})
set(COMPONENT_DIR ${dir}) set(COMPONENT_DIR ${dir})
set(COMPONENT_ALIAS ${alias}) set(COMPONENT_ALIAS ${alias})
set(COMPONENT_PATH ${dir}) # also deprecated, see comment in previous loop set(COMPONENT_PATH ${dir}) # for backward compatibility only, COMPONENT_DIR is preferred
idf_build_get_property(build_prefix __PREFIX) idf_build_get_property(build_prefix __PREFIX)
set(__idf_component_context 1) set(__idf_component_context 1)
if(NOT prefix STREQUAL build_prefix) if(NOT prefix STREQUAL build_prefix)

4
tools/cmake/scripts/component_get_requirements.cmake
View File

@ -53,6 +53,10 @@ function(__component_get_requirements)
# and set by the included CMakeLists.txt does not bleed into the next inclusion. # and set by the included CMakeLists.txt does not bleed into the next inclusion.
# We are only interested in the public and private requirements of components # We are only interested in the public and private requirements of components
__component_get_property(__component_dir ${__component_target} COMPONENT_DIR) __component_get_property(__component_dir ${__component_target} COMPONENT_DIR)
__component_get_property(__component_name ${__component_target} COMPONENT_NAME)
set(COMPONENT_NAME ${__component_name})
set(COMPONENT_DIR ${__component_dir})
set(COMPONENT_PATH ${__component_dir}) # for backward compatibility only, COMPONENT_DIR is preferred
include(${__component_dir}/CMakeLists.txt OPTIONAL) include(${__component_dir}/CMakeLists.txt OPTIONAL)
spaces2list(__component_requires) spaces2list(__component_requires)