refactor(uthash): move to its own library

We will need uthash outside of ocre-core. Move it to its own library.

Signed-off-by: Marco Casaroli <marco.casaroli@gmail.com>

Author: casaroli

CMakeLists.txt

@@ -15,6 +15,9 @@ set(WAMR_BUILD_PLATFORM linux)
 
 include (src/samples/demo/demo_containers.cmake)
 
+# uthash
+add_subdirectory(src/uthash)
+
 # core
 add_subdirectory(src/ocre)
 add_subdirectory(src/runtime)

src/ocre/CMakeLists.txt

@@ -58,7 +58,9 @@ target_sources(OcreCore
     include/ocre/build_info.h
 )
 
-target_link_libraries(OcreCore PUBLIC
+target_link_libraries(OcreCore
+    PUBLIC
+    uthash
     OcrePlatform
     OcreRuntime
     OcreRuntimeWamr

src/ocre/context.c

@@ -13,7 +13,7 @@
 #include <string.h>
 #include <sys/stat.h>
 
-#include "uthash/utlist.h"
+#include <uthash/utlist.h>
 
 #include <ocre/ocre.h>
 #include <ocre/platform/config.h>

src/ocre/ocre.c

@@ -14,14 +14,15 @@
 #include <pthread.h>
 #include <sys/stat.h>
 
+#include <uthash/utlist.h>
+
 #include <ocre/ocre.h>
 #include <ocre/platform/log.h>
 #include <ocre/build_info.h>
 #include <ocre/runtime/wamr/wasip1.h>
 
 #include "context.h"
 #include "util/rm_rf.h"
-#include "uthash/utlist.h"
 
 #include "commit_id.h"
 #include "version.h"

src/uthash/CMakeLists.txt

@@ -0,0 +1,11 @@
+# @copyright Copyright (c) contributors to Project Ocre,
+# which has been established as Project Ocre a Series of LF Projects, LLC
+#
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(uthash INTERFACE)
+
+target_include_directories(uthash
+    INTERFACE
+    include
+)

src/ocre/uthash/LICENSE src/uthash/LICENSEsrc/ocre/uthash/LICENSE renamed to src/uthash/LICENSE

@@ -17,6 +17,7 @@ set(CMAKE_CXX_STANDARD 17)
 
 include (wamr.cmake)
 
+add_subdirectory(../src/uthash "uthash")
 add_subdirectory(../src/ocre "ocre-core")
 add_subdirectory(../src/runtime "ocre-runtime")
 add_subdirectory(../src/runtime/wamr-wasip1 "ocre-runtime-wamr-wasip1")