Merge pull request #392 from ricardoquesada/cmakefile

esp32: update CMakeLists.txt file to use new idf_component_register
bluekitchen · Dec 30, 2021 · f961481 · f961481
2 parents 162f111 + 4b08a03
commit f961481
Showing 1 changed file with 47 additions and 37 deletions.
diff --git a/port/esp32/components/btstack/CMakeLists.txt b/port/esp32/components/btstack/CMakeLists.txt
@@ -1,46 +1,56 @@
-set(COMPONENT_ADD_INCLUDEDIRS "3rd-party/bluedroid/decoder/include"
-                              "3rd-party/bluedroid/encoder/include"
-                              "3rd-party/hxcmod-player"
-                              "3rd-party/hxcmod-player/mods"
-                              "../lwip/lwip/src/include"
-                              "3rd-party/lwip/dhcp-server"
-                              "3rd-party/md5"
-                              "3rd-party/yxml"
-                              "src/classic"
-                              "src/ble/gatt-service"
-                              "src/ble"
-                              "src/classic"
-                              "src"
-                              "platform/embedded"
-                              "platform/freertos"
-                              "platform/lwip"
-                              "include")
+# Needed to include the lwIP's HTTP app, which is not included by default.
+set(IDF_PATH $ENV{IDF_PATH})
 
-set(COMPONENT_SRCDIRS "3rd-party/bluedroid/decoder/srce"
-                      "3rd-party/bluedroid/encoder/srce"
-                      "3rd-party/hxcmod-player"
-                      "3rd-party/hxcmod-player/mods"
-                      "../lwip/lwip/src/apps/http"
-                      "3rd-party/md5"
-                      "3rd-party/yxml"
-                      "3rd-party/micro-ecc"
-                      "3rd-party/lwip/dhcp-server"
-                      "src/ble/gatt-service"
-                      "src/ble"
-                      "src/classic"
-                      "src/mesh"
-                      "src/"
-                      "platform/freertos"
-                      "platform/lwip"
-                      ".")
+if (CMAKE_HOST_WIN32)
+    string(REPLACE "\\" "/" IDF_PATH $ENV{IDF_PATH})
+endif()
 
-set(COMPONENT_PRIV_INCLUDEDIRS
+set(include_dirs "3rd-party/bluedroid/decoder/include"
+                 "3rd-party/bluedroid/encoder/include"
+                 "3rd-party/hxcmod-player"
+                 "3rd-party/hxcmod-player/mods"
+                 "${IDF_PATH}/components/lwip/lwip/src/include"
+                 "3rd-party/lwip/dhcp-server"
+                 "3rd-party/md5"
+                 "3rd-party/yxml"
+                 "src/classic"
+                 "src/ble/gatt-service"
+                 "src/ble"
+                 "src/classic"
+                 "src"
+                 "platform/embedded"
+                 "platform/freertos"
+                 "platform/lwip"
+                 "include")
+
+set(src_dirs "3rd-party/bluedroid/decoder/srce"
+             "3rd-party/bluedroid/encoder/srce"
+             "3rd-party/hxcmod-player"
+             "3rd-party/hxcmod-player/mods"
+             "${IDF_PATH}/components/lwip/lwip/src/apps/http"
+             "3rd-party/md5"
+             "3rd-party/micro-ecc"
+             "3rd-party/lwip/dhcp-server"
+             "src/ble/gatt-service"
+             "src/ble"
+             "src/classic"
+             "src/mesh"
+             "src/"
+             "platform/freertos"
+             "platform/lwip"
+             ".")
+
+set(priv_include_dirs
         "3rd-party/micro-ecc"
         )
 
-set(COMPONENT_PRIV_REQUIRES
+set(priv_requires
         "nvs_flash"
         "bt"
+        "lwip"
         )
 
-register_component()
+idf_component_register(SRC_DIRS "${src_dirs}"
+                    INCLUDE_DIRS "${include_dirs}"
+                    PRIV_INCLUDE_DIRS "${priv_include_dirs}"
+                    PRIV_REQUIRES ${priv_requires})