[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=121807f

The following commit has been merged in the master branch:
commit 121807f21ed1f97944f2550d0aa8788a47cacacc
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Wed Aug 6 12:59:52 2014 +0200

    Start the Frameworks port \o/
---
 CMakeLists.txt | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9a1150a..43d13bf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,32 +1,38 @@
 project (ktp-accounts-kcm)
 
-set(KTP_ACCOUNTS_KCM_VERSION "0.8.1")
+cmake_minimum_required(VERSION 2.8.12)
 
-# Add the modules we ship to the module path
-SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
+find_package(ECM 1.0.0 REQUIRED NO_MODULE)
 
-cmake_policy(SET CMP0002 OLD)
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
+
+find_package(Qt5 5.2.0 CONFIG REQUIRED Core Widgets DBus)
+find_package(KF5 5.0.0 REQUIRED KCMUtils KIO I18n WidgetsAddons CoreAddons ConfigWidgets IconThemes ItemViews)
+
+set(KTP_ACCOUNTS_KCM_VERSION "0.9.99")
 
 set(IS_KTP_INTERNAL_MODULE TRUE)
-set(KDE_MIN_VERSION "4.7.0")
-find_package (KDE4 REQUIRED)
-find_package (TelepathyQt4 0.8.9 REQUIRED)
-find_package (KTp REQUIRED)
 
-# set some default settings
-include (KDE4Defaults)
+find_package (TelepathyQt5 REQUIRED)
+# find_package (KTp REQUIRED)
 
 # make some more macros available
-include (MacroLibrary)
+# include (MacroLibrary)
+
+include(KDEInstallDirs)
+include(KDECMakeSettings)
+include(KDEFrameworkCompilerSettings)
+include(KDECompilerSettings)
+include(ECMInstallIcons)
+include(FeatureSummary)
 
-add_definitions (${KDE4_DEFINITIONS}
-                 -DQT_NO_CAST_FROM_ASCII
+add_definitions (
+#                  -DQT_NO_CAST_FROM_ASCII
                  -DQT_NO_KEYWORDS
 )
 
-include_directories (${KDE4_INCLUDES}
-                     ${TELEPATHY_QT4_INCLUDE_DIR}
-                     ${KTP_INCLUDE_DIR}
+include_directories (${TELEPATHY_QT5_INCLUDE_DIR}
+#                      ${KTP_INCLUDE_DIR}
                      ${CMAKE_CURRENT_SOURCE_DIR}/src
 )
 

-- 
ktp-accounts-kcm packaging