sync: from linuxdeepin/dtklog

Synchronize source files from linuxdeepin/dtklog.

Source-pull-request: linuxdeepin/dtklog#23

Author: deepin-ci-robot

CMakeLists.txt

@@ -4,29 +4,39 @@ SET(CMAKE_CXX_STANDARD 11)
 SET(CMAKE_CXX_STANDARD_REQUIRED ON)
 SET(CMAKE_AUTOMOC ON)
 
-FILE (READ "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" DTK_FILE_VERSION)
-STRING (STRIP "${DTK_FILE_VERSION}" DTK_FILE_VERSION)
-SET (DLOG_VERSION "${DTK_FILE_VERSION}" CACHE STRING "define project version")
-SET (BUILD_WITH_SYSTEMD OFF CACHE BOOL "Build with systemd")
-SET (BUILD_WITH_QT6 OFF CACHE BOOL "Build with Qt6")
-
-IF(BUILD_WITH_QT6)
-  SET(QT_VERSION_MAJOR "6")
-  SET(DTK_VERSION_MAJOR "6")
-ELSE()
-  SET(QT_VERSION_MAJOR "5")
-ENDIF()
+FILE (READ "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" FILE_VERSION)
+STRING (STRIP "${FILE_VERSION}" FILE_VERSION)
 
