Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Use non-deprecated KDEInstallDirs variables

parent 5c3e0d9e
......@@ -23,11 +23,11 @@ target_link_libraries(kcm_networkmanagement
KF5::I18n
KF5::Service
)
install(TARGETS kcm_networkmanagement DESTINATION ${PLUGIN_INSTALL_DIR} )
install(TARGETS kcm_networkmanagement DESTINATION ${KDE_INSTALL_PLUGINDIR} )
########### install files ###############
install( FILES kcm_networkmanagement.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install( FILES kcm_networkmanagement.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
install( FILES
qml/ConnectionItem.qml
qml/Dialog.qml
......@@ -35,4 +35,4 @@ install( FILES
qml/ListItem.qml
qml/main.qml
DESTINATION ${DATA_INSTALL_DIR}/kcm_networkmanagement/qml)
DESTINATION ${KDE_INSTALL_DATADIR}/kcm_networkmanagement/qml)
......@@ -57,6 +57,6 @@ if (WITH_MODEMMANAGER_SUPPORT)
target_link_libraries(kded_networkmanagement KF5::ModemManagerQt)
endif()
install(TARGETS kded_networkmanagement DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kded)
install(TARGETS kded_networkmanagement DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kded)
install(FILES networkmanagement.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})
install(FILES networkmanagement.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR})
......@@ -22,5 +22,5 @@ if (WITH_MODEMMANAGER_SUPPORT)
target_link_libraries(plasmanm_qmlplugins KF5::ModemManagerQt)
endif()
install(TARGETS plasmanm_qmlplugins DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/networkmanagement)
install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/networkmanagement)
install(TARGETS plasmanm_qmlplugins DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/networkmanagement)
install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/networkmanagement)
......@@ -107,4 +107,4 @@ if (WITH_MODEMMANAGER_SUPPORT)
endif()
install(TARGETS plasmanm_editor ${INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES plasma-networkmanagement-vpnuiplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
install(FILES plasma-networkmanagement-vpnuiplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR})
......@@ -21,6 +21,6 @@ target_link_libraries(plasmanetworkmanagement_fortisslvpnui
KF5::CoreAddons
)
install(TARGETS plasmanetworkmanagement_fortisslvpnui DESTINATION ${PLUGIN_INSTALL_DIR})
install(TARGETS plasmanetworkmanagement_fortisslvpnui DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES plasmanetworkmanagement_fortisslvpnui.desktop DESTINATION ${SERVICES_INSTALL_DIR})
install(FILES plasmanetworkmanagement_fortisslvpnui.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
......@@ -20,6 +20,6 @@ target_link_libraries(plasmanetworkmanagement_iodineui
KF5::CoreAddons
)
install(TARGETS plasmanetworkmanagement_iodineui DESTINATION ${PLUGIN_INSTALL_DIR})
install(TARGETS plasmanetworkmanagement_iodineui DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES plasmanetworkmanagement_iodineui.desktop DESTINATION ${SERVICES_INSTALL_DIR})
install(FILES plasmanetworkmanagement_iodineui.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
......@@ -23,6 +23,6 @@ target_link_libraries(plasmanetworkmanagement_l2tpui
KF5::CoreAddons
)
install(TARGETS plasmanetworkmanagement_l2tpui DESTINATION ${PLUGIN_INSTALL_DIR})
install(TARGETS plasmanetworkmanagement_l2tpui DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES plasmanetworkmanagement_l2tpui.desktop DESTINATION ${SERVICES_INSTALL_DIR})
install(FILES plasmanetworkmanagement_l2tpui.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
......@@ -52,9 +52,9 @@ if (OPENCONNECT_FOUND)
${OPENCONNECT_LIBRARIES}
${maybe_OPENSSL_LIBRARIES}
)
install(TARGETS plasmanetworkmanagement_openconnectui DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES plasmanetworkmanagement_openconnectui.desktop DESTINATION ${SERVICES_INSTALL_DIR})
install(FILES plasmanetworkmanagement_openconnect_juniperui.desktop DESTINATION ${SERVICES_INSTALL_DIR})
install(TARGETS plasmanetworkmanagement_openconnectui DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES plasmanetworkmanagement_openconnectui.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
install(FILES plasmanetworkmanagement_openconnect_juniperui.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
else()
message("ERROR: OpenConnection version '${OPENCONNECT_VERSION}' does not match minimum required (${MINIMUM_OPENCONNECT_VERSION_REQUIRED})")
message("OpenConnect plugin will not be built")
......
......@@ -20,6 +20,6 @@ target_link_libraries(plasmanetworkmanagement_openswanui
KF5::CoreAddons
)
install(TARGETS plasmanetworkmanagement_openswanui DESTINATION ${PLUGIN_INSTALL_DIR})
install(TARGETS plasmanetworkmanagement_openswanui DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES plasmanetworkmanagement_openswanui.desktop DESTINATION ${SERVICES_INSTALL_DIR})
install(FILES plasmanetworkmanagement_openswanui.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
......@@ -26,6 +26,6 @@ target_link_libraries(plasmanetworkmanagement_openvpnui
KF5::KDELibs4Support # KStandardDirs
)
install(TARGETS plasmanetworkmanagement_openvpnui DESTINATION ${PLUGIN_INSTALL_DIR})
install(TARGETS plasmanetworkmanagement_openvpnui DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES plasmanetworkmanagement_openvpnui.desktop DESTINATION ${SERVICES_INSTALL_DIR})
install(FILES plasmanetworkmanagement_openvpnui.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
......@@ -20,6 +20,6 @@ target_link_libraries(plasmanetworkmanagement_pptpui
KF5::CoreAddons
)
install(TARGETS plasmanetworkmanagement_pptpui DESTINATION ${PLUGIN_INSTALL_DIR})
install(TARGETS plasmanetworkmanagement_pptpui DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES plasmanetworkmanagement_pptpui.desktop DESTINATION ${SERVICES_INSTALL_DIR})
install(FILES plasmanetworkmanagement_pptpui.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
......@@ -21,6 +21,6 @@ target_link_libraries(plasmanetworkmanagement_sshui
KF5::CoreAddons
)
install(TARGETS plasmanetworkmanagement_sshui DESTINATION ${PLUGIN_INSTALL_DIR})
install(TARGETS plasmanetworkmanagement_sshui DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES plasmanetworkmanagement_sshui.desktop DESTINATION ${SERVICES_INSTALL_DIR})
install(FILES plasmanetworkmanagement_sshui.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
......@@ -21,6 +21,6 @@ target_link_libraries(plasmanetworkmanagement_sstpui
KF5::CoreAddons
)
install(TARGETS plasmanetworkmanagement_sstpui DESTINATION ${PLUGIN_INSTALL_DIR})
install(TARGETS plasmanetworkmanagement_sstpui DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES plasmanetworkmanagement_sstpui.desktop DESTINATION ${SERVICES_INSTALL_DIR})
install(FILES plasmanetworkmanagement_sstpui.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
......@@ -20,6 +20,6 @@ target_link_libraries(plasmanetworkmanagement_strongswanui
KF5::CoreAddons
)
install(TARGETS plasmanetworkmanagement_strongswanui DESTINATION ${PLUGIN_INSTALL_DIR})
install(TARGETS plasmanetworkmanagement_strongswanui DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES plasmanetworkmanagement_strongswanui.desktop DESTINATION ${SERVICES_INSTALL_DIR})
install(FILES plasmanetworkmanagement_strongswanui.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
......@@ -24,6 +24,6 @@ target_link_libraries(plasmanetworkmanagement_vpncui
KF5::CoreAddons
)
install(TARGETS plasmanetworkmanagement_vpncui DESTINATION ${PLUGIN_INSTALL_DIR})
install(TARGETS plasmanetworkmanagement_vpncui DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES plasmanetworkmanagement_vpncui.desktop DESTINATION ${SERVICES_INSTALL_DIR})
install(FILES plasmanetworkmanagement_vpncui.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
Markdown is supported
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