diff --git a/.gitmodules b/.gitmodules index a3e47c5..19ee506 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "dep/zwebservice"] path = dep/zwebservice url = http://47.92.195.73/zlinux_demo_projects/zwebservice.git +[submodule "dep/zservice_container"] + path = dep/zservice_container + url = http://47.92.195.73/zlinux_demo_projects/zservice_container.git diff --git a/CMakeLists.txt b/CMakeLists.txt index d639f15..6654b84 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,6 +30,9 @@ message("CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}") set(DEP_INCLUDE ${DEP_INCLUDE} ./dep/) include(dep/iflytopcpp/module.cmake) +include(dep/websocketcpp/module.cmake) +include(dep/zservice_container/module.cmake) +include(dep/zwebservice/module.cmake) zadd_executable( TARGET diff --git a/dep/iflytopcpp b/dep/iflytopcpp index 8276eeb..ac9441d 160000 --- a/dep/iflytopcpp +++ b/dep/iflytopcpp @@ -1 +1 @@ -Subproject commit 8276eeb2d83cbbcc513c84adbb0dc5e7e53de1b4 +Subproject commit ac9441de375de8bb2d88c48a3eb896c58027875b diff --git a/dep/websocketcpp b/dep/websocketcpp index 63d15e7..5a8b66c 160000 --- a/dep/websocketcpp +++ b/dep/websocketcpp @@ -1 +1 @@ -Subproject commit 63d15e7c147003c4f03f4d90edb81d7db1b4534e +Subproject commit 5a8b66c918e777d1a2b890fb625dc4c9d629a1a9 diff --git a/dep/zservice_container b/dep/zservice_container new file mode 160000 index 0000000..956a5cc --- /dev/null +++ b/dep/zservice_container @@ -0,0 +1 @@ +Subproject commit 956a5cc3a379cb53f38b2c4dadd086a29b05f2c8