sync: from linuxdeepin/dtkcore

CMakeLists.txt

@@ -1,11 +1,10 @@
 cmake_minimum_required (VERSION 3.13)
 
-file(READ "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" DTK_FILE_VERSION)
-string(STRIP "${DTK_FILE_VERSION}" DTK_FILE_VERSION)
-set(DTK_VERSION "${DTK_FILE_VERSION}" CACHE STRING "DTK version")
+file(READ "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" FILE_VERSION)
+string(STRIP "${FILE_VERSION}" FILE_VERSION)
 
 project (DtkCore
-  VERSION ${DTK_VERSION}
+  VERSION ${FILE_VERSION}
   DESCRIPTION "DTK Core module"
   HOMEPAGE_URL "https://github.com/linuxdeepin/dtkcore"
   LANGUAGES CXX C
@@ -18,13 +17,19 @@ endif ()
 include(GNUInstallDirs)
 include(CMakePackageConfigHelpers)
 
-if("${PROJECT_VERSION_MAJOR}" STREQUAL "5")
-    set(QT_VERSION_MAJOR "5")
-elseif("${PROJECT_VERSION_MAJOR}" STREQUAL "6")
-    set(QT_VERSION_MAJOR "6")
-    set(DTK_VERSION_MAJOR "6")
+option(DTK5 "Build DTK5." ON)
+if(DTK5)
+    set(DTK_VERSION_MAJOR "5")
+    set(DTK_NAME_SUFFIX "") # Empty name suffix for DTK5 products.
 else()
-    message(SEND_ERROR "not support Prject Version ${PROJECT_VERSION}.")
+    set(DTK_VERSION_MAJOR "6")
+    set(DTK_NAME_SUFFIX "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}")
+# Officially, DTK5 uses QT5, DTK6 uses QT6
+set(QT_VERSION_MAJOR ${DTK_VERSION_MAJOR})
+
 include(dtkcore.cmake)

cmake/DtkCMake/DtkCMakeConfig.cmake.in

@@ -6,7 +6,7 @@ endfunction()
 add_definitions(-DQ_HOST_NAME=\"${CMAKE_HOST_SYSTEM_PROCESSOR}\")
 addDefinitions(Q_HOST_${CMAKE_HOST_SYSTEM_PROCESSOR})
 
-find_package(Dtk@DTK_VERSION_MAJOR@Core REQUIRED)
+find_package(Dtk@DTK_NAME_SUFFIX@Core REQUIRED)
 
 set(DEEPIN_OS_RELEASE_TOOL_PATH ${DtkCore_TOOL_DIRS})
 set(DEEPIN_OS_RELEASE_TOOL ${DEEPIN_OS_RELEASE_TOOL_PATH}/deepin-os-release)

cmake/DtkTools/DtkToolsConfig.cmake.in

@@ -1,16 +1,16 @@
 include(CMakeFindDependencyMacro)
-find_dependency(Dtk@DTK_VERSION_MAJOR@Core REQUIRED)
+find_dependency(Dtk@DTK_NAME_SUFFIX@Core REQUIRED)
 
 set (DTK_SETTINGS_TOOLS_EXECUTABLE ${DtkCore_TOOL_DIRS}/dtk-settings)
 
 if (EXISTS ${DTK_SETTINGS_TOOLS_EXECUTABLE})
     set(DTK_SETTINGS_TOOLS_FOUND TRUE)
 endif ()
 
-include("${CMAKE_CURRENT_LIST_DIR}/Dtk@DTK_VERSION_MAJOR@SettingsToolsMacros.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/Dtk@DTK_VERSION_MAJOR@ToolsTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/Dtk@DTK_NAME_SUFFIX@SettingsToolsMacros.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/Dtk@DTK_NAME_SUFFIX@ToolsTargets.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/DtkDBusMacros.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/DtkDConfigMacros.cmake")
 
-get_target_property(DTK_XML2CPP Dtk@DTK_VERSION_MAJOR@::Xml2Cpp LOCATION)
-get_target_property(DTK_DCONFIG2CPP Dtk@DTK_VERSION_MAJOR@::DConfig2Cpp LOCATION)
+get_target_property(DTK_XML2CPP Dtk@DTK_NAME_SUFFIX@::Xml2Cpp LOCATION)
+get_target_property(DTK_DCONFIG2CPP Dtk@DTK_NAME_SUFFIX@::DConfig2Cpp LOCATION)

docs/CMakeLists.txt

@@ -7,7 +7,7 @@ set (DOXYGEN_GENERATE_HTML YES CACHE STRING "Doxygen HTML output")
 set (DOXYGEN_GENERATE_XML YES CACHE STRING "Doxygen XML output")
 set (DOXYGEN_GENERATE_QHP YES CACHE STRING "Doxygen QHP output")
 set (DOXYGEN_FILE_PATTERNS *.cpp *.h *.zh_CN.md *.zh_CN.dox CACHE STRING "Doxygen File Patterns")
-set (DOXYGEN_PROJECT_NUMBER ${CMAKE_PROJECT_VERSION} CACHE STRING "") # Should be the same as this project is using.
+set (DOXYGEN_PROJECT_NUMBER ${DTK_VERSION} CACHE STRING "") # Should be the same as this project is using.
 set (DOXYGEN_EXTRACT_STATIC YES)
 set (DOXYGEN_OUTPUT_LANGUAGE "Chinese")
 

dtkcore.cmake

@@ -1,18 +1,16 @@
-set(LIB_NAME dtk${DTK_VERSION_MAJOR}core)
-set(DtkCore Dtk${DTK_VERSION_MAJOR}Core)
+set(LIB_NAME dtk${DTK_NAME_SUFFIX}core)
+set(DtkCore Dtk${DTK_NAME_SUFFIX}Core)
 
 macro(add_sub_dir dir)
-#    message("add_subdirectory(${dir} ${OUTPUT_DIR}/${dir})")
     add_subdirectory(${dir} ${OUTPUT_DIR}/${dir})
 endmacro()
 
-message("Current Qt Version: ${QT_VERSION_MAJOR}")
-message("Current Dtk Version: ${DTK_VERSION_MAJOR}")
+message(STATUS "Compiling with DTK major version: ${DTK_VERSION_MAJOR}, Qt major version: ${QT_VERSION_MAJOR}")
 
 set(OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
 set (LIBRARY_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}")
-set (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/dtk${PROJECT_VERSION_MAJOR}/DCore")
-set (TOOL_INSTALL_DIR "${CMAKE_INSTALL_LIBEXECDIR}/dtk${PROJECT_VERSION_MAJOR}/DCore/bin")
+set (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/dtk${DTK_VERSION_MAJOR}/DCore")
+set (TOOL_INSTALL_DIR "${CMAKE_INSTALL_LIBEXECDIR}/dtk${DTK_VERSION_MAJOR}/DCore/bin")
 set (MKSPECS_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/qt${QT_VERSION_MAJOR}/mkspecs/modules" CACHE STRING "Install dir for qt pri files")
 set (FEATURES_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/qt${QT_VERSION_MAJOR}/mkspecs/features" CACHE STRING "Install dir for qt prf files")
 set (CONFIG_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${DtkCore}" CACHE STRING "Install dir for cmake config files")
@@ -74,35 +72,31 @@ if(BUILD_EXAMPLES)
 endif()
 add_sub_dir(tools)
 
-if("${QT_VERSION_MAJOR}" STREQUAL "6")
-  set(DTK_VERSION_MAJOR 6)
-endif()
-
 configure_package_config_file(cmake/DtkCMake/DtkCMakeConfig.cmake.in
-    ${CMAKE_CURRENT_BINARY_DIR}/cmake/DtkCMake/Dtk${DTK_VERSION_MAJOR}CMakeConfig.cmake
-    INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Dtk${DTK_VERSION_MAJOR}CMake"
+    ${CMAKE_CURRENT_BINARY_DIR}/cmake/DtkCMake/Dtk${DTK_NAME_SUFFIX}CMakeConfig.cmake
+    INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Dtk${DTK_NAME_SUFFIX}CMake"
     PATH_VARS TOOL_INSTALL_DIR)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/DtkCMake/Dtk${DTK_VERSION_MAJOR}CMakeConfig.cmake
-    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Dtk${DTK_VERSION_MAJOR}CMake")
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/DtkCMake/Dtk${DTK_NAME_SUFFIX}CMakeConfig.cmake
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Dtk${DTK_NAME_SUFFIX}CMake")
 
 configure_package_config_file(cmake/DtkTools/DtkToolsConfig.cmake.in
-    ${CMAKE_CURRENT_BINARY_DIR}/cmake/DtkTools/Dtk${DTK_VERSION_MAJOR}ToolsConfig.cmake
-    INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Dtk${DTK_VERSION_MAJOR}Tools
+    ${CMAKE_CURRENT_BINARY_DIR}/cmake/DtkTools/Dtk${DTK_NAME_SUFFIX}ToolsConfig.cmake
+    INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Dtk${DTK_NAME_SUFFIX}Tools
     PATH_VARS TOOL_INSTALL_DIR)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/DtkTools/Dtk${DTK_VERSION_MAJOR}ToolsConfig.cmake
-    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Dtk${DTK_VERSION_MAJOR}Tools")
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/DtkTools/Dtk${DTK_NAME_SUFFIX}ToolsConfig.cmake
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Dtk${DTK_NAME_SUFFIX}Tools")
 
 install(FILES cmake/DtkTools/DtkSettingsToolsMacros.cmake
-    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Dtk${DTK_VERSION_MAJOR}Tools"
-    RENAME Dtk${DTK_VERSION_MAJOR}SettingsToolsMacros.cmake)
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Dtk${DTK_NAME_SUFFIX}Tools"
+    RENAME Dtk${DTK_NAME_SUFFIX}SettingsToolsMacros.cmake)
 
 install(FILES cmake/DtkTools/DtkDBusMacros.cmake
-        DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Dtk${DTK_VERSION_MAJOR}Tools")
+        DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Dtk${DTK_NAME_SUFFIX}Tools")
 
 install(FILES ${CMAKE_SOURCE_DIR}/cmake/DtkTools/DtkDConfigMacros.cmake
-        DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Dtk${DTK_VERSION_MAJOR}Tools")
+        DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Dtk${DTK_NAME_SUFFIX}Tools")
 
-if (NOT DTK_VERSION_MAJOR)
+if (NOT DTK5)
     set(DCONFIG_DEPRECATED_FUNCS [=[
 # deprecated since dtk6
 function(dconfig_meta_files)
@@ -114,11 +108,11 @@ endfunction()]=])
 endif()
 
 configure_package_config_file(cmake/DtkDConfig/DtkDConfigConfig.cmake.in
-    ${CMAKE_CURRENT_BINARY_DIR}/cmake/DtkDConfig/Dtk${DTK_VERSION_MAJOR}DConfigConfig.cmake
-    INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Dtk${DTK_VERSION_MAJOR}DConfig"
+    ${CMAKE_CURRENT_BINARY_DIR}/cmake/DtkDConfig/Dtk${DTK_NAME_SUFFIX}DConfigConfig.cmake
+    INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Dtk${DTK_NAME_SUFFIX}DConfig"
     PATH_VARS TOOL_INSTALL_DIR)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/DtkDConfig/Dtk${DTK_VERSION_MAJOR}DConfigConfig.cmake
-    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Dtk${DTK_VERSION_MAJOR}DConfig")
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/DtkDConfig/Dtk${DTK_NAME_SUFFIX}DConfigConfig.cmake
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Dtk${DTK_NAME_SUFFIX}DConfig")
 
 configure_package_config_file(misc/DtkCoreConfig.cmake.in
     ${CMAKE_CURRENT_BINARY_DIR}/${DtkCore}Config.cmake
@@ -141,11 +135,11 @@ install(FILES misc/dtk_install_dconfig.prf DESTINATION ${FEATURES_INSTALL_DIR})
 set(CONFIGNAME ${PROJECT_BINARY_DIR}/dtkcore_config.h)
 file(WRITE ${CONFIGNAME}
   "// it is auto make config\n"
-  "#define DTK_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}\n"
-  "#define DTK_VERSION_MINOR ${PROJECT_VERSION_MINOR}\n"
-  "#define DTK_VERSION_PATCH ${PROJECT_VERSION_PATCH}\n"
+  "#define DTK_VERSION_MAJOR ${DTK_VERSION_MAJOR}\n"
+  "#define DTK_VERSION_MINOR ${DTK_VERSION_MINOR}\n"
+  "#define DTK_VERSION_PATCH ${DTK_VERSION_PATCH}\n"
   "#define DTK_VERSION_BUILD ${BUILD_VERSION}\n"
-  "#define DTK_VERSION_STR \"${PROJECT_VERSION}\"\n"
+  "#define DTK_VERSION_STR \"${DTK_VERSION}\"\n"
   "\n"
 )
 file(GLOB CONFIGSOURCE include/DtkCore/*)

examples/dlog-example/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(BIN_NAME dlog${DTK_VERSION_MAJOR})
+set(BIN_NAME dlog${DTK_NAME_SUFFIX})
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core)
 

examples/expintf-example/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(BIN_NAME exprintf${DTK_VERSION_MAJOR})
+set(BIN_NAME exprintf${DTK_NAME_SUFFIX})
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS DBus)
 

examples/filewatcher-example/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(BIN_NAME filewatcher${DTK_VERSION_MAJOR})
+set(BIN_NAME filewatcher${DTK_NAME_SUFFIX})
 
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core)
 

examples/textcodec-example/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(BIN_NAME textcodec${DTK_VERSION_MAJOR})
+set(BIN_NAME textcodec${DTK_NAME_SUFFIX})
 
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core)
 

misc/DtkCoreConfig.cmake.in

@@ -6,17 +6,17 @@ endif()
 include(CMakeFindDependencyMacro)
 find_dependency(Qt@QT_VERSION_MAJOR@Core)
 find_dependency(Qt@QT_VERSION_MAJOR@Xml)
-find_dependency(Dtk@DTK_VERSION_MAJOR@Log)
+find_dependency(Dtk@DTK_NAME_SUFFIX@Log)
 
 if (LINUX)
     find_dependency(Qt@QT_VERSION_MAJOR@DBus) 
 endif()
-find_dependency(Dtk@DTK_VERSION_MAJOR@DConfig)
-include(${CMAKE_CURRENT_LIST_DIR}/Dtk@DTK_VERSION_MAJOR@CoreTargets.cmake)
+find_dependency(Dtk@DTK_NAME_SUFFIX@DConfig)
+include(${CMAKE_CURRENT_LIST_DIR}/Dtk@DTK_NAME_SUFFIX@CoreTargets.cmake)
 
-set(DtkCore_LIBRARIES Dtk@DTK_VERSION_MAJOR@::Core)
-get_target_property(DtkCore_INCLUDE_DIRS Dtk@DTK_VERSION_MAJOR@::Core INTERFACE_INCLUDE_DIRECTORIES)
-get_target_property(DtkCore_LIBRARY_DIRS Dtk@DTK_VERSION_MAJOR@::Core INTERFACE_LINK_DIRECTORIES)
+set(DtkCore_LIBRARIES Dtk@DTK_NAME_SUFFIX@::Core)
+get_target_property(DtkCore_INCLUDE_DIRS Dtk@DTK_NAME_SUFFIX@::Core INTERFACE_INCLUDE_DIRECTORIES)
+get_target_property(DtkCore_LIBRARY_DIRS Dtk@DTK_NAME_SUFFIX@::Core INTERFACE_LINK_DIRECTORIES)
 set(DtkCore_TOOL_DIRS "@PACKAGE_TOOL_INSTALL_DIR@")
 check_required_components(DtkCore)
 

misc/dtkcore.pc.in

@@ -3,9 +3,9 @@ exec_prefix=${prefix}
 libdir=${prefix}/@LIBRARY_INSTALL_DIR@
 includedir=${prefix}/@INCLUDE_INSTALL_DIR@
 
-Name: dtk@DTK_VERSION_MAJOR@core
-Description: Deepin Tool Kit dtkcore header files
-Version: @CMAKE_PROJECT_VERSION@
-Libs: -L${libdir} -ldtk@DTK_VERSION_MAJOR@core
+Name: dtk@DTK_NAME_SUFFIX@core
+Description: Development ToolKit Core Devel Library
+Version: @DTK_VERSION@
+Libs: -L${libdir} -ldtk@DTK_NAME_SUFFIX@core
 Cflags: -I${includedir} -DQT_MESSAGELOGCONTEXT
-Requires: dtk@DTK_VERSION_MAJOR@log
+Requires: dtk@DTK_NAME_SUFFIX@log

misc/qt_lib_dtkcore.pri.in

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

src/CMakeLists.txt

@@ -7,7 +7,7 @@ set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core)
-find_package(Dtk${DTK_VERSION_MAJOR}Log REQUIRED)
+find_package(Dtk${DTK_NAME_SUFFIX}Log REQUIRED)
 find_package(DBus1 REQUIRED)
 if(LINUX)
   find_package(PkgConfig REQUIRED)
@@ -77,7 +77,7 @@ if(LINUX)
     Qt${QT_VERSION_MAJOR}::Core
     Qt${QT_VERSION_MAJOR}::DBus
     Qt${QT_VERSION_MAJOR}::Xml
-    Dtk${DTK_VERSION_MAJOR}::Log
+    Dtk${DTK_NAME_SUFFIX}::Log
   )
   target_link_libraries(${LIB_NAME} PRIVATE
     Qt${QT_VERSION_MAJOR}::CorePrivate
@@ -113,8 +113,8 @@ else()
   endif()
 endif()
 set_target_properties(${LIB_NAME} PROPERTIES
-  VERSION ${CMAKE_PROJECT_VERSION}
-  SOVERSION ${CMAKE_PROJECT_VERSION_MAJOR}
+  VERSION ${DTK_VERSION}
+  SOVERSION ${DTK_VERSION_MAJOR}
   EXPORT_NAME Core
 )
 
@@ -191,6 +191,6 @@ install(TARGETS ${LIB_NAME} EXPORT ${DtkCore}Targets
 
 install(EXPORT ${DtkCore}Targets
   FILE ${DtkCore}Targets.cmake
-  NAMESPACE Dtk${DTK_VERSION_MAJOR}::
+  NAMESPACE Dtk${DTK_NAME_SUFFIX}::
   DESTINATION ${CONFIG_CMAKE_INSTALL_DIR}
 )

src/glob.cmake

@@ -7,7 +7,7 @@ set(OUTER_SOURCE
   ${CMAKE_CURRENT_LIST_DIR}/ddesktopentry.cpp
 )
 
-if (NOT DTK_VERSION_MAJOR)
+if (DTK5)
     list(APPEND OUTER_SOURCE ${CMAKE_CURRENT_LIST_DIR}/dtkcore_global.cpp)
 endif()
 

src/settings/settings.cmake

@@ -20,7 +20,7 @@ else()
   )
 endif()
 
-if(DTK_VERSION_MAJOR)
+if(NOT DTK5)
   list(REMOVE_ITEM SETTINGS_SOURCES "${CMAKE_CURRENT_LIST_DIR}/backend/gsettingsbackend.cpp")
   list(REMOVE_ITEM SETTINGS_HEADERS "${CMAKE_CURRENT_LIST_DIR}/../../include/settings/backend/gsettingsbackend.h")
 endif()

src/util/util.cmake

@@ -47,7 +47,7 @@ set(PRIVATE_HEADERS
     ${CMAKE_CURRENT_LIST_DIR}/ddbusinterface_p.h
     ${CMAKE_CURRENT_LIST_DIR}/ddbusextendedpendingcallwatcher_p.h)
 
-if(DTK_VERSION_MAJOR)
+if(NOT DTK5)
   list(REMOVE_ITEM UTILS_SOURCES "${CMAKE_CURRENT_LIST_DIR}/dtimedloop.cpp")
   list(REMOVE_ITEM UTILS_HEADERS "${PROJECT_SOURCE_DIR}/include/util/dtimedloop.h") # no longer be used
   list(REMOVE_ITEM UTILS_HEADERS "${PROJECT_SOURCE_DIR}/include/util/dasync.h")

tests/CMakeLists.txt

@@ -37,7 +37,7 @@ find_package(GTest REQUIRED)
 include(GoogleTest)
 
 # for test.so
-set(TEST_SO_NAME vtabletest${DTK_VERSION_MAJOR})
+set(TEST_SO_NAME vtabletest${DTK_NAME_SUFFIX})
 add_subdirectory(./testso)
 
 # test
@@ -49,7 +49,7 @@ file(GLOB FackDBus
     "./fakedbus/*.cpp"
 )
 
-if(DTK_VERSION_MAJOR)
+if(NOT DTK5)
     list(REMOVE_ITEM TEST_SOURCE "${CMAKE_CURRENT_LIST_DIR}/ut_gsettingsbackend.cpp")
     list(REMOVE_ITEM TEST_SOURCE "${CMAKE_CURRENT_LIST_DIR}/ut_dasync.cpp")
 endif()

tools/ch2py/CMakeLists.txt

@@ -1,5 +1,5 @@
 set(TARGET_NAME ch2py)
-set(BIN_NAME ${TARGET_NAME}${DTK_VERSION_MAJOR})
+set(BIN_NAME ${TARGET_NAME}${DTK_NAME_SUFFIX})
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core)

tools/dci/CMakeLists.txt

@@ -1,5 +1,5 @@
 set(TARGET_NAME dci)
-set(BIN_NAME ${TARGET_NAME}${DTK_VERSION_MAJOR})
+set(BIN_NAME ${TARGET_NAME}${DTK_NAME_SUFFIX})
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core)

tools/dconfig2cpp/CMakeLists.txt

@@ -1,5 +1,5 @@
 set(TARGET_NAME dconfig2cpp)
-set(BIN_NAME ${TARGET_NAME}${DTK_VERSION_MAJOR})
+set(BIN_NAME ${TARGET_NAME}${DTK_NAME_SUFFIX})
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core)
@@ -21,6 +21,6 @@ set_target_properties(
 
 install(
   TARGETS ${BIN_NAME}
-  EXPORT Dtk${DTK_VERSION_MAJOR}ToolsTargets
+  EXPORT Dtk${DTK_NAME_SUFFIX}ToolsTargets
   DESTINATION ${TOOL_INSTALL_DIR}
 )

tools/deepin-os-release/CMakeLists.txt

@@ -1,5 +1,5 @@
 set(TARGET_NAME deepin-os-release)
-set(BIN_NAME ${TARGET_NAME}${DTK_VERSION_MAJOR})
+set(BIN_NAME ${TARGET_NAME}${DTK_NAME_SUFFIX})
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_AUTOMOC ON)