diff --git a/.gitmodules b/.gitmodules index 2e8c5421f9d520a3afebaec819b9b530e4ff85dd..bcea8c3b994ebd86e8e2c9daf55656a76ab50c3d 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 5688f216bfb3b26358084a067eee97b23f25624e..d03d5b78fc5092f88759ade06d3dc882b489ebca 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)