fix: correct Dtk6SettingsToolsMacros.cmake path

* fix: correct Dtk6SettingsToolsMacros.cmake path 修正 Dtk6SettingsToolsMacros.cmake 路径不正确的问题同时避免硬编码版本号到 6 Log:
asterwyx · Oct 23, 2023 · c7a4732 · c7a4732
1 parent f29a571
commit c7a4732
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/cmake/DtkTools/DtkToolsConfig.cmake.in b/cmake/DtkTools/DtkToolsConfig.cmake.in
@@ -7,7 +7,7 @@ if (EXISTS ${DTK_SETTINGS_TOOLS_EXECUTABLE})
     set(DTK_SETTINGS_TOOLS_FOUND TRUE)
 endif ()
 
-include("${CMAKE_CURRENT_LIST_DIR}/DtkSettingsToolsMacros.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/DtkToolsTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/Dtk@DTK_VERSION_MAJOR@SettingsToolsMacros.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/Dtk@DTK_VERSION_MAJOR@ToolsTargets.cmake")
 
 get_target_property(DTK_XML2CPP Dtk@DTK_VERSION_MAJOR@::Xml2Cpp LOCATION)
diff --git a/tools/qdbusxml2cpp/CMakeLists.txt b/tools/qdbusxml2cpp/CMakeLists.txt
@@ -24,13 +24,13 @@ set_target_properties(
 
 install(
   TARGETS ${BIN_NAME}
-  EXPORT DtkToolsTargets
+  EXPORT Dtk${DTK_VERSION_MAJOR}ToolsTargets
   DESTINATION ${TOOL_INSTALL_DIR}
 )
 
 install(
-  EXPORT DtkToolsTargets
-  FILE DtkToolsTargets.cmake
+  EXPORT Dtk${DTK_VERSION_MAJOR}ToolsTargets
+  FILE Dtk${DTK_VERSION_MAJOR}ToolsTargets.cmake
   NAMESPACE Dtk${DTK_VERSION_MAJOR}::
   DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Dtk${DTK_VERSION_MAJOR}Tools"
 )