reorganized library code

cmake/jsonrpc.cmake

@@ -1,14 +1,19 @@
 # jsonrpc
 
 add_library(jsonrpc STATIC
-	lib/jsonrpc/api.c
+	lib/jsonrpc/src/jsonrpc/api.c
-	lib/jsonrpc/impl/proxy.c
+	lib/jsonrpc/src/jsonrpc/impl/proxy.c
-	lib/jsonrpc/impl/server.c
+	lib/jsonrpc/src/jsonrpc/impl/server.c
-	lib/jsonrpc/impl/method.c
+	lib/jsonrpc/src/jsonrpc/impl/method.c
-	lib/jsonrpc/impl/request.c
+	lib/jsonrpc/src/jsonrpc/impl/request.c
-	lib/jsonrpc/impl/response.c
+	lib/jsonrpc/src/jsonrpc/impl/response.c
-	lib/jsonrpc/impl/error.c
+	lib/jsonrpc/src/jsonrpc/impl/error.c
+)
+
+target_include_directories(jsonrpc PUBLIC 
+	lib/jsonrpc/include
+	lib/jsonrpc/src
+	lib
 )
 
-target_include_directories(jsonrpc PUBLIC lib)
 set_target_properties(jsonrpc PROPERTIES C_VISIBILITY_PRESET hidden)

cmake/unit_tests.cmake

@@ -7,14 +7,14 @@ include(GoogleTest)
 pkg_check_modules(GMOCK gmock)
 
 add_executable(alltests
-	test/jsonrpc/test_util.cc
+	lib/jsonrpc/test/jsonrpc/test_util.cc
-	test/jsonrpc/test_is_request.cc
+	lib/jsonrpc/test/jsonrpc/test_is_request.cc
-	test/jsonrpc/test_request.cc
+	lib/jsonrpc/test/jsonrpc/test_request.cc
-	test/jsonrpc/test_is_response.cc
+	lib/jsonrpc/test/jsonrpc/test_is_response.cc
-	test/jsonrpc/test_response.cc
+	lib/jsonrpc/test/jsonrpc/test_response.cc
-	test/jsonrpc/test_server.cc
+	lib/jsonrpc/test/jsonrpc/test_server.cc
-	test/jsonrpc/test_proxy.cc
+	lib/jsonrpc/test/jsonrpc/test_proxy.cc
-	test/jsonrpc/test_response_parser.cc
+	lib/jsonrpc/test/jsonrpc/test_response_parser.cc
 	test/webfuse/utils/tempdir.cc
 	test/webfuse/utils/file_utils.cc
 	test/webfuse/utils/msleep.cc
@@ -52,6 +52,7 @@ add_executable(alltests
 )
 
 target_include_directories(alltests PRIVATE
+	lib/jsonrpc/include
 	${FUSE3_INCLUDE_DIRS} 
 	${UUID_INCLUDE_DIRS}
 )

cmake/webfuse_adapter.cmake

@@ -32,6 +32,7 @@ add_library(webfuse-adapter-static STATIC
 
 target_include_directories(webfuse-adapter-static PRIVATE
 	lib
+	lib/jsonrpc/include
 	${FUSE3_INCLUDE_DIRS} 
 	${UUID_INCLUDE_DIRS}
 )

cmake/webfuse_core.cmake

@@ -12,7 +12,7 @@ add_library(webfuse-core STATIC
 )
 
 set_target_properties(webfuse-core PROPERTIES OUTPUT_NAME webfuse-core)
-target_include_directories(webfuse-core PUBLIC lib)
+target_include_directories(webfuse-core PUBLIC lib lib/jsonrpc/include)
 set_target_properties(webfuse-core PROPERTIES C_VISIBILITY_PRESET hidden)
 
 install(DIRECTORY include/webfuse/core DESTINATION include/webfuse COMPONENT headers)