Fix RainMaker compilation
This commit is contained in:
parent
fe0b1ba098
commit
8c244e1d27
3 changed files with 5 additions and 3 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,5 +1,6 @@
|
|||
.DS_Store
|
||||
.vscode
|
||||
managed_components/
|
||||
components/arduino/
|
||||
components/esp-dl/
|
||||
components/esp-sr/
|
||||
|
|
|
|||
|
|
@ -2,7 +2,8 @@
|
|||
# CMakeLists in this exact order for cmake to work correctly
|
||||
cmake_minimum_required(VERSION 3.5)
|
||||
|
||||
set(EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/components/esp-rainmaker/components ${CMAKE_SOURCE_DIR}/components/esp-insights/components)
|
||||
set(RMAKER_PATH ${CMAKE_SOURCE_DIR}/components/esp-rainmaker)
|
||||
set(EXTRA_COMPONENT_DIRS ${RMAKER_PATH}/components/esp-insights/components ${RMAKER_PATH}/components ${CMAKE_SOURCE_DIR}/components/esp-insights/components)
|
||||
|
||||
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
|
||||
project(arduino-lib-builder)
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ for item in "${@:2:${#@}-5}"; do
|
|||
item=`get_actual_path $item`
|
||||
INCLUDES+="$item "
|
||||
elif [ "${item:0:2}" = ".." ]; then
|
||||
if [[ "${item:0:14}" = "../components/" && "${item:0:22}" != "../components/arduino/" ]] || [[ "${item:0:11}" = "../esp-idf/" ]]; then
|
||||
if [[ "${item:0:14}" = "../components/" && "${item:0:22}" != "../components/arduino/" ]] || [[ "${item:0:11}" = "../esp-idf/" ]] || [[ "${item:0:22}" = "../managed_components/" ]]; then
|
||||
item="$PWD${item:2}"
|
||||
item=`get_actual_path $item`
|
||||
INCLUDES+="$item "
|
||||
|
|
@ -362,7 +362,7 @@ for item; do
|
|||
if [[ "$fname" == "main" && "$dname" == "esp32-arduino-lib-builder" ]]; then
|
||||
continue
|
||||
fi
|
||||
while [[ "$dname" != "components" && "$dname" != "build" ]]; do
|
||||
while [[ "$dname" != "components" && "$dname" != "managed_components" && "$dname" != "build" ]]; do
|
||||
ipath=`dirname "$ipath"`
|
||||
fname=`basename "$ipath"`
|
||||
dname=`basename $(dirname "$ipath")`
|
||||
|
|
|
|||
Loading…
Reference in a new issue