diff options
| author | jacqueline <me@jacqueline.id.au> | 2022-12-03 07:22:24 +1100 |
|---|---|---|
| committer | jacqueline <me@jacqueline.id.au> | 2022-12-03 07:22:24 +1100 |
| commit | 00d4883d3a683eaf9cfaefacdd81434e0974ad13 (patch) | |
| tree | 4f7d1a4385538e50c5d05e446a91401915b19eeb /tools/cmake/common.cmake | |
| parent | f212c1f02fdb039d9b176a68df1427a1d0d6fc0a (diff) | |
| download | tangara-fw-00d4883d3a683eaf9cfaefacdd81434e0974ad13.tar.gz | |
add a span backport
Diffstat (limited to 'tools/cmake/common.cmake')
| -rw-r--r-- | tools/cmake/common.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/cmake/common.cmake b/tools/cmake/common.cmake index 577a77d5..5afcfd32 100644 --- a/tools/cmake/common.cmake +++ b/tools/cmake/common.cmake @@ -7,9 +7,10 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) set(COMPONENTS "") # External dependencies -list(APPEND EXTRA_COMPONENT_DIRS "$ENV{PROJ_PATH}/lib/result") -list(APPEND EXTRA_COMPONENT_DIRS "$ENV{PROJ_PATH}/lib/lvgl") list(APPEND EXTRA_COMPONENT_DIRS "$ENV{PROJ_PATH}/lib/catch2") +list(APPEND EXTRA_COMPONENT_DIRS "$ENV{PROJ_PATH}/lib/lvgl") +list(APPEND EXTRA_COMPONENT_DIRS "$ENV{PROJ_PATH}/lib/result") +list(APPEND EXTRA_COMPONENT_DIRS "$ENV{PROJ_PATH}/lib/span") include($ENV{IDF_PATH}/tools/cmake/project.cmake) @@ -25,5 +26,6 @@ set(EXTRA_WARNINGS "-Wshadow" "-Wnon-virtual-dtor" "-Wunused" # just be used to setting flags that our external dependencies requires. # Otherwise, prefer adding per-component build flags to keep things neat. idf_build_set_property(COMPILE_OPTIONS "-DLV_CONF_INCLUDE_SIMPLE" APPEND) +idf_build_set_property(COMPILE_OPTIONS "-DTCB_SPAN_NAMESPACE_NAME=cpp" APPEND) include($ENV{PROJ_PATH}/tools/cmake/extra-libs.cmake) |