diff --git a/include/nodes/nodes.h b/include/libs/nodes/nodes.h similarity index 100% rename from include/nodes/nodes.h rename to include/libs/nodes/nodes.h diff --git a/include/nodes/nodesShowStmts.h b/include/libs/nodes/nodesShowStmts.h similarity index 100% rename from include/nodes/nodesShowStmts.h rename to include/libs/nodes/nodesShowStmts.h diff --git a/include/nodes/querynodes.h b/include/libs/nodes/querynodes.h similarity index 100% rename from include/nodes/querynodes.h rename to include/libs/nodes/querynodes.h diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index fbf045b99c84830e7ab8204a4901b7fc3b143f2b..2833b329a751286e2f52799118b5147cc4d41b5e 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -3,5 +3,4 @@ add_subdirectory(util) add_subdirectory(common) add_subdirectory(libs) add_subdirectory(client) -add_subdirectory(dnode) -add_subdirectory(nodes) \ No newline at end of file +add_subdirectory(dnode) \ No newline at end of file diff --git a/source/libs/CMakeLists.txt b/source/libs/CMakeLists.txt index 1d23f333b2477d979ed8c8c3ca28ba85bb66050f..049b69991feb2d30fa065bc191d9720d82a3b6e0 100644 --- a/source/libs/CMakeLists.txt +++ b/source/libs/CMakeLists.txt @@ -13,3 +13,4 @@ add_subdirectory(function) add_subdirectory(qcom) add_subdirectory(qworker) add_subdirectory(tfs) +add_subdirectory(nodes) \ No newline at end of file diff --git a/source/nodes/CMakeLists.txt b/source/libs/nodes/CMakeLists.txt similarity index 78% rename from source/nodes/CMakeLists.txt rename to source/libs/nodes/CMakeLists.txt index b30534f3f2e66b412396b7b7980c7629b8a87a02..9a826e034cca5c8b9680250c1c843f808a25b8b7 100644 --- a/source/nodes/CMakeLists.txt +++ b/source/libs/nodes/CMakeLists.txt @@ -2,7 +2,7 @@ aux_source_directory(src NODES_SRC) add_library(nodes STATIC ${NODES_SRC}) target_include_directories( nodes - PUBLIC "${CMAKE_SOURCE_DIR}/include/nodes" + PUBLIC "${CMAKE_SOURCE_DIR}/include/libs/nodes" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" ) target_link_libraries( diff --git a/source/nodes/src/nodesCloneFuncs.c b/source/libs/nodes/src/nodesCloneFuncs.c similarity index 100% rename from source/nodes/src/nodesCloneFuncs.c rename to source/libs/nodes/src/nodesCloneFuncs.c diff --git a/source/nodes/src/nodesCodeFuncs.c b/source/libs/nodes/src/nodesCodeFuncs.c similarity index 100% rename from source/nodes/src/nodesCodeFuncs.c rename to source/libs/nodes/src/nodesCodeFuncs.c diff --git a/source/nodes/src/nodesEqualFuncs.c b/source/libs/nodes/src/nodesEqualFuncs.c similarity index 100% rename from source/nodes/src/nodesEqualFuncs.c rename to source/libs/nodes/src/nodesEqualFuncs.c diff --git a/source/nodes/src/nodesTraverseFuncs.c b/source/libs/nodes/src/nodesTraverseFuncs.c similarity index 100% rename from source/nodes/src/nodesTraverseFuncs.c rename to source/libs/nodes/src/nodesTraverseFuncs.c diff --git a/source/nodes/src/nodesUtilFuncs.c b/source/libs/nodes/src/nodesUtilFuncs.c similarity index 100% rename from source/nodes/src/nodesUtilFuncs.c rename to source/libs/nodes/src/nodesUtilFuncs.c diff --git a/source/nodes/test/CMakeLists.txt b/source/libs/nodes/test/CMakeLists.txt similarity index 100% rename from source/nodes/test/CMakeLists.txt rename to source/libs/nodes/test/CMakeLists.txt diff --git a/source/nodes/test/nodesTest.cpp b/source/libs/nodes/test/nodesTest.cpp similarity index 100% rename from source/nodes/test/nodesTest.cpp rename to source/libs/nodes/test/nodesTest.cpp