diff --git a/CMakeLists.txt b/CMakeLists.txt index a74748d5..5fb9d864 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,6 +59,9 @@ else() link_directories(/usr/local/lib) endif() +set(PERSIST_SOURCES + src/persist/persist.c + src/persist/json/persist_json_plugin.c) aux_source_directory(src/parser NEURON_SRC_PARSE) set(NEURON_BASE_SOURCES src/base/tag.c @@ -78,7 +81,8 @@ set(NEURON_BASE_SOURCES src/utils/neu_jwt.c src/utils/base64.c src/utils/async_queue.c - src/utils/mem_cache.c) + src/utils/mem_cache.c + ${PERSIST_SOURCES}) add_library(neuron-base SHARED) target_sources(neuron-base PRIVATE ${NEURON_BASE_SOURCES} ${NEURON_SRC_PARSE}) @@ -93,9 +97,6 @@ add_dependencies(neuron-base neuron-version) #find_package(MbedTLS) target_link_libraries(neuron-base mbedtls mbedx509 mbedcrypto) -set(PERSIST_SOURCES - src/persist/persist.c - src/persist/json/persist_json_plugin.c) set(NEURON_SOURCES src/main.c src/argparse.c @@ -120,8 +121,7 @@ set(NEURON_SOURCES plugins/restful/plugin_handle.c plugins/restful/version_handle.c plugins/restful/rest.c - plugins/restful/user.c - ${PERSIST_SOURCES}) + plugins/restful/user.c) set(CMAKE_BUILD_RPATH ./) add_executable(neuron) diff --git a/src/persist/json/persist_json_plugin.h b/include/neuron/persist/json/persist_json_plugin.h similarity index 100% rename from src/persist/json/persist_json_plugin.h rename to include/neuron/persist/json/persist_json_plugin.h diff --git a/src/persist/persist.h b/include/neuron/persist/persist.h similarity index 99% rename from src/persist/persist.h rename to include/neuron/persist/persist.h index 7588d568..15931698 100644 --- a/src/persist/persist.h +++ b/include/neuron/persist/persist.h @@ -310,4 +310,4 @@ int neu_persister_delete_user(const char *user_name); } #endif -#endif \ No newline at end of file +#endif diff --git a/src/persist/json/persist_json_plugin.c b/src/persist/json/persist_json_plugin.c index 40be1bd3..0c33eea2 100644 --- a/src/persist/json/persist_json_plugin.c +++ b/src/persist/json/persist_json_plugin.c @@ -27,7 +27,7 @@ #include "json/json.h" -#include "persist_json_plugin.h" +#include "persist/json/persist_json_plugin.h" int neu_json_decode_plugin_req(char *buf, neu_json_plugin_req_t **result) {