fix: restore dconfig_meta_files macro for DTK5 compatibility#541
Merged
deepin-bot[bot] merged 1 commit intolinuxdeepin:masterfrom Feb 5, 2026
Merged
fix: restore dconfig_meta_files macro for DTK5 compatibility#541deepin-bot[bot] merged 1 commit intolinuxdeepin:masterfrom
deepin-bot[bot] merged 1 commit intolinuxdeepin:masterfrom
Conversation
1. Reverted the conditional logic in dtkcore.cmake to install DtkDConfigMacros.cmake for DTK5 builds 2. The macro `dconfig_meta_files` was removed in DTK6 but is still required for DTK5 compatibility 3. Changed condition from `if (NOT DTK5)` to `if (DTK5)` to ensure the deprecated macro file is installed when building for DTK5 4. This preserves backward compatibility for projects that rely on the `dconfig_meta_files` function in DTK5 environments Log: Restored compatibility with DTK5 projects using dconfig_meta_files macro Influence: 1. Test building with DTK5 enabled to verify DtkDConfigMacros.cmake is installed 2. Verify that the `dconfig_meta_files` function is available in DTK5 builds 3. Test building with DTK6 to ensure the deprecated macro is not installed 4. Check that existing DTK5 projects can successfully use the dconfig_meta_files macro 5. Verify CMake installation paths contain the correct macro files for each DTK version fix: 恢复 dconfig_meta_files 宏以支持 DTK5 兼容性 1. 在 dtkcore.cmake 中恢复条件逻辑,为 DTK5 构建安装 DtkDConfigMacros.cmake 2. `dconfig_meta_files` 宏在 DTK6 中被移除,但在 DTK5 环境中仍然需要 3. 将条件从 `if (NOT DTK5)` 改为 `if (DTK5)`,确保在构建 DTK5 时安装已弃 用的宏文件 4. 这为依赖 DTK5 环境中 `dconfig_meta_files` 函数的项目保留了向后兼容性 Log: 恢复与使用 dconfig_meta_files 宏的 DTK5 项目的兼容性 Influence: 1. 测试启用 DTK5 的构建,验证 DtkDConfigMacros.cmake 是否正确安装 2. 验证 `dconfig_meta_files` 函数在 DTK5 构建中是否可用 3. 测试使用 DTK6 构建,确保不安装已弃用的宏 4. 检查现有 DTK5 项目能否成功使用 dconfig_meta_files 宏 5. 验证 CMake 安装路径是否包含适用于各 DTK 版本的正确宏文件
mhduiy
approved these changes
Feb 5, 2026
Contributor
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: 18202781743, mhduiy The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Contributor
deepin pr auto review这段代码修改位于 1. 语法逻辑
2. 代码质量
3. 代码性能
4. 代码安全
改进建议
# 建议的修改方式(如果支持版本变量)
if (DTK_VERSION VERSION_GREATER_EQUAL 6.0.0)
set(DCONFIG_DEPRECATED_FUNCS [=[
# deprecated since dtk6
function(dconfig_meta_files)
...或者,如果必须使用 # 保持原有逻辑,因为它更符合 "deprecated since dtk6" 的语义
if (NOT DTK5)
set(DCONFIG_DEPRECATED_FUNCS [=[
# deprecated since dtk6
function(dconfig_meta_files)
...总结:当前的修改( |
Contributor
Author
|
/forcemerge |
Contributor
|
This pr force merged! (status: blocked) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
DtkDConfigMacros.cmake for DTK5 builds
dconfig_meta_fileswas removed in DTK6 but is stillrequired for DTK5 compatibility
if (NOT DTK5)toif (DTK5)to ensure thedeprecated macro file is installed when building for DTK5
dconfig_meta_filesfunction in DTK5 environmentsLog: Restored compatibility with DTK5 projects using dconfig_meta_files
macro
Influence:
is installed
dconfig_meta_filesfunction is available in DTK5builds
installed
dconfig_meta_files macro
each DTK version
fix: 恢复 dconfig_meta_files 宏以支持 DTK5 兼容性
DtkDConfigMacros.cmake
dconfig_meta_files宏在 DTK6 中被移除,但在 DTK5 环境中仍然需要if (NOT DTK5)改为if (DTK5),确保在构建 DTK5 时安装已弃用的宏文件
dconfig_meta_files函数的项目保留了向后兼容性Log: 恢复与使用 dconfig_meta_files 宏的 DTK5 项目的兼容性
Influence:
dconfig_meta_files函数在 DTK5 构建中是否可用