Skip to content

Latest TinyUSB does not provide suppresss_tinyusb_warnings() #3163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kilograham wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Latest TinyUSB does not provide suppresss_tinyusb_warnings() #3163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 25 additions & 17 deletions src/rp2_common/tinyusb/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,23 +56,31 @@ if (EXISTS ${PICO_TINYUSB_PATH}/${TINYUSB_TEST_PATH})
target_include_directories(tinyusb_board INTERFACE ${CMAKE_CURRENT_LIST_DIR}/include)
target_link_libraries(tinyusb_board INTERFACE tinyusb_bsp)

# Override suppress_tinyusb_warnings to add suppression of (falsely) reported GCC 11.2 warnings
function(suppress_tinyusb_warnings)
_suppress_tinyusb_warnings()
if (PICO_C_COMPILER_IS_GNU)
set_source_files_properties(
${PICO_TINYUSB_PATH}/src/portable/raspberrypi/rp2040/rp2040_usb.c
PROPERTIES
COMPILE_FLAGS "-Wno-stringop-overflow -Wno-array-bounds")
# suppress warning in our copy of LWIP in case it is used by TinyUSB
set_source_files_properties(
${PICO_LWIP_PATH}/src/core/tcp_in.c
${PICO_LWIP_PATH}/src/core/tcp_out.c
${PICO_LWIP_PATH}/src/core/pbuf.c
PROPERTIES
COMPILE_FLAGS "-Wno-conversion")
endif()
endfunction()
# Latest TinyUSB has removed the suppress_tinyusb_warnings() function. If the function is present
# we assume we want to override it to suppress more warnings; if not we will define an empty
# version since SDK users may assume it exists
if (TARGET suppress_tinyusb_warnings)
# Override existing suppress_tinyusb_warnings to add suppression of (falsely) reported GCC 11.2 warnings
function(suppress_tinyusb_warnings)
_suppress_tinyusb_warnings()
if (PICO_C_COMPILER_IS_GNU)
set_source_files_properties(
${PICO_TINYUSB_PATH}/src/portable/raspberrypi/rp2040/rp2040_usb.c
PROPERTIES
COMPILE_FLAGS "-Wno-stringop-overflow -Wno-array-bounds")
# suppress warning in our copy of LWIP in case it is used by TinyUSB
set_source_files_properties(
${PICO_LWIP_PATH}/src/core/tcp_in.c
${PICO_LWIP_PATH}/src/core/tcp_out.c
${PICO_LWIP_PATH}/src/core/pbuf.c
PROPERTIES
COMPILE_FLAGS "-Wno-conversion")
endif()
endfunction()
else()
function(suppress_tinyusb_warnings)
endfunction()
endif()

pico_promote_common_scope_vars()
endif()
Loading