add oblogmsg deps by git submodule

cefcd3d4 · SanmuWangZJU · wangzelin.wzl · 8fc776d6 · cefcd3d4 · cefcd3d4
隐藏空白更改
内联并排

Showing with 9 addition and 1 deletion

.gitignore .gitignore +3 -0

.gitmodules .gitmodules +4 -0

CMakeLists.txt CMakeLists.txt +1 -0

build.sh build.sh +1 -1

未找到文件。
--- a/.gitignore
+++ b/.gitignore
@@ -90,6 +90,9 @@ test/var
 ###### Docs website files
 docs/site

+##### Git Sub Module
+deps/logmessage
+
 ###### Intellij files
 .idea
 cmake-build-debug

--- a/.gitmodules
+++ b/.gitmodules
+[submodule "logmessage"]
+	path = deps/logmessage
+	url = git@github.com:oceanbase/oblogmsg.git
+	branch = master
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,6 +33,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)

 add_subdirectory(deps/easy)
 add_subdirectory(deps/oblib)
+add_subdirectory(deps/logmessage)
 add_subdirectory(src)

 include(CMakeDependentOption)

--- a/build.sh
+++ b/build.sh
@@ -86,7 +86,7 @@ function prepare_build_dir
 # dep_create
 function do_init
 {
-    (cd $TOPDIR/deps/3rd && bash dep_create.sh)
+    (cd $TOPDIR/deps/3rd && bash dep_create.sh && cd $TOPDIR  &&  git submodule update --init)
 }

 # make build directory && cmake && make (if need)