From 9a227b0888d1cf8c09c78614a2f878b07944aa3e Mon Sep 17 00:00:00 2001
From: fuleyi <fuleyi@uniontech.com>
Date: Thu, 29 Jan 2026 10:54:21 +0800
Subject: [PATCH] fix: resolve dconfig installation issue
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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. 测试会话启动和配置加载功能
---
 CMakeLists.txt      | 1 +
 misc/CMakeLists.txt | 4 ++--
 src/CMakeLists.txt  | 2 --
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index da4da45..0c5d45d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,7 @@ set(QT_VERSION_MAJOR 6)
 set(DTK_VERSION_MAJOR 6)
 
 find_package(DtkBuildHelper REQUIRED)
+find_package(Dtk${DTK_VERSION_MAJOR} REQUIRED COMPONENTS Tools)
 
 macro(install_symlink filepath wantsdir)
     file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/link/${wantsdir}/)
diff --git a/misc/CMakeLists.txt b/misc/CMakeLists.txt
index e7a3499..40d5ca7 100644
--- a/misc/CMakeLists.txt
+++ b/misc/CMakeLists.txt
@@ -22,5 +22,5 @@ install(
 install(FILES ${XSESSION} DESTINATION /etc/X11/Xsession.d/)
 install(FILES ${PROFILE} DESTINATION /etc/profile.d)
 
-file(GLOB DCONFIG_FILES "misc/dconf/*.json")
-dtk_add_config_meta_files(APPID org.deepin.dde.session BASE misc/dconf FILES ${DCONFIG_FILES})
+file(GLOB DCONFIG_FILES "dconf/*.json")
+dtk_add_config_meta_files(APPID org.deepin.dde.session FILES ${DCONFIG_FILES})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a9def57..1102536 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,8 +2,6 @@
 #
 # SPDX-License-Identifier: CC0-1.0
 
-find_package(Dtk${DTK_VERSION_MAJOR} REQUIRED COMPONENTS Tools)
-
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set (CMAKE_CXX_STANDARD 11)