From c4a5e5d43dfc6b4d413de2e97bb83b40773410a1 Mon Sep 17 00:00:00 2001 From: SanmuWangZJU Date: Wed, 3 Nov 2021 13:46:31 +0800 Subject: [PATCH] [liboblog-ce]provide static lib of liboblog and header of oblogmsg --- cmake/RPM.cmake | 10 +++++++++- src/liboblog/src/CMakeLists.txt | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/cmake/RPM.cmake b/cmake/RPM.cmake index bfec1bc1b..91831cdec 100644 --- a/cmake/RPM.cmake +++ b/cmake/RPM.cmake @@ -68,11 +68,12 @@ set(OCEANBASE_DEVEL_BIN_FILES "") if (OB_BUILD_LIBOBLOG) # lib + # list(APPEND OCEANBASE_DEVEL_LIB_FILES ${CMAKE_BINARY_DIR}/src/liboblog/src/liboblog.a) list(APPEND OCEANBASE_DEVEL_LIB_FILES ${CMAKE_BINARY_DIR}/src/liboblog/src/liboblog.so) list(APPEND OCEANBASE_DEVEL_LIB_FILES ${CMAKE_BINARY_DIR}/src/liboblog/src/liboblog.so.1) list(APPEND OCEANBASE_DEVEL_LIB_FILES ${CMAKE_BINARY_DIR}/src/liboblog/src/liboblog.so.1.0.0) - # include + # include lilboblog header list(APPEND OCEANBASE_DEVEL_INCLUDE_FILES src/liboblog/src/liboblog.h) # bin @@ -100,6 +101,13 @@ install(PROGRAMS COMPONENT devel ) +if (OB_BUILD_LIBOBLOG) + install(DIRECTORY + "deps/logmessage/include/" + DESTINATION /usr/include/oblogmsg + COMPONENT devel) +endif() + ## oceanbase-libs install(PROGRAMS deps/3rd/usr/local/oceanbase/deps/devel/lib/libaio.so.1 diff --git a/src/liboblog/src/CMakeLists.txt b/src/liboblog/src/CMakeLists.txt index 991f91134..668d6a461 100644 --- a/src/liboblog/src/CMakeLists.txt +++ b/src/liboblog/src/CMakeLists.txt @@ -152,7 +152,6 @@ disable_pch(oblog_objects_miner) target_link_libraries(oblog_objects_miner PUBLIC oblog_miner) add_library(oblog_static STATIC - EXCLUDE_FROM_ALL ${CMAKE_BINARY_DIR}/src/observer/ob_version.cpp) target_link_libraries(oblog_static PUBLIC oblog_objects_miner oblib @@ -162,3 +161,4 @@ target_link_libraries(oblog_static PRIVATE -static-libgcc -static-libstdc++ ${LGPL_DEPS} ) +set_target_properties(oblog_static PROPERTIES OUTPUT_NAME "oblog")