From 2b4e7021b20a1051f44f8181fc78afeef4c5017e Mon Sep 17 00:00:00 2001 From: Ricardo Quesada Date: Sat, 23 Dec 2023 09:46:07 -0800 Subject: [PATCH] more cmakefile fixes --- examples/esp32/CMakeLists.txt | 2 ++ examples/pico_w/CMakeLists.txt | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/esp32/CMakeLists.txt b/examples/esp32/CMakeLists.txt index 855decfc..c9071e7f 100644 --- a/examples/esp32/CMakeLists.txt +++ b/examples/esp32/CMakeLists.txt @@ -5,6 +5,8 @@ set(CMAKE_C_STANDARD 17) set(CMAKE_CXX_STANDARD 17) set(BLUEPAD32_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../..) +set(BTSTACK_ROOT ${BLUEPAD32_ROOT}/external/btstack) + set(EXTRA_COMPONENT_DIRS ${BLUEPAD32_ROOT}/src/components) include($ENV{IDF_PATH}/tools/cmake/project.cmake) diff --git a/examples/pico_w/CMakeLists.txt b/examples/pico_w/CMakeLists.txt index b00cb75c..5da514a7 100644 --- a/examples/pico_w/CMakeLists.txt +++ b/examples/pico_w/CMakeLists.txt @@ -7,15 +7,14 @@ else() set(PICO_BOARD "pico_w") endif() -set(BLUEPAD32_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../..) - # initialize the SDK based on PICO_SDK_PATH # note: this must happen before project() include(pico_sdk_import.cmake) +set(BLUEPAD32_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../..) + # To use BTstack from Pico SDK do #set(BTSTACK_ROOT ${PICO_SDK_PATH}/lib/btstack) - # To use it from Bluepad32 (up-to-date, with custom patches for controllers): set(BTSTACK_ROOT ${BLUEPAD32_ROOT}/external/btstack)