File tree 3 files changed +5
-3
lines changed
3 files changed +5
-3
lines changed Original file line number Diff line number Diff line change 1
1
.DS_Store
2
2
.vscode
3
+ managed_components /
3
4
components /arduino /
4
5
components /esp-dl /
5
6
components /esp-sr /
Original file line number Diff line number Diff line change 2
2
# CMakeLists in this exact order for cmake to work correctly
3
3
cmake_minimum_required (VERSION 3.5)
4
4
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)
6
7
7
8
include ($ENV{IDF_PATH} /tools/cmake/project.cmake)
8
9
project (arduino-lib-builder)
Original file line number Diff line number Diff line change @@ -78,7 +78,7 @@ for item in "${@:2:${#@}-5}"; do
78
78
item=` get_actual_path $item `
79
79
INCLUDES+=" $item "
80
80
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
82
82
item=" $PWD ${item: 2} "
83
83
item=` get_actual_path $item `
84
84
INCLUDES+=" $item "
@@ -362,7 +362,7 @@ for item; do
362
362
if [[ " $fname " == " main" && " $dname " == " esp32-arduino-lib-builder" ]]; then
363
363
continue
364
364
fi
365
- while [[ " $dname " != " components" && " $dname " != " build" ]]; do
365
+ while [[ " $dname " != " components" && " $dname " != " managed_components " && " $dname " != " build" ]]; do
366
366
ipath=` dirname " $ipath " `
367
367
fname=` basename " $ipath " `
368
368
dname=` basename $( dirname " $ipath " ) `
You can’t perform that action at this time.
0 commit comments