From 4ef641b8d3cb352e04312cee23897b7e362eef71 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Sat, 22 Mar 2025 23:25:04 +0100 Subject: [PATCH] Always build ccid if defined. Signed-off-by: Pol Henarejos --- pico_keys_sdk_import.cmake | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pico_keys_sdk_import.cmake b/pico_keys_sdk_import.cmake index 295d617..a99adf9 100644 --- a/pico_keys_sdk_import.cmake +++ b/pico_keys_sdk_import.cmake @@ -324,7 +324,7 @@ function(add_impl_library target) target_compile_definitions(${target} INTERFACE LIB_${TARGET_UPPER}=1) endfunction() -if(${USB_ITF_HID}) +if(USB_ITF_HID) set(SOURCES ${SOURCES} ${CMAKE_CURRENT_LIST_DIR}/src/usb/hid/hid.c ) @@ -333,6 +333,15 @@ if(${USB_ITF_HID}) ) endif() +if(USB_ITF_CCID) + set(SOURCES ${SOURCES} + ${CMAKE_CURRENT_LIST_DIR}/src/usb/ccid/ccid.c + ) + set(INCLUDES ${INCLUDES} + ${CMAKE_CURRENT_LIST_DIR}/src/usb/ccid + ) +endif() + add_definitions("-fmacro-prefix-map=${CMAKE_CURRENT_LIST_DIR}/=") if(ENABLE_EMULATION) @@ -354,14 +363,6 @@ if(ENABLE_EMULATION) ${CMAKE_CURRENT_LIST_DIR}/src/usb/emulation ) else() - if(USB_ITF_CCID) - set(SOURCES ${SOURCES} - ${CMAKE_CURRENT_LIST_DIR}/src/usb/ccid/ccid.c - ) - set(INCLUDES ${INCLUDES} - ${CMAKE_CURRENT_LIST_DIR}/src/usb/ccid - ) - endif() set(SOURCES ${SOURCES} ${CMAKE_CURRENT_LIST_DIR}/src/usb/usb_descriptors.c )