From cefcd3d40ca11140f5bed1b39e188c775fa44f6a Mon Sep 17 00:00:00 2001 From: SanmuWangZJU Date: Thu, 30 Sep 2021 18:11:12 +0800 Subject: [PATCH] add oblogmsg deps by git submodule --- .gitignore | 3 +++ .gitmodules | 4 ++++ CMakeLists.txt | 1 + build.sh | 2 +- 4 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .gitmodules diff --git a/.gitignore b/.gitignore index f726098e33..23990f45ea 100644 --- 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 diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..2e8c5421f9 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "logmessage"] + path = deps/logmessage + url = git@github.com:oceanbase/oblogmsg.git + branch = master diff --git a/CMakeLists.txt b/CMakeLists.txt index dd314aed42..56e6360443 100644 --- 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) diff --git a/build.sh b/build.sh index 6d1485fd9e..3b75633142 100755 --- 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)