Skip to content

Commit bebef18

Browse files
committed
fix: resolve dconfig installation issue
Added missing DtkTools package dependency in main CMakeLists.txt Fixed dconfig file path in misc/CMakeLists.txt by removing incorrect BASE path Removed redundant DtkTools package search from src/CMakeLists.txt since it's now handled at the top level The dconfig configuration files were not being installed properly due to incorrect file paths and missing dependencies Log: Fixed dconfig configuration file installation issue Influence: 1. Verify dconfig files are properly installed to correct locations 2. Test that session configuration settings are applied correctly 3. Check that all dependencies are resolved during build process 4. Validate that the build completes without missing package errors 5. Test session startup and configuration loading fix: 解决dconfig配置文件安装问题 在主CMakeLists.txt中添加缺失的DtkTools包依赖 修复misc/CMakeLists.txt中的dconfig文件路径,移除错误的BASE路径 从src/CMakeLists.txt中移除冗余的DtkTools包搜索,因为现在在顶层处理 由于错误的文件路径和缺失的依赖,dconfig配置文件之前未能正确安装 Log: 修复dconfig配置文件安装问题 Influence: 1. 验证dconfig文件是否正确安装到指定位置 2. 测试会话配置设置是否正确应用 3. 检查构建过程中所有依赖是否正常解析 4. 验证构建过程是否完成且无缺失包错误 5. 测试会话启动和配置加载功能
1 parent bccde6b commit bebef18

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ set(QT_VERSION_MAJOR 6)
1515
set(DTK_VERSION_MAJOR 6)
1616

1717
find_package(DtkBuildHelper REQUIRED)
18+
find_package(Dtk${DTK_VERSION_MAJOR} REQUIRED COMPONENTS Tools)
1819

1920
macro(install_symlink filepath wantsdir)
2021
file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/link/${wantsdir}/)

misc/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ install(
2222
install(FILES ${XSESSION} DESTINATION /etc/X11/Xsession.d/)
2323
install(FILES ${PROFILE} DESTINATION /etc/profile.d)
2424

25-
file(GLOB DCONFIG_FILES "misc/dconf/*.json")
26-
dtk_add_config_meta_files(APPID org.deepin.dde.session BASE misc/dconf FILES ${DCONFIG_FILES})
25+
file(GLOB DCONFIG_FILES "dconf/*.json")
26+
dtk_add_config_meta_files(APPID org.deepin.dde.session FILES ${DCONFIG_FILES})

src/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
#
33
# SPDX-License-Identifier: CC0-1.0
44

5-
find_package(Dtk${DTK_VERSION_MAJOR} REQUIRED COMPONENTS Tools)
6-
75
set(CMAKE_INCLUDE_CURRENT_DIR ON)
86

97
set (CMAKE_CXX_STANDARD 11)

0 commit comments

Comments
 (0)