commit db6ba46244ffefd25cc4e4d61a6baaccea65f0c4
author Jamie McCrae <jamie.mccrae@nordicsemi.no> Tue May 09 10:30:41 2023 +0100
committer Jamie <40387179+nordicjm@users.noreply.github.com> Fri May 12 10:33:28 2023 +0100
tree 573d8c976d04a2f353c4f699be3b9919b8e3b2c8
parent 7a4b1926902536c29957a883ba8be282cc38b74f

boot_serial: Unify zcbor include paths

Moves zcbor files to a subdirectory and replaces differing
include path styles to be unified.

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>

boot/espressif/CMakeLists.txt

diff --git a/boot/espressif/CMakeLists.txt b/boot/espressif/CMakeLists.txt
index f9588d5..90dd749 100644
--- a/boot/espressif/CMakeLists.txt
+++ b/boot/espressif/CMakeLists.txt
@@ -72,6 +72,7 @@
 set(MCUBOOT_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/../..)
 set(BOOTUTIL_DIR ${MCUBOOT_ROOT_DIR}/boot/bootutil)
 set(BOOT_SERIAL_DIR ${MCUBOOT_ROOT_DIR}/boot/boot_serial)
+set(ZCBOR_DIR ${MCUBOOT_ROOT_DIR}/boot/zcbor)
 set(ESPRESSIF_PORT_DIR ${CMAKE_CURRENT_LIST_DIR})
 
 # Find imgtool.
@@ -144,6 +145,7 @@
     ${BOOTUTIL_DIR}/src/swap_scratch.c
     ${BOOTUTIL_DIR}/src/tlv.c
     )
+set(bootutil_paths)
 
 set(CFLAGS
     "-Wno-frame-address"
@@ -220,9 +222,12 @@
     list(APPEND bootutil_srcs
         ${BOOT_SERIAL_DIR}/src/boot_serial.c
         ${BOOT_SERIAL_DIR}/src/serial_recovery_cbor.c
-        ${BOOT_SERIAL_DIR}/src/zcbor_decode.c
-        ${BOOT_SERIAL_DIR}/src/zcbor_encode.c
-        ${BOOT_SERIAL_DIR}/src/zcbor_common.c
+        ${ZCBOR_DIR}/src/zcbor_decode.c
+        ${ZCBOR_DIR}/src/zcbor_encode.c
+        ${ZCBOR_DIR}/src/zcbor_common.c
+        )
+    list(APPEND bootutil_paths
+        ${ZCBOR_DIR}/include
         )
     list(APPEND port_srcs
         ${CMAKE_CURRENT_LIST_DIR}/port/${MCUBOOT_TARGET}/serial_adapter.c
@@ -249,6 +254,7 @@
     ${BOOT_SERIAL_DIR}/include
     ${CRYPTO_INC}
     ${CMAKE_CURRENT_LIST_DIR}/include
+    ${bootutil_paths}
     )
 
 target_link_libraries(