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)