diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -141,7 +141,6 @@ install(EXPORT KF5NewStuffTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5NewStuffTargets.cmake NAMESPACE KF5:: ) install(EXPORT KF5NewStuffCoreTargets DESTINATION "${CMAKECONFIGCORE_INSTALL_DIR}" FILE KF5NewStuffCoreTargets.cmake NAMESPACE KF5:: ) -install(EXPORT KF5NewStuffQuickTargets DESTINATION "${CMAKECONFIGQUICK_INSTALL_DIR}" FILE KF5NewStuffQuickTargets.cmake NAMESPACE KF5:: ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/knewstuff_version.h diff --git a/KF5NewStuffQuickConfig.cmake.in b/KF5NewStuffQuickConfig.cmake.in --- a/KF5NewStuffQuickConfig.cmake.in +++ b/KF5NewStuffQuickConfig.cmake.in @@ -2,5 +2,3 @@ include(CMakeFindDependencyMacro) find_dependency(KF5NewStuffCore "@KF5_VERSION@") - -include("${CMAKE_CURRENT_LIST_DIR}/KF5NewStuffQuickTargets.cmake") diff --git a/src/qtquick/CMakeLists.txt b/src/qtquick/CMakeLists.txt --- a/src/qtquick/CMakeLists.txt +++ b/src/qtquick/CMakeLists.txt @@ -16,6 +16,6 @@ KF5::NewStuffCore ) -install (TARGETS newstuffqmlplugin EXPORT KF5NewStuffQuickTargets DESTINATION ${QML_INSTALL_DIR}/org/kde/newstuff) -install (DIRECTORY qml DESTINATION ${QML_INSTALL_DIR}/org/kde/newstuff) -install (FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/newstuff) +install (TARGETS newstuffqmlplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/newstuff) +install (DIRECTORY qml DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/newstuff) +install (FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/newstuff)