From bc575233b74ea75cc8f91819a37c926f0ce1310c Mon Sep 17 00:00:00 2001 From: yangwei Date: Wed, 9 Sep 2020 17:32:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0zlog=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E5=92=8C=E5=AE=89=E8=A3=85=E8=BF=87=E7=A8=8B=EF=BC=8Cinstall?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=B7=A5=E5=85=B7bin=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake/Package.cmake | 3 ++- demo/demo_zlog.conf | 9 +++++++-- zlog/CMakeLists.txt | 16 ++++++++-------- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/cmake/Package.cmake b/cmake/Package.cmake index a3e7db1..236d639 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -34,6 +34,7 @@ set(CPACK_RPM_LIBRARIES_PACKAGE_NAME ${MY_RPM_NAME_PREFIX}) set(CPACK_RPM_FILE_NAME "${CPACK_RPM_LIBRARIES_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") set(CPACK_RPM_LIBRARIES_DEBUGINFO_FILE_NAME "${CPACK_RPM_LIBRARIES_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") set(CPACK_COMPONENT_LIBRARIES_GROUP "libraries") +set(CPACK_COMPONENT_EXECUTABLE_GROUP "libraries") set(CPACK_RPM_HEADER_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") set(CPACK_RPM_HEADER_DEBUGINFO_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") @@ -42,7 +43,7 @@ set(CPACK_COMPONENT_HEADER_GROUP "header") set(CPACK_RPM_HEADER_PACKAGE_REQUIRES_PRE ${CPACK_RPM_LIBRARIES_PACKAGE_NAME}) set(CPACK_RPM_HEADER_PACKAGE_CONFLICTS ${CPACK_RPM_HEADER_PACKAGE_NAME}) -set(CPACK_COMPONENTS_ALL LIBRARIES HEADER) +set(CPACK_COMPONENTS_ALL LIBRARIES HEADER EXECUTABLE) set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}") diff --git a/demo/demo_zlog.conf b/demo/demo_zlog.conf index 3f75a03..fd60a90 100644 --- a/demo/demo_zlog.conf +++ b/demo/demo_zlog.conf @@ -1,8 +1,13 @@ [global] -default format = "%d(%c), %V, %F, %U, %m%n" +default format = "%d(%c), %V, %U, %m%n" [levels] DEBUG=10 INFO=20 FATAL=30 +[formats] +other = "%d(%c), %V, %F, %U, %m%n" [rules] -*.* "./log/runtimelog.%d(%F)" +*.=debug "./log/runtimelog_debug.%d(%F)" +*.=info "./log/runtimelog_info.%d(%F)" +*.=fatal "./log/runtimelog_fatal.%d(%F)" +!.* "./log/runtimelog_other.%d(%F)"; other diff --git a/zlog/CMakeLists.txt b/zlog/CMakeLists.txt index 9ff2601..f4ff7a8 100644 --- a/zlog/CMakeLists.txt +++ b/zlog/CMakeLists.txt @@ -2,22 +2,22 @@ cmake_minimum_required (VERSION 3.5) include(ExternalProject) -ExternalProject_Add(zlog - PREFIX zlog +ExternalProject_Add(zlog PREFIX zlog URL ${CMAKE_CURRENT_SOURCE_DIR}/zlog-1.2.15.tar.gz URL_MD5 155f841543f947bf21112ae4328e7152 - INSTALL_DIR /usr/local/ CONFIGURE_COMMAND "" BUILD_COMMAND make + INSTALL_COMMAND "" BUILD_IN_SOURCE 1) -ExternalProject_Get_Property(zlog INSTALL_DIR) -file(MAKE_DIRECTORY ${INSTALL_DIR}/include) +ExternalProject_Get_Property(zlog SOURCE_DIR) + +message("-------------minidump ${INSTALL_DIR}, ${SOURCE_DIR}") add_library(zlog-static STATIC IMPORTED GLOBAL) add_dependencies(zlog-static zlog) -set_property(TARGET zlog-static PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/libzlog.a) -set_property(TARGET zlog-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include) +set_property(TARGET zlog-static PROPERTY IMPORTED_LOCATION ${SOURCE_DIR}/src/libzlog.a) +set_property(TARGET zlog-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${SOURCE_DIR}) -install(PROGRAMS ${INSTALL_DIR}/bin/zlog-chk-conf DESTINATION bin COMPONENT Program) +install(PROGRAMS ${SOURCE_DIR}/src/zlog-chk-conf DESTINATION bin COMPONENT EXECUTABLE)