diff --git a/kcm/CMakeLists.txt b/kcm/CMakeLists.txt index e5080fc4..7a89883a 100755 --- a/kcm/CMakeLists.txt +++ b/kcm/CMakeLists.txt @@ -1,38 +1,38 @@ include_directories(${CMAKE_SOURCE_DIR}/libs/editor ${CMAKE_SOURCE_DIR}/libs/editor/widgets) #KI18N Translation Domain for this library add_definitions(-DTRANSLATION_DOMAIN=\"plasmanetworkmanagement-kcm\") set(kcm_networkmanagement_PART_SRCS ../libs/debug.cpp kcm.cpp ) ki18n_wrap_ui(kcm_networkmanagement_PART_SRCS kcm.ui ) add_library(kcm_networkmanagement MODULE ${kcm_networkmanagement_PART_SRCS}) target_link_libraries(kcm_networkmanagement plasmanm_internal plasmanm_editor Qt5::Quick KF5::ConfigWidgets KF5::Declarative 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 qml/Header.qml qml/ListItem.qml qml/main.qml - DESTINATION ${DATA_INSTALL_DIR}/kcm_networkmanagement/qml) + DESTINATION ${KDE_INSTALL_DATADIR}/kcm_networkmanagement/qml) diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt index 1f67a99c..7d6b7864 100644 --- a/kded/CMakeLists.txt +++ b/kded/CMakeLists.txt @@ -1,62 +1,62 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasmanetworkmanagement-kded\") include_directories(${CMAKE_SOURCE_DIR}/libs/editor/widgets) if (WITH_MODEMMANAGER_SUPPORT) set(kded_networkmanagement_SRCS ../libs/debug.cpp bluetoothmonitor.cpp notification.cpp modemmonitor.cpp monitor.cpp passworddialog.cpp pindialog.cpp portalmonitor.cpp secretagent.cpp service.cpp ) ki18n_wrap_ui(kded_networkmanagement_SRCS pinwidget.ui passworddialog.ui ) else() set(kded_networkmanagement_SRCS ../libs/debug.cpp bluetoothmonitor.cpp notification.cpp monitor.cpp passworddialog.cpp portalmonitor.cpp secretagent.cpp service.cpp ) ki18n_wrap_ui(kded_networkmanagement_SRCS passworddialog.ui ) endif() add_library(kded_networkmanagement MODULE ${kded_networkmanagement_SRCS}) set_target_properties(kded_networkmanagement PROPERTIES OUTPUT_NAME networkmanagement) kcoreaddons_desktop_to_json(kded_networkmanagement networkmanagement.desktop) target_link_libraries(kded_networkmanagement plasmanm_internal plasmanm_editor KF5::Service KF5::Solid KF5::ConfigCore KF5::I18n KF5::DBusAddons KF5::Notifications KF5::IconThemes KF5::Wallet KF5::WindowSystem ) 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}) diff --git a/libs/declarative/CMakeLists.txt b/libs/declarative/CMakeLists.txt index 647f1d72..275cd531 100644 --- a/libs/declarative/CMakeLists.txt +++ b/libs/declarative/CMakeLists.txt @@ -1,26 +1,26 @@ include_directories(${CMAKE_SOURCE_DIR}/libs/models) set(plasmanm_qml_plugins_SRCS availabledevices.cpp connectionicon.cpp enabledconnections.cpp enums.cpp networkstatus.cpp qmlplugins.cpp ) add_library(plasmanm_qmlplugins SHARED ${plasmanm_qml_plugins_SRCS}) target_link_libraries(plasmanm_qmlplugins plasmanm_internal plasmanm_editor Qt5::Quick KF5::I18n ) 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) diff --git a/libs/editor/CMakeLists.txt b/libs/editor/CMakeLists.txt index 7a8908c7..bdeb2db4 100644 --- a/libs/editor/CMakeLists.txt +++ b/libs/editor/CMakeLists.txt @@ -1,110 +1,110 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/widgets) set(plasmanm_editor_SRCS settings/bondwidget.cpp settings/bridgewidget.cpp settings/btwidget.cpp settings/cdmawidget.cpp settings/connectionwidget.cpp settings/gsmwidget.cpp settings/infinibandwidget.cpp settings/ipv4widget.cpp settings/ipv6widget.cpp settings/pppoewidget.cpp settings/pppwidget.cpp settings/security802-1x.cpp settings/teamwidget.cpp settings/vlanwidget.cpp settings/wificonnectionwidget.cpp settings/wifisecurity.cpp settings/wiredconnectionwidget.cpp settings/wiredsecurity.cpp widgets/advancedpermissionswidget.cpp widgets/bssidcombobox.cpp widgets/delegate.cpp widgets/editlistdialog.cpp widgets/hwaddrcombobox.cpp widgets/intdelegate.cpp widgets/ipv4delegate.cpp widgets/ipv4routeswidget.cpp widgets/ipv6delegate.cpp widgets/ipv6routeswidget.cpp widgets/passwordfield.cpp widgets/settingwidget.cpp widgets/ssidcombobox.cpp connectioneditorbase.cpp connectioneditordialog.cpp connectioneditortabwidget.cpp listvalidator.cpp simpleipv4addressvalidator.cpp simpleipv6addressvalidator.cpp vpnuiplugin.cpp ../configuration.cpp ../debug.cpp ../uiutils.cpp ) if (WITH_MODEMMANAGER_SUPPORT) set(plasmanm_editor_SRCS ${plasmanm_editor_SRCS} widgets/mobileconnectionwizard.cpp mobileproviders.cpp) endif() ki18n_wrap_ui(plasmanm_editor_SRCS settings/ui/802-1x.ui settings/ui/bond.ui settings/ui/bridge.ui settings/ui/bt.ui settings/ui/cdma.ui settings/ui/connectionwidget.ui settings/ui/gsm.ui settings/ui/infiniband.ui settings/ui/ipv4.ui settings/ui/ipv6.ui settings/ui/ppp.ui settings/ui/pppoe.ui settings/ui/team.ui settings/ui/vlan.ui settings/ui/team.ui settings/ui/wificonnectionwidget.ui settings/ui/wifisecurity.ui settings/ui/wiredconnectionwidget.ui settings/ui/wiredsecurity.ui widgets/ui/advancedpermissionswidget.ui widgets/ui/ipv4routes.ui widgets/ui/ipv6routes.ui connectioneditortabwidget.ui ) add_library(plasmanm_editor SHARED ${plasmanm_editor_SRCS}) target_link_libraries(plasmanm_editor PUBLIC KF5::NetworkManagerQt KF5::WidgetsAddons KF5::Completion Qt5::Widgets PRIVATE Qt5::Network Qt5::DBus qca-qt5 KF5::I18n KF5::KIOWidgets KF5::IconThemes KF5::Notifications KF5::Wallet KF5::Solid KF5::KDELibs4Support # KLocale ) if (WITH_MODEMMANAGER_SUPPORT) target_link_libraries(plasmanm_editor PUBLIC KF5::ModemManagerQt) 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}) diff --git a/vpn/fortisslvpn/CMakeLists.txt b/vpn/fortisslvpn/CMakeLists.txt index 39b7ec66..e8213bf4 100644 --- a/vpn/fortisslvpn/CMakeLists.txt +++ b/vpn/fortisslvpn/CMakeLists.txt @@ -1,26 +1,26 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasmanetworkmanagement_fortisslvpnui\") set(fortisslvpn_SRCS fortisslvpn.cpp fortisslvpnwidget.cpp fortisslvpnauth.cpp ) ki18n_wrap_ui(fortisslvpn_SRCS fortisslvpn.ui fortisslvpnadvanced.ui fortisslvpnauth.ui) add_library(plasmanetworkmanagement_fortisslvpnui ${fortisslvpn_SRCS}) kcoreaddons_desktop_to_json(plasmanetworkmanagement_fortisslvpnui plasmanetworkmanagement_fortisslvpnui.desktop) target_link_libraries(plasmanetworkmanagement_fortisslvpnui plasmanm_internal plasmanm_editor KF5::I18n KF5::WidgetsAddons KF5::KIOWidgets 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}) diff --git a/vpn/iodine/CMakeLists.txt b/vpn/iodine/CMakeLists.txt index 8bd36e1f..243af59f 100644 --- a/vpn/iodine/CMakeLists.txt +++ b/vpn/iodine/CMakeLists.txt @@ -1,25 +1,25 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasmanetworkmanagement_iodineui\") set(iodine_SRCS iodine.cpp iodinewidget.cpp iodineauth.cpp ) ki18n_wrap_ui(iodine_SRCS iodine.ui iodineauth.ui) add_library(plasmanetworkmanagement_iodineui ${iodine_SRCS}) kcoreaddons_desktop_to_json(plasmanetworkmanagement_iodineui plasmanetworkmanagement_iodineui.desktop) target_link_libraries(plasmanetworkmanagement_iodineui plasmanm_internal plasmanm_editor KF5::I18n KF5::WidgetsAddons 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}) diff --git a/vpn/l2tp/CMakeLists.txt b/vpn/l2tp/CMakeLists.txt index 573f59bf..d0598318 100644 --- a/vpn/l2tp/CMakeLists.txt +++ b/vpn/l2tp/CMakeLists.txt @@ -1,28 +1,28 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasmanetworkmanagement_l2tpui\") set(l2tp_SRCS l2tp.cpp l2tpwidget.cpp l2tpauth.cpp l2tpadvancedwidget.cpp l2tppppwidget.cpp ) ki18n_wrap_ui(l2tp_SRCS l2tp.ui l2tpadvanced.ui l2tpauth.ui l2tpppp.ui) add_library(plasmanetworkmanagement_l2tpui ${l2tp_SRCS}) kcoreaddons_desktop_to_json(plasmanetworkmanagement_l2tpui plasmanetworkmanagement_l2tpui.desktop) target_link_libraries(plasmanetworkmanagement_l2tpui plasmanm_internal plasmanm_editor KF5::I18n KF5::WidgetsAddons KF5::KIOWidgets 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}) diff --git a/vpn/openconnect/CMakeLists.txt b/vpn/openconnect/CMakeLists.txt index 29ae976a..cf43740d 100644 --- a/vpn/openconnect/CMakeLists.txt +++ b/vpn/openconnect/CMakeLists.txt @@ -1,67 +1,67 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasmanetworkmanagement_openconnectui\") set (MINIMUM_OPENCONNECT_VERSION_REQUIRED "3.99") set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_MODULE_PATH}) find_package(OpenConnect ${MINIMUM_OPENCONNECT_VERSION_REQUIRED} MODULE) if (OPENCONNECT_FOUND) if (${OPENCONNECT_VERSION} VERSION_LESS "3.99") # macro_optional_find_package(OpenSSL) # macro_log_feature(OpenSSL_FOUND "OpenSSL headers" "Encryption suite" "http://www.openssl.org" FALSE "" "Needed for OpenConnect support in Network Management") find_package(OpenSSL) set_package_properties(OpenSSL PROPERTIES DESCRIPTION "Encryption suite" URL "http://www.openssl.org" TYPE OPTIONAL ) if (OpenSSL_FOUND) set (MINIMUM_OPENCONNECT_VERSION_REQUIRED "3.03") set (maybe_OPENSSL_LIBRARIES ${OpenSSL_LIBRARIES}) endif() endif() if (${OPENCONNECT_VERSION} VERSION_GREATER ${MINIMUM_OPENCONNECT_VERSION_REQUIRED} OR ${OPENCONNECT_VERSION} VERSION_EQUAL ${MINIMUM_OPENCONNECT_VERSION_REQUIRED}) include_directories(${OPENCONNECT_INCLUDE_DIRS}) set(openconnect_SRCS ../../libs/debug.cpp openconnectui.cpp openconnectwidget.cpp openconnectauth.cpp openconnectauthworkerthread.cpp ) ki18n_wrap_ui(openconnect_SRCS openconnectprop.ui openconnectauth.ui) add_library(plasmanetworkmanagement_openconnectui ${openconnect_SRCS}) target_link_libraries(plasmanetworkmanagement_openconnectui plasmanm_internal plasmanm_editor ${NETWORKMANAGERQT5_LDFLAGS} KF5::I18n KF5::WidgetsAddons KF5::IconThemes KF5::KIOWidgets KF5::CoreAddons ${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") set(OPENCONNECT_FOUND False) endif() else (OPENCONNECT_FOUND) message("OpenConnect plugin will not be built") endif (OPENCONNECT_FOUND) #macro_log_feature(OPENCONNECT_FOUND "OpenConnect headers and library" "Cisco AnyConnect compatible VPN client" "http://www.infradead.org/openconnect.html" FALSE ${MINIMUM_OPENCONNECT_VERSION_REQUIRED} "Needed for OpenConnect support in Plasma NM") diff --git a/vpn/openswan/CMakeLists.txt b/vpn/openswan/CMakeLists.txt index 008620c5..ab0b9f53 100644 --- a/vpn/openswan/CMakeLists.txt +++ b/vpn/openswan/CMakeLists.txt @@ -1,25 +1,25 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasmanetworkmanagement_openswanui\") set(openswan_SRCS openswan.cpp openswanwidget.cpp openswanauth.cpp ) ki18n_wrap_ui(openswan_SRCS openswan.ui openswanauth.ui) add_library(plasmanetworkmanagement_openswanui ${openswan_SRCS}) kcoreaddons_desktop_to_json(plasmanetworkmanagement_openswanui plasmanetworkmanagement_openswanui.desktop) target_link_libraries(plasmanetworkmanagement_openswanui plasmanm_internal plasmanm_editor KF5::I18n KF5::WidgetsAddons 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}) diff --git a/vpn/openvpn/CMakeLists.txt b/vpn/openvpn/CMakeLists.txt index 89b5ab4f..8e398de5 100644 --- a/vpn/openvpn/CMakeLists.txt +++ b/vpn/openvpn/CMakeLists.txt @@ -1,31 +1,31 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasmanetworkmanagement_openvpnui\") # Needed to build this module remove_definitions(-DQT_USE_FAST_OPERATOR_PLUS) set(openvpn_SRCS openvpn.cpp openvpnwidget.cpp openvpnauth.cpp openvpnadvancedwidget.cpp ) ki18n_wrap_ui(openvpn_SRCS openvpn.ui openvpnadvanced.ui) add_library(plasmanetworkmanagement_openvpnui ${openvpn_SRCS}) kcoreaddons_desktop_to_json(plasmanetworkmanagement_openvpnui plasmanetworkmanagement_openvpnui.desktop) target_link_libraries(plasmanetworkmanagement_openvpnui plasmanm_internal plasmanm_editor KF5::KIOWidgets KF5::I18n KF5::WidgetsAddons KF5::CoreAddons 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}) diff --git a/vpn/pptp/CMakeLists.txt b/vpn/pptp/CMakeLists.txt index e45df5ac..96b1d35c 100644 --- a/vpn/pptp/CMakeLists.txt +++ b/vpn/pptp/CMakeLists.txt @@ -1,25 +1,25 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasmanetworkmanagement_pptpui\") set(pptp_SRCS pptp.cpp pptpwidget.cpp pptpauth.cpp ) ki18n_wrap_ui(pptp_SRCS pptpprop.ui pptpadvanced.ui pptpauth.ui) add_library(plasmanetworkmanagement_pptpui ${pptp_SRCS}) kcoreaddons_desktop_to_json(plasmanetworkmanagement_pptpui plasmanetworkmanagement_pptpui.desktop) target_link_libraries(plasmanetworkmanagement_pptpui plasmanm_internal plasmanm_editor KF5::I18n KF5::WidgetsAddons 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}) diff --git a/vpn/ssh/CMakeLists.txt b/vpn/ssh/CMakeLists.txt index 2d4dbe39..8a74e134 100644 --- a/vpn/ssh/CMakeLists.txt +++ b/vpn/ssh/CMakeLists.txt @@ -1,26 +1,26 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasmanetworkmanagement_sshui\") set(ssh_SRCS ssh.cpp sshwidget.cpp sshauth.cpp ) ki18n_wrap_ui(ssh_SRCS sshwidget.ui sshadvanced.ui sshauth.ui) add_library(plasmanetworkmanagement_sshui ${ssh_SRCS}) kcoreaddons_desktop_to_json(plasmanetworkmanagement_sshui plasmanetworkmanagement_sshui.desktop) target_link_libraries(plasmanetworkmanagement_sshui plasmanm_internal plasmanm_editor KF5::I18n KF5::WidgetsAddons KF5::KIOWidgets 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}) diff --git a/vpn/sstp/CMakeLists.txt b/vpn/sstp/CMakeLists.txt index 38ef7795..e4bda1d1 100644 --- a/vpn/sstp/CMakeLists.txt +++ b/vpn/sstp/CMakeLists.txt @@ -1,26 +1,26 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasmanetworkmanagement_sstpui\") set(sstp_SRCS sstp.cpp sstpwidget.cpp sstpauth.cpp ) ki18n_wrap_ui(sstp_SRCS sstpwidget.ui sstpadvanced.ui sstpauth.ui) add_library(plasmanetworkmanagement_sstpui ${sstp_SRCS}) kcoreaddons_desktop_to_json(plasmanetworkmanagement_sstpui plasmanetworkmanagement_sstpui.desktop) target_link_libraries(plasmanetworkmanagement_sstpui plasmanm_internal plasmanm_editor KF5::I18n KF5::WidgetsAddons KF5::KIOWidgets 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}) diff --git a/vpn/strongswan/CMakeLists.txt b/vpn/strongswan/CMakeLists.txt index 7231c1d4..6943da17 100644 --- a/vpn/strongswan/CMakeLists.txt +++ b/vpn/strongswan/CMakeLists.txt @@ -1,25 +1,25 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasmanetworkmanagement_strongswanui\") set(strongswan_SRCS strongswan.cpp strongswanwidget.cpp strongswanauth.cpp ) ki18n_wrap_ui(strongswan_SRCS strongswanprop.ui strongswanauth.ui) add_library(plasmanetworkmanagement_strongswanui ${strongswan_SRCS}) kcoreaddons_desktop_to_json(plasmanetworkmanagement_strongswanui plasmanetworkmanagement_strongswanui.desktop) target_link_libraries(plasmanetworkmanagement_strongswanui plasmanm_internal plasmanm_editor KF5::I18n KF5::KIOWidgets 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}) diff --git a/vpn/vpnc/CMakeLists.txt b/vpn/vpnc/CMakeLists.txt index 7bd1e5f2..1cd5644f 100644 --- a/vpn/vpnc/CMakeLists.txt +++ b/vpn/vpnc/CMakeLists.txt @@ -1,29 +1,29 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasmanetworkmanagement_vpncui\") set(vpnc_SRCS ../../libs/debug.cpp vpnc.cpp vpncwidget.cpp vpncadvancedwidget.cpp vpncauth.cpp ) ki18n_wrap_ui(vpnc_SRCS vpnc.ui vpncadvanced.ui vpncauth.ui) add_library(plasmanetworkmanagement_vpncui ${vpnc_SRCS}) kcoreaddons_desktop_to_json(plasmanetworkmanagement_vpncui plasmanetworkmanagement_vpncui.desktop) target_link_libraries(plasmanetworkmanagement_vpncui plasmanm_internal plasmanm_editor KF5::ConfigCore KF5::I18n KF5::WidgetsAddons KF5::KIOWidgets 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})