From 85db9731e819ea0358c89e74580d6547401d71b2 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Fri, 11 Mar 2022 19:23:29 +0100 Subject: [PATCH] console: argtable3: update build system for v3.2.1 --- components/console/CMakeLists.txt | 22 +++++++++++++++++----- components/console/component.mk | 2 -- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/components/console/CMakeLists.txt b/components/console/CMakeLists.txt index cde2b05cd2..b7789795f8 100644 --- a/components/console/CMakeLists.txt +++ b/components/console/CMakeLists.txt @@ -1,12 +1,24 @@ +set(argtable_srcs argtable3/arg_cmd.c + argtable3/arg_date.c + argtable3/arg_dbl.c + argtable3/arg_dstr.c + argtable3/arg_end.c + argtable3/arg_file.c + argtable3/arg_hashtable.c + argtable3/arg_int.c + argtable3/arg_lit.c + argtable3/arg_rem.c + argtable3/arg_rex.c + argtable3/arg_str.c + argtable3/arg_utils.c + argtable3/argtable3.c) + + idf_component_register(SRCS "commands.c" "esp_console_repl.c" "split_argv.c" - "argtable3/argtable3.c" "linenoise/linenoise.c" + ${argtable_srcs} INCLUDE_DIRS "." REQUIRES vfs PRIV_REQUIRES driver) - -if(CMAKE_C_COMPILER_ID MATCHES "GNU") - set_source_files_properties(argtable3/argtable3.c PROPERTIES COMPILE_FLAGS -Wno-clobbered) -endif() diff --git a/components/console/component.mk b/components/console/component.mk index 703e86d80d..0a6d4945e3 100644 --- a/components/console/component.mk +++ b/components/console/component.mk @@ -1,4 +1,2 @@ COMPONENT_ADD_INCLUDEDIRS := . COMPONENT_SRCDIRS := linenoise argtable3 . - -argtable3/argtable3.o: CFLAGS += -Wno-clobbered