[PR 128] Fix tinycbor include directory

eigendude · eigendude · commit ddb7c1689207 · 2020-03-07T20:03:09.000-08:00
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 &lt;tinycbor/cbor.h&gt;

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 &lt;cbor.h&gt;
|           ^~~~~~~~
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -113,7 +113,7 @@ include_directories(
     SYSTEM
     # system includes
     deps/outcome
-    deps/tinycbor/src
+    ${TINY_CBOR_INCLUDE_DIRS}
 )
 
 add_subdirectory(core)
diff --git a/core/codec/cbor/cbor_decode_stream.hpp b/core/codec/cbor/cbor_decode_stream.hpp
@@ -10,8 +10,8 @@
 
 #include <vector>
 
-#include <cbor.h>
 #include <gsl/span>
+#include <tinycbor/cbor.h>
 
 namespace fc::codec::cbor {
   /** Decodes CBOR */
diff --git a/core/codec/cbor/cbor_encode_stream.hpp b/core/codec/cbor/cbor_encode_stream.hpp
@@ -11,7 +11,7 @@
 #include <array>
 #include <vector>
 
-#include <cbor.h>
+#include <tinycbor/cbor.h>
 
 #include "common/enum.hpp"
 
diff --git a/deps/tinycbor.cmake b/deps/tinycbor.cmake
@@ -14,3 +14,20 @@ add_library(tinycbor
     tinycbor/src/cborvalidation.c
     )
 disable_clang_tidy(tinycbor)
+
+# Copy headers for core code to imitate install step
+set(TINY_CBOR_HEADERS
+    cbor.h
+    tinycbor-version.h
+    )
+foreach(header ${TINY_CBOR_HEADERS})
+    configure_file(tinycbor/src/${header}
+        include/tinycbor/${header}
+        COPYONLY
+        )
+endforeach()
+
+set(TINY_CBOR_INCLUDE_DIRS
+    ${CMAKE_BINARY_DIR}/deps/include
+    PARENT_SCOPE
+    )

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ include_directories(`
`113`	`113`	`SYSTEM`
`114`	`114`	`# system includes`
`115`	`115`	`deps/outcome`
`116`		`- deps/tinycbor/src`
	`116`	`+ ${TINY_CBOR_INCLUDE_DIRS}`
`117`	`117`	`)`
`118`	`118`
`119`	`119`	`add_subdirectory(core)`