Skip to content

Commit 2213ffb

Browse files
committed
fix: remove dconfig_meta_files for DTK5
The condition for installing DtkDConfigMacros.cmake was inverted. Previously, the deprecated dconfig_meta_files function was being removed only when NOT building for DTK5, which is incorrect. The function should be removed specifically for DTK5 builds as it is deprecated since dtk6. The change corrects the condition to `if (DTK5)` to ensure the deprecated function is properly excluded in DTK5 builds while being available for dtk6. Influence: 1. Verify that DtkDConfigMacros.cmake installs correctly for both DTK5 and non-DTK5 builds. 2. Test that the dconfig_meta_files function is not available when building with DTK5. 3. Confirm that the macro file works as expected for dtk6 builds. fix: 修复 DTK5 构建中 dconfig_meta_files 的移除逻辑 安装 DtkDConfigMacros.cmake 的条件被错误地反转了。之前,只有在非 DTK5 构建时才会移除已弃用的 dconfig_meta_files 函数,这是不正确的。该函数 自 dtk6 起已弃用,应专门在 DTK5 构建中移除。此次更改将条件修正为 `if (DTK5)`,以确保在 DTK5 构建中正确排除已弃用的函数,同时使其在 dtk6 构建 中可用。 Influence: 1. 验证 DtkDConfigMacros.cmake 在 DTK5 和非 DTK5 构建中是否正确安装。 2. 测试在构建 DTK5 时 dconfig_meta_files 函数是否不可用。 3. 确认该宏文件在 dtk6 构建中按预期工作。
1 parent 9650bbc commit 2213ffb

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

dtkcore.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ install(FILES cmake/DtkTools/DtkDBusMacros.cmake
9494
install(FILES ${CMAKE_SOURCE_DIR}/cmake/DtkTools/DtkDConfigMacros.cmake
9595
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Dtk${DTK_NAME_SUFFIX}Tools")
9696

97-
if (NOT DTK5)
97+
if (DTK5)
9898
set(DCONFIG_DEPRECATED_FUNCS [=[
9999
# deprecated since dtk6
100100
function(dconfig_meta_files)

0 commit comments

Comments
 (0)