alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_ble_examples_build' into 'master'

Browse Source 
Fix build issues

See merge request idf/esp-idf!5343
This commit is contained in:
Ivan Grokhotkov 2019-06-25 23:04:34 +08:00
commit 4ea12d432e
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.flake8
View File

@ -140,15 +140,16 @@ exclude =
.git, .git,
__pycache__, __pycache__,
# submodules # submodules
components/esptool_py/esptool,
components/bootloader/subproject/components/micro-ecc/micro-ecc, components/bootloader/subproject/components/micro-ecc/micro-ecc,
components/nghttp/nghttp2, components/esptool_py/esptool,
components/libsodium/libsodium,
components/json/cJSON,
components/mbedtls/mbedtls,
components/expat/expat, components/expat/expat,
components/json/cJSON,
components/libsodium/libsodium,
components/mbedtls/mbedtls,
components/nghttp/nghttp2,
components/nimble/nimble,
components/unity/unity, components/unity/unity,
examples/build_system/cmake/import_lib/main/lib/tinyxml2 examples/build_system/cmake/import_lib/main/lib/tinyxml2,
# other third-party libraries # other third-party libraries
tools/kconfig_new/kconfiglib.py, tools/kconfig_new/kconfiglib.py,
# autogenerated scripts # autogenerated scripts

4
components/bt/CMakeLists.txt
View File

@ -288,7 +288,7 @@ if(CONFIG_BT_ENABLED)
endif() endif()
if (CONFIG_BLE_MESH) if (CONFIG_BLE_MESH)
list(APPEND COMPONENT_ADD_INCLUDEDIRS list(APPEND include_dirs
"bluedroid/osi/include" "bluedroid/osi/include"
"ble_mesh/mesh_core" "ble_mesh/mesh_core"
"ble_mesh/mesh_core/include" "ble_mesh/mesh_core/include"
@ -299,7 +299,7 @@ if (CONFIG_BLE_MESH)
"ble_mesh/api/models/include" "ble_mesh/api/models/include"
"ble_mesh/api") "ble_mesh/api")
list(APPEND COMPONENT_SRCS list(APPEND srcs
"ble_mesh/api/core/esp_ble_mesh_common_api.c" "ble_mesh/api/core/esp_ble_mesh_common_api.c"
"ble_mesh/api/core/esp_ble_mesh_local_data_operation_api.c" "ble_mesh/api/core/esp_ble_mesh_local_data_operation_api.c"
"ble_mesh/api/core/esp_ble_mesh_low_power_api.c" "ble_mesh/api/core/esp_ble_mesh_low_power_api.c"