From aec6ef63c175f38c2ea21e0ae4bf3239fd24b3bb Mon Sep 17 00:00:00 2001 From: WolfBolin Date: Mon, 24 Nov 2025 20:20:23 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90CMAKE=E3=80=91=E4=BF=AE=E6=94=B9metric?= =?UTF-8?q?s=E7=BC=96=E8=AF=91=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/litebus/litebus.cmake | 18 +++++++----------- common/logs/logs.cmake | 18 +++++++----------- common/metrics/CMakeLists.txt | 7 ++++--- common/metrics/build.sh | 3 --- common/metrics/cmake/dependencies.cmake | 25 ------------------------- common/metrics/cmake/options.cmake | 4 ---- 6 files changed, 18 insertions(+), 57 deletions(-) delete mode 100644 common/metrics/cmake/dependencies.cmake delete mode 100644 common/metrics/cmake/options.cmake diff --git a/common/litebus/litebus.cmake b/common/litebus/litebus.cmake index 09120be..37db897 100644 --- a/common/litebus/litebus.cmake +++ b/common/litebus/litebus.cmake @@ -12,21 +12,17 @@ # See the License for the specific language governing permissions and # limitations under the License. -set(src_dir ${ROOT_DIR}/common/litebus) -get_filename_component(absolute_src_dir ${src_dir} ABSOLUTE) -set(src_dir ${absolute_src_dir}) - -message(STATUS "litebus src dir: ${src_dir}") -if (NOT EXISTS ${src_dir}/output) - if (EXISTS ${src_dir}) - message(STATUS "begin build litebus on ${src_dir}") - execute_process(COMMAND bash build/build.sh -X 1.1.1 -W off -t off WORKING_DIRECTORY ${src_dir}) +message(STATUS "litebus src dir: ${CMAKE_CURRENT_LIST_DIR}") +if (NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/output) + if (EXISTS ${CMAKE_CURRENT_LIST_DIR}) + message(STATUS "begin build litebus on ${CMAKE_CURRENT_LIST_DIR}") + execute_process(COMMAND bash build/build.sh -X 1.1.1 -W off -t off WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}) endif() endif() -set(litebus_INCLUDE_DIR ${src_dir}/output/include) -set(litebus_LIB_DIR ${src_dir}/output/lib) +set(litebus_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/output/include) +set(litebus_LIB_DIR ${CMAKE_CURRENT_LIST_DIR}/output/lib) set(litebus_LIB ${litebus_LIB_DIR}/liblitebus.so) include_directories(${litebus_INCLUDE_DIR}) diff --git a/common/logs/logs.cmake b/common/logs/logs.cmake index c737a94..4baa261 100644 --- a/common/logs/logs.cmake +++ b/common/logs/logs.cmake @@ -12,22 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -set(src_name yrlogs) -set(src_dir ${ROOT_DIR}/common/logs) -get_filename_component(ABSOLUTE_src_dir ${src_dir} ABSOLUTE) -set(src_dir ${ABSOLUTE_src_dir}) - -message(STATUS "logs src dir: ${src_dir}") +message(STATUS "logs src dir: ${CMAKE_CURRENT_LIST_DIR}") -if (NOT EXISTS ${src_dir}/output) - if (EXISTS ${src_dir}) +if (NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/output) + if (EXISTS ${CMAKE_CURRENT_LIST_DIR}) message(STATUS "begin build yrlogs, download opensrc: ${DOWNLOAD_OPENSRC}, thirdparty src dir: ${THIRDPARTY_SRC_DIR}") - execute_process(COMMAND bash build.sh -x ${DOWNLOAD_OPENSRC} -T ${THIRDPARTY_SRC_DIR} WORKING_DIRECTORY ${src_dir}) + execute_process(COMMAND bash build.sh -x ${DOWNLOAD_OPENSRC} -T ${THIRDPARTY_SRC_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}) endif() endif() -set(${src_name}_INCLUDE_DIR ${src_dir}/output/include) -set(${src_name}_LIB_DIR ${src_dir}/output/lib) +set(src_name yrlogs) +set(${src_name}_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/output/include) +set(${src_name}_LIB_DIR ${CMAKE_CURRENT_LIST_DIR}/output/lib) set(${src_name}_LIB ${${src_name}_LIB_DIR}/libyrlogs.so ${${src_name}_LIB_DIR}/libspdlog.so) include_directories(${${src_name}_INCLUDE_DIR}) diff --git a/common/metrics/CMakeLists.txt b/common/metrics/CMakeLists.txt index 4b08b69..f83c291 100644 --- a/common/metrics/CMakeLists.txt +++ b/common/metrics/CMakeLists.txt @@ -53,13 +53,14 @@ include(securec) include(openssl) include(cjson) include(curl) +if (LOGS_BUILD_TEST) + include(gtest_1_12_1) +endif() # 引入二方件编译的 cmake 文件 include(${CMAKE_CURRENT_LIST_DIR}/../logs/logs.cmake) include(${CMAKE_CURRENT_LIST_DIR}/../litebus/litebus.cmake) +set(litebus_ALL_LIB ${securec_LIB} ${yrlogs_LIB} ${litebus_LIB} pthread) -if (LOGS_BUILD_TEST) - include(gtest_1_12_1) -endif() message(STATUS "Config vendor cmake files done") # --------------------------------------------------------------------------------------- diff --git a/common/metrics/build.sh b/common/metrics/build.sh index 4bc68bd..d8d050a 100644 --- a/common/metrics/build.sh +++ b/common/metrics/build.sh @@ -260,10 +260,7 @@ cmake -G Ninja "${PROJECT_DIR}" -DCMAKE_INSTALL_PREFIX="${OUTPUT_DIR}" \ -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" \ -DBUILD_LLT="${BUILD_LLT}" \ -DBUILD_GCOV="${BUILD_GCOV}" \ - -DROOT_DIR="${YR_ROOT_DIR}" \ -DBUILD_CONFIG_DIR="${BUILD_CONFIG_DIR}" \ - -DTHIRDPARTY_SRC_DIR="${THIRDPARTY_SRC_DIR}" \ - -DTHIRDPARTY_INSTALL_DIR="${THIRDPARTY_INSTALL_DIR}" \ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON # generate compile_commands.json file # Compatible with EulerOS and Ubuntu diff --git a/common/metrics/cmake/dependencies.cmake b/common/metrics/cmake/dependencies.cmake deleted file mode 100644 index da5754b..0000000 --- a/common/metrics/cmake/dependencies.cmake +++ /dev/null @@ -1,25 +0,0 @@ -if("${BUILD_CONFIG_DIR}" STREQUAL "") - message(STATUS "use default thirdparty config dir") - set(BUILD_CONFIG_DIR ${ROOT_DIR}/build) -endif() - -message(STATUS "BUILD_CONFIG_DIR is ${BUILD_CONFIG_DIR}") - -list(APPEND CMAKE_MODULE_PATH ${BUILD_CONFIG_DIR}/thirdparty/cmake) -list(APPEND CMAKE_MODULE_PATH ${BUILD_CONFIG_DIR}/yuanrong/cmake) - -include(litebus) -include(logs) -include(third_utils) -include(zlib) -include(spdlog) -include(securec) -include(openssl) -include(cjson) -include(curl) - -if(BUILD_LLT) - include(gtest_1_12_1) -endif() - -set(litebus_ALL_LIB ${securec_LIB} ${yrlogs_LIB} ${litebus_LIB} pthread) diff --git a/common/metrics/cmake/options.cmake b/common/metrics/cmake/options.cmake deleted file mode 100644 index 75db021..0000000 --- a/common/metrics/cmake/options.cmake +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright (c) Huawei Technologies Co., Ltd. 2023. All rights reserved. - -option(BUILD_GCOV "Enable observability gcov output" OFF) -option(BUILD_LLT "Enable observability unit test" OFF) \ No newline at end of file -- Gitee