Browse Source

Merge branch 'bugfix/fix_ble_examples_build' into 'master'

Fix build issues

See merge request idf/esp-idf!5343
Ivan Grokhotkov 6 years ago
parent
commit
4ea12d432e
2 changed files with 8 additions and 7 deletions
  1. 6 5
      .flake8
  2. 2 2
      components/bt/CMakeLists.txt

+ 6 - 5
.flake8

@@ -140,15 +140,16 @@ exclude =
     .git,
     __pycache__,
     # submodules
-        components/esptool_py/esptool,
         components/bootloader/subproject/components/micro-ecc/micro-ecc,
-        components/nghttp/nghttp2,
-        components/libsodium/libsodium,
+        components/esptool_py/esptool,
+        components/expat/expat,
         components/json/cJSON,
+        components/libsodium/libsodium,
         components/mbedtls/mbedtls,
-        components/expat/expat,
+        components/nghttp/nghttp2,
+        components/nimble/nimble,
         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
         tools/kconfig_new/kconfiglib.py,
     # autogenerated scripts

+ 2 - 2
components/bt/CMakeLists.txt

@@ -288,7 +288,7 @@ if(CONFIG_BT_ENABLED)
 endif()
 
 if (CONFIG_BLE_MESH)
-    list(APPEND COMPONENT_ADD_INCLUDEDIRS
+    list(APPEND include_dirs
         "bluedroid/osi/include"
         "ble_mesh/mesh_core"
         "ble_mesh/mesh_core/include"
@@ -299,7 +299,7 @@ if (CONFIG_BLE_MESH)
         "ble_mesh/api/models/include"
         "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_local_data_operation_api.c"
         "ble_mesh/api/core/esp_ble_mesh_low_power_api.c"