-SET (DLog "Dtk${DTK_VERSION_MAJOR}Log")
-PROJECT(${DLog}
-  VERSION ${DLOG_VERSION}
+PROJECT(DtkLog
+  VERSION ${FILE_VERSION}
   DESCRIPTION "Simple, convinient and thread safe logger for Qt-based C++ apps"
+  HOMEPAGE_URL "https://github.com/linuxdeepin/dtklog"
   LANGUAGES CXX
 )
 
+SET (BUILD_WITH_SYSTEMD OFF CACHE BOOL "Build with systemd")
+
+# 引入 DTK5/DTK6 构建选项
+option(DTK5 "Build DTK5." ON)
+if(DTK5)
+    set(DTK_VERSION_MAJOR "5")
+    set(DTK_NAME_SUFFIX "")     # DTK5 产品名称后缀为空
+else()
+    set(DTK_VERSION_MAJOR "6")
+    set(DTK_NAME_SUFFIX "6")    # DTK6 产品名称后缀为 "6"
+endif()
+
+set(DTK_VERSION_MINOR ${PROJECT_VERSION_MINOR})
+set(DTK_VERSION_PATCH ${PROJECT_VERSION_PATCH})
+set(DTK_VERSION "${DTK_VERSION_MAJOR}.${DTK_VERSION_MINOR}.${DTK_VERSION_PATCH}")
+# 官方约定：DTK5 使用 Qt5，DTK6 使用 Qt6
+set(QT_VERSION_MAJOR ${DTK_VERSION_MAJOR})
+
+SET (DLog "Dtk${DTK_NAME_SUFFIX}Log")
+
 INCLUDE(GNUInstallDirs)
 INCLUDE(CMakePackageConfigHelpers) # configure_package_config_file
-SET (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/dtk${QT_VERSION_MAJOR}/DLog")
+SET (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/dtk${DTK_VERSION_MAJOR}/DLog")
 SET (LIBRARY_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}")
 SET (CONFIG_CMAKE_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/cmake/${DLog}" CACHE STRING "Install dir for cmake config files")
 SET (MKSPECS_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/qt${QT_VERSION_MAJOR}/mkspecs/modules" CACHE STRING "Install dir for qt pri files")
@@ -77,7 +87,7 @@ IF(BUILD_WITH_SYSTEMD)
   SET(includes ${includes} include/JournalAppender.h)
 ENDIF(BUILD_WITH_SYSTEMD)
 
-SET(library_target dtk${DTK_VERSION_MAJOR}log)
+SET(library_target dtk${DTK_NAME_SUFFIX}log)
 
 ADD_LIBRARY(${library_target} SHARED ${sources} ${includes})
 
@@ -92,8 +102,8 @@ TARGET_LINK_DIRECTORIES(${library_target} INTERFACE
 )
 
 SET_TARGET_PROPERTIES(${library_target} PROPERTIES
-  VERSION ${CMAKE_PROJECT_VERSION}
-  SOVERSION ${CMAKE_PROJECT_VERSION_MAJOR}
+  VERSION ${DTK_VERSION}
+  SOVERSION ${DTK_VERSION_MAJOR}
   EXPORT_NAME Log
 )
 
@@ -142,7 +152,7 @@ CONFIGURE_PACKAGE_CONFIG_FILE(misc/DLogConfig.cmake.in
 )
 WRITE_BASIC_PACKAGE_VERSION_FILE(
     "${CMAKE_CURRENT_BINARY_DIR}/${DLog}ConfigVersion.cmake"
-    VERSION ${DLOG_VERSION}
+    VERSION ${DTK_VERSION}
     COMPATIBILITY SameMajorVersion
 )
 

misc/DLogConfig.cmake.in

@@ -7,7 +7,7 @@ include(CMakeFindDependencyMacro)
 
 include(${CMAKE_CURRENT_LIST_DIR}/@DLog@Targets.cmake)
 
-get_target_property(Dtk@DTK_VERSION_MAJOR@Log_INCLUDE_DIRS Dtk@DTK_VERSION_MAJOR@::Log INTERFACE_INCLUDE_DIRECTORIES)
-get_target_property(Dtk@DTK_VERSION_MAJOR@Log_LIBRARY_DIRS Dtk@DTK_VERSION_MAJOR@::Log INTERFACE_LINK_DIRECTORIES)
+get_target_property(Dtk@DTK_NAME_SUFFIX@Log_INCLUDE_DIRS Dtk@DTK_NAME_SUFFIX@::Log INTERFACE_INCLUDE_DIRECTORIES)
+get_target_property(Dtk@DTK_NAME_SUFFIX@Log_LIBRARY_DIRS Dtk@DTK_NAME_SUFFIX@::Log INTERFACE_LINK_DIRECTORIES)
 check_required_components(@DLog@)
 

misc/dtklog.pc.in

@@ -4,7 +4,8 @@ libdir=${prefix}/@LIBRARY_INSTALL_DIR@
 includedir=${prefix}/@INCLUDE_INSTALL_DIR@
 
 Name: @library_target@
-Description: @CMAKE_PROJECT_DESCRIPTION@
-Version: @CMAKE_PROJECT_VERSION@
+Description: @PROJECT_DESCRIPTION@
+Version: @DTK_VERSION@
 Libs: -L${libdir} -l@library_target@
 Cflags: -I${includedir}
+Requires: Qt@QT_VERSION_MAJOR@Core

misc/qt_lib_dtklog.pri.in

@@ -1,9 +1,9 @@
-QT.dtklog.VERSION = @CMAKE_PROJECT_VERSION@
-QT.dtklog.MAJOR_VERSION = @PROJECT_VERSION_MAJOR@
-QT.dtklog.MINOR_VERSION = @PROJECT_VERSION_MINOR@
-QT.dtklog.PATCH_VERSION = @PROJECT_VERSION_PATCH@
-QT.dtklog.name = dtklog
-QT.dtklog.module = dtk@DTK_VERSION_MAJOR@log
+QT.dtklog.VERSION = @DTK_VERSION@
+QT.dtklog.MAJOR_VERSION = @DTK_VERSION_MAJOR@
+QT.dtklog.MINOR_VERSION = @DTK_VERSION_MINOR@
+QT.dtklog.PATCH_VERSION = @DTK_VERSION_PATCH@
+QT.dtklog.name = dtk@DTK_NAME_SUFFIX@log
+QT.dtklog.module = dtk@DTK_NAME_SUFFIX@log
 QT.dtklog.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@
 QT.dtklog.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@
 QT.dtklog.frameworks =