File tree Expand file tree Collapse file tree 3 files changed +5
-3
lines changed Expand file tree Collapse file tree 3 files changed +5
-3
lines changed Original file line number Diff line number Diff line change 11.DS_Store
22.vscode
3+ managed_components /
34components /arduino /
45components /esp-dl /
56components /esp-sr /
Original file line number Diff line number Diff line change 22# CMakeLists in this exact order for cmake to work correctly
33cmake_minimum_required (VERSION 3.5)
44
5- set (EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR} /components/esp-rainmaker/components ${CMAKE_SOURCE_DIR} /components/esp-insights/components)
5+ set (RMAKER_PATH ${CMAKE_SOURCE_DIR} /components/esp-rainmaker)
6+ set (EXTRA_COMPONENT_DIRS ${RMAKER_PATH} /components/esp-insights/components ${RMAKER_PATH} /components ${CMAKE_SOURCE_DIR} /components/esp-insights/components)
67
78include ($ENV{IDF_PATH} /tools/cmake/project.cmake)
89project (arduino-lib-builder)
Original file line number Diff line number Diff line change @@ -78,7 +78,7 @@ for item in "${@:2:${#@}-5}"; do
7878 item=` get_actual_path $item `
7979 INCLUDES+=" $item "
8080 elif [ " ${item: 0: 2} " = " .." ]; then
81- if [[ " ${item: 0: 14} " = " ../components/" && " ${item: 0: 22} " != " ../components/arduino/" ]] || [[ " ${item: 0: 11} " = " ../esp-idf/" ]]; then
81+ if [[ " ${item: 0: 14} " = " ../components/" && " ${item: 0: 22} " != " ../components/arduino/" ]] || [[ " ${item: 0: 11} " = " ../esp-idf/" ]] || [[ " ${item : 0 : 22} " = " ../managed_components/ " ]] ; then
8282 item=" $PWD ${item: 2} "
8383 item=` get_actual_path $item `
8484 INCLUDES+=" $item "
@@ -362,7 +362,7 @@ for item; do
362362 if [[ " $fname " == " main" && " $dname " == " esp32-arduino-lib-builder" ]]; then
363363 continue
364364 fi
365- while [[ " $dname " != " components" && " $dname " != " build" ]]; do
365+ while [[ " $dname " != " components" && " $dname " != " managed_components " && " $dname " != " build" ]]; do
366366 ipath=` dirname " $ipath " `
367367 fname=` basename " $ipath " `
368368 dname=` basename $( dirname " $ipath " ) `
You can’t perform that action at this time.
0 commit comments