From f08fe3855341dee6555325269482bd6648e7ab56 Mon Sep 17 00:00:00 2001
From: theshteves <stevenkneiser@gmail.com>
Date: Tue, 23 Apr 2024 19:55:01 -0400
Subject: [PATCH] Add `pico_btstack_mesh` CMake library to link BlueTooth Mesh
 capabilities hidden in BTstack

---
 src/rp2_common/pico_btstack/CMakeLists.txt | 45 +++++++++++++++++++++-
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/src/rp2_common/pico_btstack/CMakeLists.txt b/src/rp2_common/pico_btstack/CMakeLists.txt
index 6a821442a..35c615b83 100644
--- a/src/rp2_common/pico_btstack/CMakeLists.txt
+++ b/src/rp2_common/pico_btstack/CMakeLists.txt
@@ -56,8 +56,6 @@ if (EXISTS ${PICO_BTSTACK_PATH}/${BTSTACK_TEST_PATH})
         ${PICO_BTSTACK_PATH}/src/hci_event.c
         ${PICO_BTSTACK_PATH}/src/l2cap.c
         ${PICO_BTSTACK_PATH}/src/l2cap_signaling.c
-        ${PICO_BTSTACK_PATH}/src/mesh/gatt-service/mesh_provisioning_service_server.c
-        ${PICO_BTSTACK_PATH}/src/mesh/gatt-service/mesh_proxy_service_server.c
         ${PICO_BTSTACK_PATH}/3rd-party/md5/md5.c
         ${PICO_BTSTACK_PATH}/3rd-party/yxml/yxml.c
         ${CMAKE_CURRENT_LIST_DIR}/btstack_stdin_pico.c
@@ -157,6 +155,49 @@ if (EXISTS ${PICO_BTSTACK_PATH}/${BTSTACK_TEST_PATH})
             ENABLE_CLASSIC=1
             )
 
+    pico_add_library(pico_btstack_mesh)
+    target_sources(pico_btstack_mesh INTERFACE
+        ${PICO_BTSTACK_PATH}/src/mesh/mesh.c
+        ${PICO_BTSTACK_PATH}/src/mesh/adv_bearer.c
+        ${PICO_BTSTACK_PATH}/src/mesh/beacon.c
+        ${PICO_BTSTACK_PATH}/src/mesh/gatt_bearer.c
+        ${PICO_BTSTACK_PATH}/src/mesh/gatt-service/mesh_provisioning_service_server.c
+        ${PICO_BTSTACK_PATH}/src/mesh/gatt-service/mesh_proxy_service_server.c
+        ${PICO_BTSTACK_PATH}/src/mesh/mesh.c
+        ${PICO_BTSTACK_PATH}/src/mesh/mesh_access.c
+        ${PICO_BTSTACK_PATH}/src/mesh/mesh_configuration_client.c
+        ${PICO_BTSTACK_PATH}/src/mesh/mesh_configuration_server.c
+        ${PICO_BTSTACK_PATH}/src/mesh/mesh_crypto.c
+        ${PICO_BTSTACK_PATH}/src/mesh/mesh_foundation.c
+        ${PICO_BTSTACK_PATH}/src/mesh/mesh_generic_default_transition_time_client.c
+        ${PICO_BTSTACK_PATH}/src/mesh/mesh_generic_default_transition_time_server.c
+        ${PICO_BTSTACK_PATH}/src/mesh/mesh_generic_level_client.c
+        ${PICO_BTSTACK_PATH}/src/mesh/mesh_generic_level_server.c
+        ${PICO_BTSTACK_PATH}/src/mesh/mesh_generic_on_off_client.c
+        ${PICO_BTSTACK_PATH}/src/mesh/mesh_generic_on_off_server.c
+        ${PICO_BTSTACK_PATH}/src/mesh/mesh_health_server.c
+        ${PICO_BTSTACK_PATH}/src/mesh/mesh_iv_index_seq_number.c
+        ${PICO_BTSTACK_PATH}/src/mesh/mesh_keys.c
+        ${PICO_BTSTACK_PATH}/src/mesh/mesh_lower_transport.c
+        ${PICO_BTSTACK_PATH}/src/mesh/mesh_network.c
+        ${PICO_BTSTACK_PATH}/src/mesh/mesh_node.c
+        ${PICO_BTSTACK_PATH}/src/mesh/mesh_peer.c
+        ${PICO_BTSTACK_PATH}/src/mesh/mesh_proxy.c
+        ${PICO_BTSTACK_PATH}/src/mesh/mesh_upper_transport.c
+        ${PICO_BTSTACK_PATH}/src/mesh/mesh_virtual_addresses.c
+        ${PICO_BTSTACK_PATH}/src/mesh/pb_adv.c
+        ${PICO_BTSTACK_PATH}/src/mesh/pb_gatt.c
+        ${PICO_BTSTACK_PATH}/src/mesh/provisioning.c
+        ${PICO_BTSTACK_PATH}/src/mesh/provisioning_device.c
+        ${PICO_BTSTACK_PATH}/src/mesh/provisioning_provisioner.c
+    )
+    pico_mirrored_target_link_libraries(pico_btstack_mesh INTERFACE
+        pico_btstack_ble
+    )
+    target_compile_definitions(pico_btstack_mesh_headers INTERFACE
+            ENABLE_MESH=1
+            )
+
     pico_add_library(pico_btstack_flash_bank)
     target_sources(pico_btstack_flash_bank INTERFACE
             ${CMAKE_CURRENT_LIST_DIR}/btstack_flash_bank.c