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: fix issues with build process

Browse Source 
Fix issue when COMPONENTS are is not specified for idf_build_process,
no component is included in the build.
This commit is contained in:
Renz Christian Bagaporo 2019-06-15 11:26:32 +08:00
parent 2fff500a1c
commit 64d37f5cb9
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/cmake/build.cmake
View File

@ -367,15 +367,20 @@ macro(idf_build_process target)
__build_check_python() __build_check_python()
idf_build_set_property(__COMPONENT_REQUIRES_COMMON ${target} APPEND) idf_build_set_property(__COMPONENT_REQUIRES_COMMON ${target} APPEND)
__component_get_requirements()
# Perform early expansion of component CMakeLists.txt in CMake scripting mode. # Perform early expansion of component CMakeLists.txt in CMake scripting mode.
# It is here we retrieve the public and private requirements of each component. # It is here we retrieve the public and private requirements of each component.
# It is also here we add the common component requirements to each component's # It is also here we add the common component requirements to each component's
# own requirements. # own requirements.
__component_get_requirements()
idf_build_get_property(component_targets __COMPONENT_TARGETS)
# Finally, do component expansion. In this case it simply means getting a final list # Finally, do component expansion. In this case it simply means getting a final list
# of build component targets given the requirements set by each component. # of build component targets given the requirements set by each component.
# Check if we need to trim the components first, and build initial components list
# from that.
if(__COMPONENTS) if(__COMPONENTS)
unset(component_targets) unset(component_targets)
foreach(component ${__COMPONENTS}) foreach(component ${__COMPONENTS})
@ -390,7 +395,7 @@ macro(idf_build_process target)
foreach(component_target ${component_targets}) foreach(component_target ${component_targets})
__build_expand_requirements(${component_target}) __build_expand_requirements(${component_target})
endforeach() endforeach()
unset(__COMPONENT_TARGETS_SEEN) idf_build_unset_property(__COMPONENT_TARGETS_SEEN)
# Get a list of common component requirements in component targets form (previously # Get a list of common component requirements in component targets form (previously
# we just have a list of component names) # we just have a list of component names)