feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/example_sdspi_extra_components_dir' into 'master'

Browse Source 
fix(examples): remove stray EXTRA_COMPONENT_DIRS, fix check

See merge request espressif/esp-idf!33819
This commit is contained in:
Martin Vychodil
2024-10-09 03:31:25 +08:00
parent 5315027e0d 69f74c34a2
commit f2c26b8ec0
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/storage/sd_card/sdspi/CMakeLists.txt
View File

@@ -2,7 +2,6 @@
# in this exact order for cmake to work correctly # in this exact order for cmake to work correctly
cmake_minimum_required(VERSION 3.16) cmake_minimum_required(VERSION 3.16)
list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/examples/storage/sd_card/sdmmc/components/sd_card")
set(COMPONENTS main) set(COMPONENTS main)
include($ENV{IDF_PATH}/tools/cmake/project.cmake) include($ENV{IDF_PATH}/tools/cmake/project.cmake)

3
examples/storage/sd_card/sdspi/main/idf_component.yml Normal file
View File

@@ -0,0 +1,3 @@
dependencies:
sd_card:
path: ${IDF_PATH}/examples/storage/sd_card/sdmmc/components/sd_card

2
tools/ci/check_examples_extra_component_dirs.sh
View File

@@ -5,7 +5,7 @@ set -uo pipefail
# Examples shouldn't use EXTRA_COMPONENT_DIRS, instead the dependencies should be specified in idf_component.yml files # Examples shouldn't use EXTRA_COMPONENT_DIRS, instead the dependencies should be specified in idf_component.yml files
output=$(find ${IDF_PATH}/examples -name "CMakeLists.txt" -not -path "**/managed_components/**" -not -path "**/build/**") output=$(find ${IDF_PATH}/examples -name "CMakeLists.txt" -not -path "**/managed_components/**" -not -path "**/build/**")
files=$(egrep "set\(EXTRA_COMPONENT_DIRS" ${output} | cut -d ":" -f 1) files=$(egrep "EXTRA_COMPONENT_DIRS" ${output} | cut -d ":" -f 1)
found_issues=0 found_issues=0
for file in ${files} for file in ${files}
do do