espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 12:44:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_regression_with_setting_component_dir_in_early_expansion' into 'master'

Browse Source 
cmake: set COMPONENT_DIR in early expansion

Closes IDFGH-1506

See merge request espressif/esp-idf!5518
This commit is contained in:
Angus Gratton
2019-07-15 11:05:21 +08:00
parent 17e637afa3 d3e814fe19
commit 6ae352c3a0
2 changed files with 5 additions and 1 deletions
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_DIR ${dir})
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)
set(__idf_component_context 1)
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.
# 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_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)
spaces2list(__component_requires)