gfwleak/mesa-framework-mesa-handle-logger
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新zlog编译和安装过程，install相关工具bin目录

Browse Source
This commit is contained in:
yangwei
2020-09-09 17:32:10 +08:00
parent b4f239ae9c
commit bc575233b7
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/Package.cmake
View File

@@ -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_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_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_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_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") 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_REQUIRES_PRE ${CPACK_RPM_LIBRARIES_PACKAGE_NAME})
set(CPACK_RPM_HEADER_PACKAGE_CONFLICTS ${CPACK_RPM_HEADER_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}") set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}")

9
demo/demo_zlog.conf
View File

@@ -1,8 +1,13 @@
[global] [global]
default format = "%d(%c), %V, %F, %U, %m%n" default format = "%d(%c), %V, %U, %m%n"
[levels] [levels]
DEBUG=10 DEBUG=10
INFO=20 INFO=20
FATAL=30 FATAL=30
[formats]
other = "%d(%c), %V, %F, %U, %m%n"
[rules] [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

16
zlog/CMakeLists.txt
View File

@@ -2,22 +2,22 @@ cmake_minimum_required (VERSION 3.5)
include(ExternalProject) include(ExternalProject)
ExternalProject_Add(zlog ExternalProject_Add(zlog PREFIX zlog
PREFIX zlog
URL ${CMAKE_CURRENT_SOURCE_DIR}/zlog-1.2.15.tar.gz URL ${CMAKE_CURRENT_SOURCE_DIR}/zlog-1.2.15.tar.gz
URL_MD5 155f841543f947bf21112ae4328e7152 URL_MD5 155f841543f947bf21112ae4328e7152
INSTALL_DIR /usr/local/
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
BUILD_COMMAND make BUILD_COMMAND make
INSTALL_COMMAND ""
BUILD_IN_SOURCE 1) BUILD_IN_SOURCE 1)
ExternalProject_Get_Property(zlog INSTALL_DIR) ExternalProject_Get_Property(zlog SOURCE_DIR)
file(MAKE_DIRECTORY ${INSTALL_DIR}/include)
message("-------------minidump ${INSTALL_DIR}, ${SOURCE_DIR}")
add_library(zlog-static STATIC IMPORTED GLOBAL) add_library(zlog-static STATIC IMPORTED GLOBAL)
add_dependencies(zlog-static zlog) add_dependencies(zlog-static zlog)
set_property(TARGET zlog-static PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/libzlog.a) set_property(TARGET zlog-static PROPERTY IMPORTED_LOCATION ${SOURCE_DIR}/src/libzlog.a)
set_property(TARGET zlog-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include) 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)