diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -123,6 +123,11 @@ FILE KF5PackageTargets.cmake NAMESPACE KF5:: COMPONENT Devel) +install(EXPORT KF5PackageToolsTargets + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + FILE KF5PackageToolsTargets.cmake + NAMESPACE KF5:: + COMPONENT Devel) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kpackage_version.h DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) diff --git a/KF5PackageConfig.cmake.in b/KF5PackageConfig.cmake.in --- a/KF5PackageConfig.cmake.in +++ b/KF5PackageConfig.cmake.in @@ -3,6 +3,13 @@ # Any changes in this ".cmake" file will be overwritten by CMake, the source is the ".cmake.in" file. include("${CMAKE_CURRENT_LIST_DIR}/KF5PackageTargets.cmake") +if (CMAKE_CROSSCOMPILING AND KF5_HOST_TOOLING) + find_file(KPACKAGE_TARGETSFILE KF5Package/KF5PackageToolsTargets.cmake PATHS ${KF5_HOST_TOOLING} ${CMAKE_CURRENT_LIST_DIR} NO_DEFAULT_PATH) + include("${KPACKAGE_TARGETSFILE}") +else() + include("${CMAKE_CURRENT_LIST_DIR}/KF5PackageToolsTargets.cmake") +endif() + @PACKAGE_INCLUDE_QCHTARGETS@ set(Package_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@") diff --git a/src/kpackagetool/CMakeLists.txt b/src/kpackagetool/CMakeLists.txt --- a/src/kpackagetool/CMakeLists.txt +++ b/src/kpackagetool/CMakeLists.txt @@ -13,4 +13,4 @@ target_link_libraries(kpackagetool5 KF5::Archive KF5::Package KF5::I18n KF5::CoreAddons) ecm_mark_nongui_executable(kpackagetool5) -install(TARGETS kpackagetool5 EXPORT KF5PackageTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS kpackagetool5 EXPORT KF5PackageToolsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})