[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9
Maximiliano Curia
maxy at moszumanska.debian.org
Mon May 9 09:08:51 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=60ed748
The following commit has been merged in the master branch:
commit 60ed748bac8ce380e207e7da16ec30ae0be7471d
Author: Alexander Potashev <aspotashev at gmail.com>
Date: Tue May 12 16:38:01 2015 +0300
Use new KDE macros
---
CMakeLists.txt | 2 +-
KTp/CMakeLists.txt | 4 ++--
KTp/Logger/CMakeLists.txt | 4 ++--
KTp/Models/CMakeLists.txt | 4 ++--
KTp/OTR/CMakeLists.txt | 4 ++--
KTp/Widgets/CMakeLists.txt | 4 ++--
data/icons/CMakeLists.txt | 2 +-
otr-proxy/KTpProxy/CMakeLists.txt | 2 +-
otr-proxy/data/CMakeLists.txt | 2 +-
tools/debugger/CMakeLists.txt | 2 +-
10 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 20a9746..dbe39f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ project(ktp-common-internals)
cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
-find_package(ECM 0.0.11 REQUIRED NO_MODULE)
+find_package(ECM 1.7.0 REQUIRED NO_MODULE)
set (CMAKE_MODULE_PATH
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}
diff --git a/KTp/CMakeLists.txt b/KTp/CMakeLists.txt
index 1656386..85d578b 100644
--- a/KTp/CMakeLists.txt
+++ b/KTp/CMakeLists.txt
@@ -105,11 +105,11 @@ target_include_directories(KTpCommonInternals PUBLIC ${TELEPATHY_QT5_INCLUDE_DIR
install (TARGETS KTpCommonInternals
EXPORT KTpTargets
- ${INSTALL_TARGETS_DEFAULT_ARGS}
+ ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
)
install (FILES ${ktp_common_internals_private_HDRS}
- DESTINATION ${INCLUDE_INSTALL_DIR}/KTp
+ DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KTp
)
add_subdirectory(Declarative)
diff --git a/KTp/Logger/CMakeLists.txt b/KTp/Logger/CMakeLists.txt
index d1d54e9..af5a1d4 100644
--- a/KTp/Logger/CMakeLists.txt
+++ b/KTp/Logger/CMakeLists.txt
@@ -57,11 +57,11 @@ target_link_libraries (KTpLogger
install (TARGETS KTpLogger
EXPORT KTpTargets
- ${INSTALL_TARGETS_DEFAULT_ARGS}
+ ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
)
install (FILES ${ktp_logger_private_HDRS}
- DESTINATION ${INCLUDE_INSTALL_DIR}/KTp/Logger
+ DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KTp/Logger
)
install(FILES ktp_logger_plugin.desktop
diff --git a/KTp/Models/CMakeLists.txt b/KTp/Models/CMakeLists.txt
index 5ae3cb8..8d4c8cb 100644
--- a/KTp/Models/CMakeLists.txt
+++ b/KTp/Models/CMakeLists.txt
@@ -72,10 +72,10 @@ target_link_libraries (KTpModels
install (TARGETS KTpModels
EXPORT KTpTargets
- ${INSTALL_TARGETS_DEFAULT_ARGS}
+ ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
)
install (FILES ${ktp_models_private_HDRS}
- DESTINATION ${INCLUDE_INSTALL_DIR}/KTp/Models
+ DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KTp/Models
)
diff --git a/KTp/OTR/CMakeLists.txt b/KTp/OTR/CMakeLists.txt
index 65bbe14..12e28de 100644
--- a/KTp/OTR/CMakeLists.txt
+++ b/KTp/OTR/CMakeLists.txt
@@ -36,9 +36,9 @@ target_include_directories(KTpOTR PUBLIC ${TELEPATHY_QT5_INCLUDE_DIR}) # TODO: R
install (TARGETS KTpOTR
EXPORT KTpTargets
- ${INSTALL_TARGETS_DEFAULT_ARGS}
+ ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
)
install (FILES ${ktp_otr_private_HDRS}
- DESTINATION ${INCLUDE_INSTALL_DIR}/KTp/OTR
+ DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KTp/OTR
)
diff --git a/KTp/Widgets/CMakeLists.txt b/KTp/Widgets/CMakeLists.txt
index 2f0c8b8..17f7748 100644
--- a/KTp/Widgets/CMakeLists.txt
+++ b/KTp/Widgets/CMakeLists.txt
@@ -65,9 +65,9 @@ target_link_libraries (KTpWidgets
install (TARGETS KTpWidgets
EXPORT KTpTargets
- ${INSTALL_TARGETS_DEFAULT_ARGS}
+ ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
)
install (FILES ${ktp_widgets_private_HDRS}
- DESTINATION ${INCLUDE_INSTALL_DIR}/KTp/Widgets
+ DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KTp/Widgets
)
diff --git a/data/icons/CMakeLists.txt b/data/icons/CMakeLists.txt
index 96e6b45..9995410 100644
--- a/data/icons/CMakeLists.txt
+++ b/data/icons/CMakeLists.txt
@@ -51,5 +51,5 @@ ecm_install_icons(
hi64-apps-telepathy-kde.png
hisc-apps-telepathy-kde.svgz
THEME hicolor
- DESTINATION ${ICON_INSTALL_DIR}
+ DESTINATION ${KDE_INSTALL_ICONDIR}
)
diff --git a/otr-proxy/KTpProxy/CMakeLists.txt b/otr-proxy/KTpProxy/CMakeLists.txt
index 169eff7..0a9cddb 100644
--- a/otr-proxy/KTpProxy/CMakeLists.txt
+++ b/otr-proxy/KTpProxy/CMakeLists.txt
@@ -34,4 +34,4 @@ add_executable(ktp-proxy main.cpp)
target_link_libraries(ktp-proxy ktp-proxy-lib)
install(TARGETS ktp-proxy DESTINATION ${LIBEXEC_INSTALL_DIR})
-install(FILES ktp-proxy-config.kcfg DESTINATION ${KCFG_INSTALL_DIR})
+install(FILES ktp-proxy-config.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
diff --git a/otr-proxy/data/CMakeLists.txt b/otr-proxy/data/CMakeLists.txt
index 121d012..cbbea81 100644
--- a/otr-proxy/data/CMakeLists.txt
+++ b/otr-proxy/data/CMakeLists.txt
@@ -4,4 +4,4 @@ configure_file(org.freedesktop.Telepathy.Client.KTp.Proxy.service.in
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.Proxy.service
DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
-install(FILES KTp.Proxy.client DESTINATION ${SHARE_INSTALL_PREFIX}/telepathy/clients/)
+install(FILES KTp.Proxy.client DESTINATION ${KDE_INSTALL_DATAROOTDIR}/telepathy/clients/)
diff --git a/tools/debugger/CMakeLists.txt b/tools/debugger/CMakeLists.txt
index 40d7af6..e35de89 100644
--- a/tools/debugger/CMakeLists.txt
+++ b/tools/debugger/CMakeLists.txt
@@ -23,4 +23,4 @@ target_link_libraries(ktp-debugger
target_include_directories(ktp-debugger PUBLIC ${TELEPATHY_QT5_INCLUDE_DIR}) # TODO: Remove when TelepathyQt exports include paths properly
install(TARGETS ktp-debugger DESTINATION ${BIN_INSTALL_DIR})
-install(FILES ktpdebugoutput.xml DESTINATION ${DATA_INSTALL_DIR}/katepart5/syntax)
+install(FILES ktpdebugoutput.xml DESTINATION ${KDE_INSTALL_DATADIR}/katepart5/syntax)
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list