Embedded
/
umcumgr
1
0
Fork 0
Code Releases Activity

Refactor for system tinycbor

This commit is contained in:
Shawn Nock 2019-05-08 14:47:29 +00:00
parent 9d0baf6335
commit 8cab0c7082
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -25,8 +25,7 @@ if (DO_UPLOAD_SHA)
target_sources(umcumgr PRIVATE src/sha256.c) target_sources(umcumgr PRIVATE src/sha256.c)
endif () endif ()
target_include_directories(umcumgr PRIVATE tinycbor/src) find_library(TINYCBOR_LIB tinycbor /usr/local/lib /usr/lib)
find_library(TINYCBOR_LIB tinycbor ${CMAKE_SOURCE_DIR}/tinycbor/lib/)
target_link_libraries(umcumgr ${TINYCBOR_LIB}) target_link_libraries(umcumgr ${TINYCBOR_LIB})
install(TARGETS umcumgr DESTINATION bin) install(TARGETS umcumgr DESTINATION bin)

2
src/image.c
View File

@ -14,7 +14,7 @@
#include "crc.h" #include "crc.h"
#include "image.h" #include "image.h"
#include "nmgr.h" #include "nmgr.h"
#include "cbor.h" #include <tinycbor/cbor.h>
#ifdef DO_UPLOAD_SHA #ifdef DO_UPLOAD_SHA
#include "sha256.h" #include "sha256.h"