[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [plasma-nm] /: Use non-deprecated KDEInstallDirs variables
From: Friedrich W. H. Kossebau <null () kde ! org>
Date: 2018-06-30 19:49:25
Message-ID: E1fZLs5-000171-6t () code ! kde ! org
[Download RAW message or body]
Git commit c8a29ae8f6eacd6d66477098e7b174fa310796c0 by Friedrich W. H. Koss=
ebau.
Committed on 30/06/2018 at 19:46.
Pushed by kossebau into branch 'master'.
Use non-deprecated KDEInstallDirs variables
M +3 -3 kcm/CMakeLists.txt
M +2 -2 kded/CMakeLists.txt
M +2 -2 libs/declarative/CMakeLists.txt
M +1 -1 libs/editor/CMakeLists.txt
M +2 -2 vpn/fortisslvpn/CMakeLists.txt
M +2 -2 vpn/iodine/CMakeLists.txt
M +2 -2 vpn/l2tp/CMakeLists.txt
M +3 -3 vpn/openconnect/CMakeLists.txt
M +2 -2 vpn/openswan/CMakeLists.txt
M +2 -2 vpn/openvpn/CMakeLists.txt
M +2 -2 vpn/pptp/CMakeLists.txt
M +2 -2 vpn/ssh/CMakeLists.txt
M +2 -2 vpn/sstp/CMakeLists.txt
M +2 -2 vpn/strongswan/CMakeLists.txt
M +2 -2 vpn/vpnc/CMakeLists.txt
https://commits.kde.org/plasma-nm/c8a29ae8f6eacd6d66477098e7b174fa310796c0
diff --git a/kcm/CMakeLists.txt b/kcm/CMakeLists.txt
index e5080fc4..7a89883a 100755
--- a/kcm/CMakeLists.txt
+++ b/kcm/CMakeLists.txt
@@ -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_INST=
ALL_DIR} )
+install( FILES kcm_networkmanagement.desktop DESTINATION ${KDE_INSTALL_K=
SERVICES5DIR} )
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)
diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt
index 1f67a99c..7d6b7864 100644
--- a/kded/CMakeLists.txt
+++ b/kded/CMakeLists.txt
@@ -57,6 +57,6 @@ if (WITH_MODEMMANAGER_SUPPORT)
target_link_libraries(kded_networkmanagement KF5::ModemManagerQt)
endif()
=
-install(TARGETS kded_networkmanagement DESTINATION ${PLUGIN_INSTALL_DIR}/k=
f5/kded)
+install(TARGETS kded_networkmanagement DESTINATION ${KDE_INSTALL_PLUGINDIR=
}/kf5/kded)
=
-install(FILES networkmanagement.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_D=
IR})
+install(FILES networkmanagement.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY=
5RCDIR})
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
@@ -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/network=
management)
+install(TARGETS plasmanm_qmlplugins DESTINATION ${KDE_INSTALL_QMLDIR}/org/=
kde/plasma/networkmanagement)
+install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/netw=
orkmanagement)
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
@@ -107,4 +107,4 @@ if (WITH_MODEMMANAGER_SUPPORT)
endif()
=
install(TARGETS plasmanm_editor ${INSTALL_TARGETS_DEFAULT_ARGS})
-install(FILES plasma-networkmanagement-vpnuiplugin.desktop DESTINATION ${S=
ERVICETYPES_INSTALL_DIR})
+install(FILES plasma-networkmanagement-vpnuiplugin.desktop DESTINATION ${K=
DE_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
@@ -21,6 +21,6 @@ target_link_libraries(plasmanetworkmanagement_fortisslvpn=
ui
KF5::CoreAddons
)
=
-install(TARGETS plasmanetworkmanagement_fortisslvpnui DESTINATION ${PLUGI=
N_INSTALL_DIR})
+install(TARGETS plasmanetworkmanagement_fortisslvpnui DESTINATION ${KDE_I=
NSTALL_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
@@ -20,6 +20,6 @@ target_link_libraries(plasmanetworkmanagement_iodineui
KF5::CoreAddons
)
=
-install(TARGETS plasmanetworkmanagement_iodineui DESTINATION ${PLUGIN_INS=
TALL_DIR})
+install(TARGETS plasmanetworkmanagement_iodineui DESTINATION ${KDE_INSTAL=
L_PLUGINDIR})
=
-install(FILES plasmanetworkmanagement_iodineui.desktop DESTINATION ${SERV=
ICES_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
@@ -23,6 +23,6 @@ target_link_libraries(plasmanetworkmanagement_l2tpui
KF5::CoreAddons
)
=
-install(TARGETS plasmanetworkmanagement_l2tpui DESTINATION ${PLUGIN_INSTA=
LL_DIR})
+install(TARGETS plasmanetworkmanagement_l2tpui DESTINATION ${KDE_INSTALL_=
PLUGINDIR})
=
-install(FILES plasmanetworkmanagement_l2tpui.desktop DESTINATION ${SERVIC=
ES_INSTALL_DIR})
+install(FILES plasmanetworkmanagement_l2tpui.desktop DESTINATION ${KDE_IN=
STALL_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
@@ -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 DESTI=
NATION ${SERVICES_INSTALL_DIR})
- install(FILES plasmanetworkmanagement_openconnect_juniperui.deskto=
p DESTINATION ${SERVICES_INSTALL_DIR})
+ install(TARGETS plasmanetworkmanagement_openconnectui DESTINATION=
${KDE_INSTALL_PLUGINDIR})
+ install(FILES plasmanetworkmanagement_openconnectui.desktop DESTI=
NATION ${KDE_INSTALL_KSERVICES5DIR})
+ install(FILES plasmanetworkmanagement_openconnect_juniperui.deskto=
p DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
else()
message("ERROR: OpenConnection version '${OPENCONNECT_VERSION}' do=
es not match minimum required (${MINIMUM_OPENCONNECT_VERSION_REQUIRED})")
message("OpenConnect plugin will not be built")
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
@@ -20,6 +20,6 @@ target_link_libraries(plasmanetworkmanagement_openswanui
KF5::CoreAddons
)
=
-install(TARGETS plasmanetworkmanagement_openswanui DESTINATION ${PLUGIN_I=
NSTALL_DIR})
+install(TARGETS plasmanetworkmanagement_openswanui DESTINATION ${KDE_INST=
ALL_PLUGINDIR})
=
-install(FILES plasmanetworkmanagement_openswanui.desktop DESTINATION ${SE=
RVICES_INSTALL_DIR})
+install(FILES plasmanetworkmanagement_openswanui.desktop DESTINATION ${KD=
E_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
@@ -26,6 +26,6 @@ target_link_libraries(plasmanetworkmanagement_openvpnui
KF5::KDELibs4Support # KStandardDirs
)
=
-install(TARGETS plasmanetworkmanagement_openvpnui DESTINATION ${PLUGIN_IN=
STALL_DIR})
+install(TARGETS plasmanetworkmanagement_openvpnui DESTINATION ${KDE_INSTA=
LL_PLUGINDIR})
=
-install(FILES plasmanetworkmanagement_openvpnui.desktop DESTINATION ${SER=
VICES_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
@@ -20,6 +20,6 @@ target_link_libraries(plasmanetworkmanagement_pptpui
KF5::CoreAddons
)
=
-install(TARGETS plasmanetworkmanagement_pptpui DESTINATION ${PLUGIN_INSTA=
LL_DIR})
+install(TARGETS plasmanetworkmanagement_pptpui DESTINATION ${KDE_INSTALL_=
PLUGINDIR})
=
-install(FILES plasmanetworkmanagement_pptpui.desktop DESTINATION ${SERVIC=
ES_INSTALL_DIR})
+install(FILES plasmanetworkmanagement_pptpui.desktop DESTINATION ${KDE_IN=
STALL_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
@@ -21,6 +21,6 @@ target_link_libraries(plasmanetworkmanagement_sshui
KF5::CoreAddons
)
=
-install(TARGETS plasmanetworkmanagement_sshui DESTINATION ${PLUGIN_INSTAL=
L_DIR})
+install(TARGETS plasmanetworkmanagement_sshui DESTINATION ${KDE_INSTALL_P=
LUGINDIR})
=
-install(FILES plasmanetworkmanagement_sshui.desktop DESTINATION ${SERVICE=
S_INSTALL_DIR})
+install(FILES plasmanetworkmanagement_sshui.desktop DESTINATION ${KDE_INS=
TALL_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
@@ -21,6 +21,6 @@ target_link_libraries(plasmanetworkmanagement_sstpui
KF5::CoreAddons
)
=
-install(TARGETS plasmanetworkmanagement_sstpui DESTINATION ${PLUGIN_INSTA=
LL_DIR})
+install(TARGETS plasmanetworkmanagement_sstpui DESTINATION ${KDE_INSTALL_=
PLUGINDIR})
=
-install(FILES plasmanetworkmanagement_sstpui.desktop DESTINATION ${SERVIC=
ES_INSTALL_DIR})
+install(FILES plasmanetworkmanagement_sstpui.desktop DESTINATION ${KDE_IN=
STALL_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
@@ -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_IN=
STALL_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
@@ -24,6 +24,6 @@ target_link_libraries(plasmanetworkmanagement_vpncui
KF5::CoreAddons
)
=
-install(TARGETS plasmanetworkmanagement_vpncui DESTINATION ${PLUGIN_INSTA=
LL_DIR})
+install(TARGETS plasmanetworkmanagement_vpncui DESTINATION ${KDE_INSTALL_=
PLUGINDIR})
=
-install(FILES plasmanetworkmanagement_vpncui.desktop DESTINATION ${SERVIC=
ES_INSTALL_DIR})
+install(FILES plasmanetworkmanagement_vpncui.desktop DESTINATION ${KDE_IN=
STALL_KSERVICES5DIR})
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic