diff --git a/service/CMakeLists.txt b/service/CMakeLists.txt
index 97af2aa..638f200 100644
--- a/service/CMakeLists.txt
+++ b/service/CMakeLists.txt
@@ -25,14 +25,7 @@ set(APP_DCONFIG_SCHEMA "${APP_DCONFIG_DIR}/com.deepin.diskmanager.storage.json")
 
 # Find the library
 find_package(PkgConfig REQUIRED)
-find_package(DtkCore)
-if(DtkCore_FOUND)
-    get_target_property(DTKCORE_INCLUDE_DIRS Dtk::Core INTERFACE_INCLUDE_DIRECTORIES)
-    find_path(DCONFIG_HEADER_PATH NAMES DConfig PATHS ${DTKCORE_INCLUDE_DIRS})
-    if(DCONFIG_HEADER_PATH)
-        add_definitions(-DHAVE_DCONFIG)
-    endif()
-endif()
+find_package(DtkCore REQUIRED)
 find_package(DtkGui REQUIRED)
 find_package(Qt5 COMPONENTS
     Core
@@ -89,5 +82,7 @@ install(PROGRAMS ${APP_USBADD_FILES} DESTINATION libexec/openconnect/)
 install(PROGRAMS ${APP_USBREMOVE_FILES} DESTINATION libexec/openconnect/)
 install(FILES ${APP_UDEV_FILES} DESTINATION /lib/udev/rules.d/)
 install(FILES ${APP_POLICY_FILES} DESTINATION share/polkit-1/actions)
-install(FILES ${APP_DCONFIG_SCHEMA} DESTINATION share/dsg/configs/com.deepin.diskmanager/)
+if(DEFINED DSG_DATA_DIR)
+    install(FILES ${APP_DCONFIG_SCHEMA} DESTINATION share/dsg/configs/com.deepin.diskmanager/)
+endif()
 install(PROGRAMS ${APP_DEEPIN_DISKMANAGER_SERVICE_BIN} DESTINATION bin/)
diff --git a/service/diskoperation/DeviceStorage.cpp b/service/diskoperation/DeviceStorage.cpp
index 3de3668..a52a926 100755
--- a/service/diskoperation/DeviceStorage.cpp
+++ b/service/diskoperation/DeviceStorage.cpp
@@ -8,7 +8,8 @@
 #include <QRegularExpression>
 #include <QScopedPointer>
 #include <QVariant>
-#ifdef HAVE_DCONFIG
+#include <dtkcore_config.h>
+#ifdef DTKCORE_CLASS_DConfigFile
 #include <DConfig>
 #endif
 #include "utils.h"
@@ -594,7 +595,7 @@ static bool isPGUX()
 static QStringList ufsSpecVersions()
 {
     const QStringList fallback{"300", "310", "400", "410"};
-#ifdef HAVE_DCONFIG
+#ifdef DTKCORE_CLASS_DConfigFile
     QScopedPointer<Dtk::Core::DConfig> cfg(
         Dtk::Core::DConfig::create("com.deepin.diskmanager", "com.deepin.diskmanager.storage"));
     if (cfg && cfg->isValid()) {
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 35b7593..d9803cb 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -25,14 +25,7 @@ LIST(APPEND SRC_LIST ${UT_DISKOPERATION})
 file(GLOB ALL_HEADERS "../service/diskoperation/*.h" "../service/diskoperation/filesystems/*.h")
 file(GLOB ALL_SOURCES "../service/diskoperation/*.cpp" "../service/diskoperation/filesystems/*.cpp")
 
-find_package(DtkCore)
-if(DtkCore_FOUND)
-    get_target_property(DTKCORE_INCLUDE_DIRS Dtk::Core INTERFACE_INCLUDE_DIRECTORIES)
-    find_path(DCONFIG_HEADER_PATH NAMES DConfig PATHS ${DTKCORE_INCLUDE_DIRS})
-    if(DCONFIG_HEADER_PATH)
-        add_definitions(-DHAVE_DCONFIG)
-    endif()
-endif()
+find_package(DtkCore REQUIRED)
 
 add_executable(${PROJECT_NAME_TEST} ${SRC_LIST} ${ALL_HEADERS} ${ALL_SOURCES})