Commit ddb7c16
committed
[PR 128] Fix tinycbor include directory
When tinycbor is provided by an external build system (such as required when
git submodules are not supported), the tinycbor headers are placed in a
'tinycbor/' directory:
| #include <tinycbor/cbor.h>
We need to adjust the cbor sources for this directory, which means our
internal dependency needs to be built slightly differently. We copy the
headers to a folder in the build directory, and point the top-level CMake
to this folder.
Fixes build error:
| In file included from cbor_decode_stream.cpp:6:
| cbor_decode_stream.hpp:13:10: fatal error: cbor.h: No such file or directory
| #include <cbor.h>
| ^~~~~~~~1 parent 16d513a commit ddb7c16
File tree
4 files changed
+20
-3
lines changed- core/codec/cbor
- deps
4 files changed
+20
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
113 | 113 | | |
114 | 114 | | |
115 | 115 | | |
116 | | - | |
| 116 | + | |
117 | 117 | | |
118 | 118 | | |
119 | 119 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
14 | 13 | | |
| 14 | + | |
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
| 14 | + | |
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
0 commit comments