Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/fix_extra_component_dirs_ordering' into 'master'

Browse source 
cmake: fix extra component dir ordering

See merge request espressif/esp-idf!7731
This commit is contained in:
Angus Gratton 2020-06-15 12:16:52 +08:00
commit 534114879c
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tools/cmake/project.cmake
View file

@ -217,18 +217,18 @@ function(__project_init components_var test_components_var)
"but component manager is not enabled. Please set IDF_COMPONENT_MANAGER environment variable.") "but component manager is not enabled. Please set IDF_COMPONENT_MANAGER environment variable.")
endif() endif()
spaces2list(EXTRA_COMPONENT_DIRS)
foreach(component_dir ${EXTRA_COMPONENT_DIRS})
__project_component_dir("${component_dir}")
endforeach()
__project_component_dir("${CMAKE_CURRENT_LIST_DIR}/components")
# Look for components in the usual places: CMAKE_CURRENT_LIST_DIR/main, # Look for components in the usual places: CMAKE_CURRENT_LIST_DIR/main,
# CMAKE_CURRENT_LIST_DIR/components, and the extra component dirs # CMAKE_CURRENT_LIST_DIR/components, and the extra component dirs
if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/main") if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/main")
__project_component_dir("${CMAKE_CURRENT_LIST_DIR}/main") __project_component_dir("${CMAKE_CURRENT_LIST_DIR}/main")
endif() endif()
__project_component_dir("${CMAKE_CURRENT_LIST_DIR}/components")
spaces2list(EXTRA_COMPONENT_DIRS)
foreach(component_dir ${EXTRA_COMPONENT_DIRS})
__project_component_dir("${component_dir}")
endforeach()
endif() endif()
spaces2list(COMPONENTS) spaces2list(COMPONENTS)