diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -107,6 +107,7 @@ endif() install(EXPORT KF5DocToolsTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5DocToolsTargets.cmake NAMESPACE KF5:: ) +install(EXPORT KF5DocToolsToolsTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5DocToolsToolsTargets.cmake NAMESPACE KF5:: ) if (BUILD_QCH) ecm_install_qch_export( @@ -128,6 +129,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/KF5DocToolsMacros.cmake ${CMAKE_BINARY_DIR}/cmake/KF5DocToolsMacros.cmake COPYONLY) # we need a separate copy with local pathes for install autotests export(EXPORT KF5DocToolsTargets FILE ${CMAKE_BINARY_DIR}/cmake/KF5DocToolsTargets.cmake NAMESPACE KF5::) +export(EXPORT KF5DocToolsToolsTargets FILE ${CMAKE_BINARY_DIR}/cmake/KF5DocToolsToolsTargets.cmake NAMESPACE KF5::) install(FILES "${CMAKE_BINARY_DIR}/cmake/KF5DocToolsConfig.cmake" diff --git a/KF5DocToolsConfig.cmake.in b/KF5DocToolsConfig.cmake.in --- a/KF5DocToolsConfig.cmake.in +++ b/KF5DocToolsConfig.cmake.in @@ -7,19 +7,27 @@ include("${CMAKE_CURRENT_LIST_DIR}/KF5DocToolsTargets.cmake") -if(CMAKE_CROSSCOMPILING AND MEINPROC5_EXECUTABLE) - set_target_properties(KF5::meinproc5 PROPERTIES IMPORTED_LOCATION_NONE ${MEINPROC5_EXECUTABLE}) - set_target_properties(KF5::meinproc5 PROPERTIES IMPORTED_LOCATION ${MEINPROC5_EXECUTABLE}) -endif() - -if(CMAKE_CROSSCOMPILING AND DOCBOOKL10NHELPER_EXECUTABLE) - set_target_properties(KF5::docbookl10nhelper PROPERTIES IMPORTED_LOCATION_NONE ${DOCBOOKL10NHELPER_EXECUTABLE}) - set_target_properties(KF5::docbookl10nhelper PROPERTIES IMPORTED_LOCATION ${DOCBOOKL10NHELPER_EXECUTABLE}) -endif() - -if(CMAKE_CROSSCOMPILING AND CHECKXML5_EXECUTABLE) - set_target_properties(KF5::checkXML5 PROPERTIES IMPORTED_LOCATION_NONE ${CHECKXML5_EXECUTABLE}) - set_target_properties(KF5::checkXML5 PROPERTIES IMPORTED_LOCATION ${CHECKXML5_EXECUTABLE}) + if (CMAKE_CROSSCOMPILING AND KF5_HOST_TOOLING) + find_file(KDOCTOOLS_TARGETSFILE KF5DocTools/KF5DocToolsToolsTargets.cmake PATHS ${KF5_HOST_TOOLING} ${CMAKE_CURRENT_LIST_DIR} NO_DEFAULT_PATH) + include("${KDOCTOOLS_TARGETSFILE}") +else() + include("${CMAKE_CURRENT_LIST_DIR}/KF5DocToolsToolsTargets.cmake") + + # TODO KF6: deprecated, remove the below + if(CMAKE_CROSSCOMPILING AND MEINPROC5_EXECUTABLE) + set_target_properties(KF5::meinproc5 PROPERTIES IMPORTED_LOCATION_NONE ${MEINPROC5_EXECUTABLE}) + set_target_properties(KF5::meinproc5 PROPERTIES IMPORTED_LOCATION ${MEINPROC5_EXECUTABLE}) + endif() + + if(CMAKE_CROSSCOMPILING AND DOCBOOKL10NHELPER_EXECUTABLE) + set_target_properties(KF5::docbookl10nhelper PROPERTIES IMPORTED_LOCATION_NONE ${DOCBOOKL10NHELPER_EXECUTABLE}) + set_target_properties(KF5::docbookl10nhelper PROPERTIES IMPORTED_LOCATION ${DOCBOOKL10NHELPER_EXECUTABLE}) + endif() + + if(CMAKE_CROSSCOMPILING AND CHECKXML5_EXECUTABLE) + set_target_properties(KF5::checkXML5 PROPERTIES IMPORTED_LOCATION_NONE ${CHECKXML5_EXECUTABLE}) + set_target_properties(KF5::checkXML5 PROPERTIES IMPORTED_LOCATION ${CHECKXML5_EXECUTABLE}) + endif() endif() include(${CMAKE_CURRENT_LIST_DIR}/KF5DocToolsMacros.cmake) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -108,7 +108,7 @@ ecm_mark_nongui_executable(meinproc5) target_link_libraries(meinproc5 Qt5::Core ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${LIBXSLT_EXSLT_LIBRARIES} ${meinproc_additional_LIBS}) target_compile_definitions(meinproc5 PRIVATE -DKDOCTOOLS_EXPORT=) -install(TARGETS meinproc5 EXPORT KF5DocToolsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS meinproc5 EXPORT KF5DocToolsToolsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) if(CMAKE_CROSSCOMPILING AND MEINPROC5_EXECUTABLE) add_executable(KF5::meinproc5 IMPORTED GLOBAL) @@ -206,7 +206,7 @@ ecm_mark_nongui_executable( docbookl10nhelper ) target_link_libraries( docbookl10nhelper Qt5::Core ) if(INSTALL_INTERNAL_TOOLS) - install(TARGETS docbookl10nhelper EXPORT KF5DocToolsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) + install(TARGETS docbookl10nhelper EXPORT KF5DocToolsToolsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) endif() if(CMAKE_CROSSCOMPILING AND DOCBOOKL10NHELPER_EXECUTABLE) @@ -232,7 +232,7 @@ add_executable( checkXML5 ${checkXML5_SRCS} ) ecm_mark_nongui_executable( checkXML5 ) target_link_libraries( checkXML5 Qt5::Core ) -install(TARGETS checkXML5 EXPORT KF5DocToolsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS checkXML5 EXPORT KF5DocToolsToolsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) if(CMAKE_CROSSCOMPILING AND CHECKXML5_EXECUTABLE) add_executable(KF5::checkXML5 IMPORTED GLOBAL)