From ad3164d5e72df996e11f9ab1738f577c3b9ff2ce Mon Sep 17 00:00:00 2001 From: xh0 Date: Tue, 12 Oct 2021 19:42:01 +0800 Subject: [PATCH] fix: submodule config for liboblog --- .gitmodules | 2 +- src/liboblog/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2e8c5421f9..bcea8c3b99 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "logmessage"] path = deps/logmessage - url = git@github.com:oceanbase/oblogmsg.git + url = git@github.com:oceanbase/oblogmsg.git branch = master diff --git a/src/liboblog/CMakeLists.txt b/src/liboblog/CMakeLists.txt index 5688f216bf..d03d5b78fc 100644 --- a/src/liboblog/CMakeLists.txt +++ b/src/liboblog/CMakeLists.txt @@ -2,11 +2,11 @@ message(STATUS "OB_BUILD_LIBOBLOG ${OB_BUILD_LIBOBLOG}") if (OB_BUILD_LIBOBLOG) find_package(Git QUIET) if (GIT_FOUND) - execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --remote + execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --remote WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} RESULT_VARIABLE GIT_SUBMOD_RESULT) if (NOT GIT_SUBMOD_RESULT EQUAL "0") - message(FATAL_ERROR "git submodule update --remote failed with ${GIT_SUBMOD_RESULT}, please checkout submodules") + message(FATAL_ERROR "git submodule update --init --remote failed with ${GIT_SUBMOD_RESULT}, please checkout submodules") endif() add_subdirectory(${PROJECT_SOURCE_DIR}/deps/logmessage ${PROJECT_BINARY_DIR}/deps/logmessage EXCLUDE_FROM_ALL) add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0) -- GitLab