From 8cab0c70821e6754b8f1b5b9dc88723e502f76c8 Mon Sep 17 00:00:00 2001 From: Shawn Nock Date: Wed, 8 May 2019 14:47:29 +0000 Subject: [PATCH] Refactor for system tinycbor --- CMakeLists.txt | 3 +-- src/image.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e082b8..306a932 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,8 +25,7 @@ if (DO_UPLOAD_SHA) target_sources(umcumgr PRIVATE src/sha256.c) endif () -target_include_directories(umcumgr PRIVATE tinycbor/src) -find_library(TINYCBOR_LIB tinycbor ${CMAKE_SOURCE_DIR}/tinycbor/lib/) +find_library(TINYCBOR_LIB tinycbor /usr/local/lib /usr/lib) target_link_libraries(umcumgr ${TINYCBOR_LIB}) install(TARGETS umcumgr DESTINATION bin) \ No newline at end of file diff --git a/src/image.c b/src/image.c index b9e69f4..aee1d88 100644 --- a/src/image.c +++ b/src/image.c @@ -14,7 +14,7 @@ #include "crc.h" #include "image.h" #include "nmgr.h" -#include "cbor.h" +#include #ifdef DO_UPLOAD_SHA #include "sha256.h"