Commit 9c41900f authored by Nicolas Fella's avatar Nicolas Fella Committed by Volker Krause
Browse files

Use undeprecated install dirs

Using kde-dev-scripts/kf5/cmakelists_install_vars.pl
parent e6a95668
Pipeline #166531 passed with stages
in 1 minute and 3 seconds
......@@ -81,7 +81,7 @@ endif()
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KOSMIndoorMap")
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KOSMIndoorMap")
configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/KOSMIndoorMapConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/KOSMIndoorMapConfig.cmake"
......
......@@ -42,7 +42,7 @@ else ()
endif()
if (BUILD_STANDALONE_APP)
install(TARGETS kosmindoormap-app ${INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS kosmindoormap-app ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
install(PROGRAMS org.kde.kosmindoormap.desktop DESTINATION ${KDE_INSTALL_APPDIR})
#install(FILES org.kde.kosmindoormap.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
endif()
......@@ -27,6 +27,6 @@ else()
message(WARNING "CMake is too old, cannot setup examples to work without installation")
endif()
install(TARGETS kosmindoormap_kpublictransport_integration_plugin DESTINATION ${QML_INSTALL_DIR}/org/kde/kosmindoormap/kpublictransport)
install(FILES ${kosmindoormap_kpublictransport_integration_qml} DESTINATION ${QML_INSTALL_DIR}/org/kde/kosmindoormap/kpublictransport)
install(TARGETS kosmindoormap_kpublictransport_integration_plugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kosmindoormap/kpublictransport)
install(FILES ${kosmindoormap_kpublictransport_integration_qml} DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kosmindoormap/kpublictransport)
......@@ -38,5 +38,5 @@ else()
message(WARNING "CMake is too old, cannot setup examples to work without installation")
endif()
install(TARGETS kosmindoormapquickplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/kosmindoormap)
install(FILES ${kosmindoormapquickplugin_qml} DESTINATION ${QML_INSTALL_DIR}/org/kde/kosmindoormap)
install(TARGETS kosmindoormapquickplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kosmindoormap)
install(FILES ${kosmindoormapquickplugin_qml} DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kosmindoormap)
......@@ -151,7 +151,7 @@ ecm_generate_headers(KOSMIndoorMap_Style_FORWARDING_HEADERS
RELATIVE style
)
install(TARGETS KOSMIndoorMap EXPORT KOSMIndoorMapTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS KOSMIndoorMap EXPORT KOSMIndoorMapTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES
${KOSMIndoorMap_Content_FORWARDING_HEADERS}
${KOSMIndoorMap_Loader_FORWARDING_HEADERS}
......
......@@ -48,7 +48,7 @@ ecm_generate_headers(KOSM_FORWARDING_HEADERS
REQUIRED_HEADERS KOSM_HEADERS
)
install(TARGETS KOSM EXPORT KOSMIndoorMapTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS KOSM EXPORT KOSMIndoorMapTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES
${KOSM_FORWARDING_HEADERS}
DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KOSM
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment