From bc6ebdd069e2e4fc6efa7a2afaf4a1bc1bb55a82 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Thu, 22 Jan 2026 12:09:42 +0100 Subject: [PATCH] Upgrade to new layout Signed-off-by: Pol Henarejos --- CMakeLists.txt | 4 ++-- pico-keys-sdk | 2 +- src/fido/CMakeLists.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1cc83a2..3d70791 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ cmake_minimum_required(VERSION 3.13) if(ESP_PLATFORM) set(DENABLE_POWER_ON_RESET 0) -set(EXTRA_COMPONENT_DIRS src pico-keys-sdk/src) +set(EXTRA_COMPONENT_DIRS pico-keys-sdk/config/esp32/components src/fido) include($ENV{IDF_PATH}/tools/cmake/project.cmake) else() @@ -161,7 +161,7 @@ if(ENABLE_EMULATION) -Wl,--gc-sections ) endif (APPLE) - target_link_libraries(pico_fido PRIVATE pthread m) + target_link_libraries(pico_fido PRIVATE pico_keys_sdk mbedtls pthread m) else() target_link_libraries(pico_fido PRIVATE pico_keys_sdk pico_stdlib pico_multicore hardware_flash hardware_sync hardware_adc pico_unique_id pico_aon_timer tinyusb_device tinyusb_board) pico_add_extra_outputs(${CMAKE_PROJECT_NAME}) diff --git a/pico-keys-sdk b/pico-keys-sdk index 8a0ef0b..b5c2e55 160000 --- a/pico-keys-sdk +++ b/pico-keys-sdk @@ -1 +1 @@ -Subproject commit 8a0ef0b30cf4fa586b415a37578695efe35a04be +Subproject commit b5c2e55c7196a2e12429b30b971e152001588eae diff --git a/src/fido/CMakeLists.txt b/src/fido/CMakeLists.txt index e6dfbac..e9c6774 100644 --- a/src/fido/CMakeLists.txt +++ b/src/fido/CMakeLists.txt @@ -1,6 +1,6 @@ idf_component_register( SRCS ${SOURCES} - INCLUDE_DIRS . ../../pico-keys-sdk/src ../../pico-keys-sdk/src/fs ../../pico-keys-sdk/src/rng ../../pico-keys-sdk/src/usb ../../pico-keys-sdk/tinycbor/src - REQUIRES esp_tinyusb mbedtls efuse + INCLUDE_DIRS . + REQUIRES esp_tinyusb mbedtls efuse pico-keys-sdk ) idf_component_set_property(${COMPONENT_NAME} WHOLE_ARCHIVE ON)