diff --git a/CMakeLists.txt b/CMakeLists.txt index 56e6360443dd6362039095f574e04663dd5df459..dd314aed4224a670067f1817894f4eb66de420e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,6 @@ 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 3b75633142bc0cfdcf25c17d3eb68165a03aa325..6d1485fd9eb992906460298e7d8d1d770109e069 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 && git submodule update --init) + (cd $TOPDIR/deps/3rd && bash dep_create.sh) } # make build directory && cmake && make (if need) diff --git a/cmake/Env.cmake b/cmake/Env.cmake index 9792a94fa48e23bfc42f7b58f59b040cf9ea0d1a..3e597365ff6f2cb804b09a2088977472cd06faf6 100644 --- a/cmake/Env.cmake +++ b/cmake/Env.cmake @@ -12,6 +12,7 @@ ob_define(OB_ENABLE_LIB_PCH ${OB_ENABLE_PCH}) ob_define(OB_ENABLE_SERVER_PCH ${OB_ENABLE_PCH}) ob_define(OB_ENALBE_UNITY ON) ob_define(OB_MAX_UNITY_BATCH_SIZE 30) +ob_define(OB_BUILD_LIBOBLOG OFF) ob_define(OB_RELEASEID 1) @@ -25,7 +26,7 @@ set(LD_OPT "-Wl,--build-id=uuid") set(BUILD_OPT "${DEBUG_PREFIX}") if (OB_USE_LLVM_LIBTOOLS) - # use llvm-ar llvm-ranlib llvm-objcopy ld.lld... + # use llvm-ar llvm-ranlib llvm-objcopy ld.lld... set(_CMAKE_TOOLCHAIN_PREFIX llvm-) set(_CMAKE_TOOLCHAIN_LOCATION "${DEVTOOLS_DIR}/bin") set(LD_BIN "${DEVTOOLS_DIR}/bin/ld.lld") diff --git a/src/liboblog/CMakeLists.txt b/src/liboblog/CMakeLists.txt index be67ad5c84c99c54cdf41b23f959b1ba48c04bc1..5c1296de7d86644f6661547e03d6c64b1b604ef3 100644 --- a/src/liboblog/CMakeLists.txt +++ b/src/liboblog/CMakeLists.txt @@ -1,3 +1,18 @@ -add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0) -add_subdirectory(src) -add_subdirectory(tests) +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 --init + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} + RESULT_VARIABLE GIT_SUBMOD_RESULT) + if (NOT GIT_SUBMOD_RESULT EQUAL "0") + message(FATAL_ERROR "git submodule update --init 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) + add_subdirectory(src) + add_subdirectory(tests) + else() + message("cannot find executable git") + endif() +endif() diff --git a/src/liboblog/src/CMakeLists.txt b/src/liboblog/src/CMakeLists.txt index d77c1d331adfd8435686106048b223a711fa1abc..991f91134a6ffd173b790909d72adaa5d5e3cbde 100644 --- a/src/liboblog/src/CMakeLists.txt +++ b/src/liboblog/src/CMakeLists.txt @@ -1,7 +1,7 @@ add_library(oblog_base INTERFACE) target_include_directories(oblog_base INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(oblog_base - INTERFACE ob_base oblogmsg + INTERFACE ob_base oblogmsg_static ) add_library(oblog_miner INTERFACE) diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt index 337ae8e487fa76f7a7d6f3ea8bd465edbd2a75fa..3433f2e51d754e36db9a1eea105f45c74db15877 100644 --- a/unittest/CMakeLists.txt +++ b/unittest/CMakeLists.txt @@ -29,4 +29,6 @@ add_subdirectory(observer) add_subdirectory(share) add_subdirectory(rootserver) add_subdirectory(tools) -add_subdirectory(liboblog) +if (OB_BUILD_LIBOBLOG) + add_subdirectory(liboblog) +endif()