Skip to content

Commit 8a9d2b4

Browse files
committed
wip
1 parent 629717c commit 8a9d2b4

File tree

3 files changed

+53
-2
lines changed

3 files changed

+53
-2
lines changed

examples/device/cdc_msc/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@ target_include_directories(${PROJECT} PUBLIC
2929
${CMAKE_CURRENT_SOURCE_DIR}/src
3030
)
3131

32+
# define tinyusb_config target
33+
add_library(tinyusb_config INTERFACE)
34+
35+
target_include_directories(tinyusb_config INTERFACE
36+
${CMAKE_CURRENT_SOURCE_DIR}/src
37+
)
38+
3239
# Configure compilation flags and libraries for the example... see the corresponding function
3340
# in hw/bsp/FAMILY/family.cmake for details.
3441
family_configure_device_example(${PROJECT})

hw/bsp/imxrt/family.cmake

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,22 @@ function(family_configure_target TARGET)
7373
${SDK_DIR}/drivers/lpuart
7474
)
7575

76+
# define tinyusb_config target
77+
78+
#target_include_directories(tinyusb_config INTERFACE
79+
# )
80+
81+
target_compile_definitions(tinyusb_config PUBLIC
82+
)
83+
7684
# include tinyusb cmake
77-
include(${TOP}/src/CMakeLists.txt)
78-
add_tinyusb(${TARGET})
85+
add_subdirectory(${TOP}/src ${CMAKE_CURRENT_BINARY_DIR}/tinyusb)
86+
target_link_libraries(${TARGET} PUBLIC
87+
tinyusb
88+
)
89+
90+
#include(${TOP}/src/CMakeLists.txt)
91+
#add_tinyusb(${TARGET})
7992

8093
endfunction()
8194

src/CMakeLists.txt

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,37 @@
33

44
cmake_minimum_required(VERSION 3.17)
55

6+
if (NOT TARGET tinyusb_config)
7+
message(FATAL_ERROR "tinyusb_config target is not defined")
8+
endif()
9+
10+
add_library(tinyusb STATIC
11+
${CMAKE_CURRENT_LIST_DIR}/tusb.c
12+
${CMAKE_CURRENT_LIST_DIR}/common/tusb_fifo.c
13+
${CMAKE_CURRENT_LIST_DIR}/device/usbd.c
14+
${CMAKE_CURRENT_LIST_DIR}/device/usbd_control.c
15+
${CMAKE_CURRENT_LIST_DIR}/class/audio/audio_device.c
16+
${CMAKE_CURRENT_LIST_DIR}/class/cdc/cdc_device.c
17+
${CMAKE_CURRENT_LIST_DIR}/class/dfu/dfu_device.c
18+
${CMAKE_CURRENT_LIST_DIR}/class/dfu/dfu_rt_device.c
19+
${CMAKE_CURRENT_LIST_DIR}/class/hid/hid_device.c
20+
${CMAKE_CURRENT_LIST_DIR}/class/midi/midi_device.c
21+
${CMAKE_CURRENT_LIST_DIR}/class/msc/msc_device.c
22+
${CMAKE_CURRENT_LIST_DIR}/class/net/ecm_rndis_device.c
23+
${CMAKE_CURRENT_LIST_DIR}/class/net/ncm_device.c
24+
${CMAKE_CURRENT_LIST_DIR}/class/usbtmc/usbtmc_device.c
25+
${CMAKE_CURRENT_LIST_DIR}/class/vendor/vendor_device.c
26+
${CMAKE_CURRENT_LIST_DIR}/class/video/video_device.c
27+
)
28+
29+
target_include_directories(tinyusb PUBLIC
30+
${CMAKE_CURRENT_LIST_DIR}
31+
)
32+
33+
target_link_libraries(tinyusb PUBLIC
34+
tinyusb_config
35+
)
36+
637
function(add_tinyusb TARGET)
738
target_sources(${TARGET} PUBLIC
839
${CMAKE_CURRENT_FUNCTION_LIST_DIR}/tusb.c

0 commit comments

Comments
 (0)