Fix Pico Keys SDK build.

Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos
2025-06-22 19:57:15 +02:00
parent d66d1c85b9
commit c45c97ee1f
2 changed files with 14 additions and 14 deletions

View File

@@ -237,7 +237,7 @@ if (ENABLE_EDDSA)
) )
endif() endif()
set(SOURCES ${SOURCES} set(PICO_KEYS_SOURCES ${PICO_KEYS_SOURCES}
${CMAKE_CURRENT_LIST_DIR}/src/main.c ${CMAKE_CURRENT_LIST_DIR}/src/main.c
${CMAKE_CURRENT_LIST_DIR}/src/usb/usb.c ${CMAKE_CURRENT_LIST_DIR}/src/usb/usb.c
${CMAKE_CURRENT_LIST_DIR}/src/fs/file.c ${CMAKE_CURRENT_LIST_DIR}/src/fs/file.c
@@ -260,7 +260,7 @@ set(SOURCES ${SOURCES}
) )
if(ESP_PLATFORM) if(ESP_PLATFORM)
set(SOURCES ${SOURCES} ${CMAKE_CURRENT_LIST_DIR}/src/led/led_neopixel.c) set(PICO_KEYS_SOURCES ${PICO_KEYS_SOURCES} ${CMAKE_CURRENT_LIST_DIR}/src/led/led_neopixel.c)
endif() endif()
## mbedTLS reports an stringop overflow for cmac.c ## mbedTLS reports an stringop overflow for cmac.c
@@ -331,7 +331,7 @@ function(add_impl_library target)
endfunction() endfunction()
if(USB_ITF_HID) if(USB_ITF_HID)
set(SOURCES ${SOURCES} set(PICO_KEYS_SOURCES ${PICO_KEYS_SOURCES}
${CMAKE_CURRENT_LIST_DIR}/src/usb/hid/hid.c ${CMAKE_CURRENT_LIST_DIR}/src/usb/hid/hid.c
) )
set(INCLUDES ${INCLUDES} set(INCLUDES ${INCLUDES}
@@ -340,7 +340,7 @@ if(USB_ITF_HID)
endif() endif()
if(USB_ITF_CCID) if(USB_ITF_CCID)
set(SOURCES ${SOURCES} set(PICO_KEYS_SOURCES ${PICO_KEYS_SOURCES}
${CMAKE_CURRENT_LIST_DIR}/src/usb/ccid/ccid.c ${CMAKE_CURRENT_LIST_DIR}/src/usb/ccid/ccid.c
) )
set(INCLUDES ${INCLUDES} set(INCLUDES ${INCLUDES}
@@ -354,12 +354,12 @@ if(ENABLE_EMULATION)
if(APPLE) if(APPLE)
add_definitions("-Wno-deprecated-declarations") add_definitions("-Wno-deprecated-declarations")
elseif(MSVC) elseif(MSVC)
set(SOURCES ${SOURCES} set(PICO_KEYS_SOURCES ${PICO_KEYS_SOURCES}
${CMAKE_CURRENT_LIST_DIR}/src/fs/mman.c ${CMAKE_CURRENT_LIST_DIR}/src/fs/mman.c
) )
endif() endif()
add_definitions(-DENABLE_EMULATION) add_definitions(-DENABLE_EMULATION)
set(SOURCES ${SOURCES} set(PICO_KEYS_SOURCES ${PICO_KEYS_SOURCES}
${CMAKE_CURRENT_LIST_DIR}/src/usb/emulation/emulation.c ${CMAKE_CURRENT_LIST_DIR}/src/usb/emulation/emulation.c
) )
set(MBEDTLS_SOURCES ${MBEDTLS_SOURCES} set(MBEDTLS_SOURCES ${MBEDTLS_SOURCES}
@@ -369,7 +369,7 @@ if(ENABLE_EMULATION)
${CMAKE_CURRENT_LIST_DIR}/src/usb/emulation ${CMAKE_CURRENT_LIST_DIR}/src/usb/emulation
) )
else() else()
set(SOURCES ${SOURCES} set(PICO_KEYS_SOURCES ${PICO_KEYS_SOURCES}
${CMAKE_CURRENT_LIST_DIR}/src/usb/usb_descriptors.c ${CMAKE_CURRENT_LIST_DIR}/src/usb/usb_descriptors.c
) )
endif() endif()
@@ -415,13 +415,13 @@ if(PICO_RP2350)
set(INCLUDES ${INCLUDES} set(INCLUDES ${INCLUDES}
${CMAKE_CURRENT_LIST_DIR}/config/rp2350/alt ${CMAKE_CURRENT_LIST_DIR}/config/rp2350/alt
) )
set(SOURCES ${SOURCES} set(PICO_KEYS_SOURCES ${PICO_KEYS_SOURCES}
${CMAKE_CURRENT_LIST_DIR}/config/rp2350/alt/sha256_alt.c ${CMAKE_CURRENT_LIST_DIR}/config/rp2350/alt/sha256_alt.c
) )
set(LIBRARIES ${LIBRARIES} pico_sha256) set(LIBRARIES ${LIBRARIES} pico_sha256)
endif() endif()
set(INTERNAL_SOURCES ${SOURCES}) set(INTERNAL_SOURCES ${PICO_KEYS_SOURCES})
set(SOURCES ${SOURCES} ${EXTERNAL_SOURCES}) set(PICO_KEYS_SOURCES ${PICO_KEYS_SOURCES} ${EXTERNAL_SOURCES})
if(NOT TARGET pico_keys_sdk) if(NOT TARGET pico_keys_sdk)
if(ENABLE_EMULATION OR ESP_PLATFORM) if(ENABLE_EMULATION OR ESP_PLATFORM)
add_impl_library(pico_keys_sdk) add_impl_library(pico_keys_sdk)
@@ -430,7 +430,7 @@ if(NOT TARGET pico_keys_sdk)
target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ${LIBRARIES}) target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ${LIBRARIES})
endif() endif()
target_sources(pico_keys_sdk INTERFACE ${SOURCES}) target_sources(pico_keys_sdk INTERFACE ${PICO_KEYS_SOURCES})
target_include_directories(pico_keys_sdk INTERFACE ${INCLUDES}) target_include_directories(pico_keys_sdk INTERFACE ${INCLUDES})
target_link_libraries(pico_keys_sdk INTERFACE ${LIBRARIES}) target_link_libraries(pico_keys_sdk INTERFACE ${LIBRARIES})
endif() endif()

View File

@@ -1,5 +1,5 @@
idf_component_register( idf_component_register(
SRCS ${INTERNAL_SOURCES} SRCS ${PICO_KEYS_SOURCES}
INCLUDE_DIRS . fs rng usb led ../mbedtls/include ../tinycbor/src INCLUDE_DIRS . fs rng usb led ../tinycbor/src
REQUIRES bootloader_support esp_partition esp_tinyusb efuse REQUIRES bootloader_support esp_partition esp_tinyusb efuse mbedtls
) )