You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2018/01/09 02:52:49 UTC

[mynewt-mcumgr] 02/02: Account for mcumgr's move to zephyr's ext/ dir.

This is an automated email from the ASF dual-hosted git repository.

ccollins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-mcumgr.git

commit dd915552d4e0f57846f2b8991c9a7287ee085d5a
Author: Christopher Collins <cc...@apache.org>
AuthorDate: Mon Jan 8 14:05:19 2018 -0800

    Account for mcumgr's move to zephyr's ext/ dir.
---
 CMakeLists.txt                   | 28 ++++++++++++++++++++++++++++
 smp/port/zephyr/src/zephyr_smp.c |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..6c1359d
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,28 @@
+add_library(MCUMGR INTERFACE)
+
+zephyr_include_directories(MCUMGR INTERFACE 
+    cborattr/include
+    cmd/img_mgmt/include
+    cmd/os_mgmt/include
+    mgmt/include
+    smp/include
+    smp/port/zephyr/include
+)
+
+zephyr_library()
+zephyr_library_sources(
+    cborattr/src/cborattr.c
+    cmd/img_mgmt/port/zephyr/src/zephyr_img_mgmt.c
+    cmd/img_mgmt/src/img_mgmt.c
+    cmd/img_mgmt/src/img_mgmt_state.c
+    cmd/img_mgmt/src/img_mgmt_util.c
+    cmd/img_mgmt/src/stubs.c
+    cmd/os_mgmt/src/os_mgmt.c
+    cmd/os_mgmt/src/stubs.c
+    cmd/os_mgmt/port/zephyr/src/zephyr_os_mgmt.c
+    mgmt/src/mgmt.c
+    smp/port/zephyr/src/zephyr_smp.c
+    smp/src/smp.c
+)
+zephyr_library_link_libraries(MCUMGR)
+target_link_libraries(MCUMGR INTERFACE zephyr_interface)
diff --git a/smp/port/zephyr/src/zephyr_smp.c b/smp/port/zephyr/src/zephyr_smp.c
index 823a67c..5daf110 100644
--- a/smp/port/zephyr/src/zephyr_smp.c
+++ b/smp/port/zephyr/src/zephyr_smp.c
@@ -1,7 +1,7 @@
 #include <zephyr.h>
 #include "mgmt/mgmt.h"
 #include "smp/smp.h"
-#include "znp/znp.h"
+#include "mgmt/znp.h"
 #include "zephyr_smp/zephyr_smp.h"
 
 static mgmt_alloc_rsp_fn zephyr_smp_alloc_rsp;

-- 
To stop receiving notification emails like this one, please contact
"commits@mynewt.apache.org" <co...@mynewt.apache.org>.