eaw/esp-idf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/cmake_extra_component_dirs_v3.1' into 'release/v3.1'

Browse Source 
ci: additional Cmake tests for EXTRA_COMPONENT_DIRS (backport v3.1)

See merge request espressif/esp-idf!5493
This commit is contained in:
Jiang Jiang Jian
2019-08-11 16:55:11 +08:00
parent a5db2f0f2d 0138827492
commit 941ec097bb
2 changed files with 60 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
tools/cmake/scripts/expand_requirements.cmake
View File

@@ -85,47 +85,45 @@ endfunction()
# earlier in the component_dirs list take precedence.
function(components_find_all component_dirs component_paths component_names)
# component_dirs entries can be files or lists of files
set(paths "")
set(names "")
set(_paths "")
set(_names "")
# start by expanding the component_dirs list with all subdirectories
foreach(dir ${component_dirs})
# Iterate any subdirectories for values
file(GLOB subdirs LIST_DIRECTORIES true "${dir}/*")
foreach(subdir ${subdirs})
set(component_dirs "${component_dirs};${subdir}")
endforeach()
endforeach()
# Look for a component in each component_dirs entry
foreach(dir ${component_dirs})
debug("Looking for CMakeLists.txt in ${dir}")
file(GLOB component "${dir}/CMakeLists.txt")
if(component)
debug("CMakeLists.txt file ${component}")
get_filename_component(component "${component}" DIRECTORY)
get_filename_component(name "${component}" NAME)
if(EXISTS ${dir}/CMakeLists.txt)
get_filename_component(_path "${dir}" ABSOLUTE)
get_filename_component(_name "${_path}" NAME)
if(NOT name IN_LIST names)
set(names "${names};${name}")
set(paths "${paths};${component}")
list(APPEND _names "${_name}")
list(APPEND _paths "${_path}")
endif()
else() # no CMakeLists.txt file
# test for legacy component.mk and warn
file(GLOB legacy_component "${dir}/component.mk")
if(legacy_component)
else()
if(EXISTS ${dir}/component.mk)
get_filename_component(legacy_component "${legacy_component}" DIRECTORY)
message(WARNING "Component ${legacy_component} contains old-style component.mk but no CMakeLists.txt. "
"Component will be skipped.")
else()
if(NOT __recursing) # recurse only once
file(GLOB subdirs LIST_DIRECTORIES true "${dir}/*")
set(__recursing 1)
components_find_all("${subdirs}" __paths __names)
set(__recursing 0)
if(__paths)
list(APPEND _paths "${__paths}")
list(APPEND _names "${__names}")
endif()
endif()
endif()
endif()
endforeach()
set(${component_paths} ${paths} PARENT_SCOPE)
set(${component_names} ${names} PARENT_SCOPE)
set(${component_paths} "${_paths}" PARENT_SCOPE)
set(${component_names} "${_names}" PARENT_SCOPE)
endfunction()
# expand_component_requirements: Recursively expand a component's requirements,
# setting global properties BUILD_COMPONENTS & BUILD_COMPONENT_PATHS and
# also invoking the components to call register_component() above,