mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-04-16 05:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor clean up with include_guard()

Browse Source
This commit is contained in:
hathach 2023-06-26 17:54:31 +07:00
parent 3cfb838ba7
commit 8aa28e63fb
No known key found for this signature in database
GPG Key ID: F5D50C6D51D17CBA
3 changed files with 342 additions and 341 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/cmake.xml generated
View File

@ -25,7 +25,7 @@
</envs> </envs>
</ADDITIONAL_GENERATION_ENVIRONMENT> </ADDITIONAL_GENERATION_ENVIRONMENT>
</configuration> </configuration>
<configuration PROFILE_NAME="rp2040" ENABLED="false" CONFIG_NAME="Debug" GENERATION_OPTIONS="-DBOARD=raspberry_pi_pico" /> <configuration PROFILE_NAME="rp2040" ENABLED="true" CONFIG_NAME="Debug" GENERATION_OPTIONS="-DBOARD=raspberry_pi_pico -DLOG=2 -DLOGGER=RTT" />
<configuration PROFILE_NAME="rt1010 evk" ENABLED="false" CONFIG_NAME="Debug" GENERATION_OPTIONS="-DBOARD=mimxrt1010_evk" /> <configuration PROFILE_NAME="rt1010 evk" ENABLED="false" CONFIG_NAME="Debug" GENERATION_OPTIONS="-DBOARD=mimxrt1010_evk" />
<configuration PROFILE_NAME="rt1060 evk" ENABLED="false" CONFIG_NAME="Debug" GENERATION_OPTIONS="-DBOARD=mimxrt1060_evk" /> <configuration PROFILE_NAME="rt1060 evk" ENABLED="false" CONFIG_NAME="Debug" GENERATION_OPTIONS="-DBOARD=mimxrt1060_evk" />
<configuration PROFILE_NAME="rt1064 evk" ENABLED="false" CONFIG_NAME="Debug" GENERATION_OPTIONS="-DBOARD=mimxrt1064_evk" /> <configuration PROFILE_NAME="rt1064 evk" ENABLED="false" CONFIG_NAME="Debug" GENERATION_OPTIONS="-DBOARD=mimxrt1064_evk" />

4
hw/bsp/rp2040/family.cmake
View File

@ -1,6 +1,5 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.13)
if (NOT TARGET _rp2040_family_inclusion_marker) include_guard()
add_library(_rp2040_family_inclusion_marker INTERFACE)
if (NOT BOARD) if (NOT BOARD)
message("BOARD not specified, defaulting to pico_sdk") message("BOARD not specified, defaulting to pico_sdk")
@ -338,4 +337,3 @@ if (NOT TARGET _rp2040_family_inclusion_marker)
# rp2040 does not support freeRTOS example yet # rp2040 does not support freeRTOS example yet
function(family_add_freertos TARGET) function(family_add_freertos TARGET)
endfunction() endfunction()
endif()

5
src/CMakeLists.txt
View File

@ -75,8 +75,11 @@ endfunction()
#------------------------------------ #------------------------------------
# TinyUSB as library target # TinyUSB as library target
#------------------------------------ #------------------------------------
if (NOT DEFINED TINYUSB_TARGET)
set(TINYUSB_TARGET "tinyusb") set(TINYUSB_TARGET "tinyusb")
set(TINYUSB_CONFIG_TARGET "tinyusb_config") endif ()
set(TINYUSB_CONFIG_TARGET "${TINYUSB_TARGET}_config")
if (DEFINED TINYUSB_TARGET_PREFIX) if (DEFINED TINYUSB_TARGET_PREFIX)
set(TINYUSB_TARGET "${TINYUSB_TARGET_PREFIX}${TINYUSB_TARGET}") set(TINYUSB_TARGET "${TINYUSB_TARGET_PREFIX}${TINYUSB_TARGET}")