alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/cbor_build_sys_cleanup' into 'master'

Browse Source 
cbor: build system cleanup

See merge request espressif/esp-idf!15190
This commit is contained in:
morris 2021-09-14 13:01:48 +00:00
commit 9e50eafcec
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/cbor/CMakeLists.txt
View File

@ -13,9 +13,3 @@ idf_component_register(SRCS "tinycbor/src/cborencoder_close_container_checked.c"
# for open_memstream.c
set_source_files_properties(tinycbor/src/open_memstream.c PROPERTIES COMPILE_DEFINITIONS "__linux__")
# cbortojson.c:378:17: assignment discards 'const' qualifier from pointer target type
target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-discarded-qualifiers")
# cborvalidation.c:429:22: 'valf' may be used uninitialized
target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-maybe-uninitialized")

2
components/cbor/component.mk
View File

@ -4,5 +4,3 @@ COMPONENT_SRCDIRS := tinycbor/src
COMPONENT_PRIV_INCLUDEDIRS := tinycbor/src
tinycbor/src/open_memstream.o: CFLAGS += -D__linux__
tinycbor/src/cbortojson.o: CFLAGS += -Wno-discarded-qualifiers
tinycbor/src/cborvalidation.o: CFLAGS += -Wno-maybe-uninitialized