[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=1e661a3

The following commit has been merged in the master branch:
commit 1e661a3c3d6570919d62d3706938571c5419abd5
Author: Luca Beltrame <lbeltrame at kde.org>
Date:   Wed Jul 2 14:15:08 2014 +0200

    Adjust CMakeLists for changes in ECM and KF5
    
    - no more CONFIG in find_package(KF5)
    - s/KDE4Support/KDElibs4Support/
---
 CMakeLists.txt                 | 13 +++++++++++--
 KTp/CMakeLists.txt             |  2 +-
 KTp/Declarative/CMakeLists.txt |  2 +-
 KTp/Widgets/CMakeLists.txt     |  2 +-
 tools/debugger/CMakeLists.txt  |  2 +-
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1d94575..17dc6d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,8 +14,17 @@ set (KTP_VERSION "0.8.0")
 set (KTP_SONUMBER 9)
 set (KTP_MESSAGE_FILTER_FRAMEWORK_VERSION "5")
 
-find_package (Qt5 REQUIRED CONFIG COMPONENTS Qml Test)
-find_package (KF5 REQUIRED CONFIG COMPONENTS KCMUtils NotifyConfig TextEditor Wallet KDE4Support)
+find_package (Qt5 REQUIRED CONFIG COMPONENTS
+              Qml
+              Test)
+
+find_package (KF5 REQUIRED COMPONENTS 
+              KCMUtils
+              NotifyConfig
+              TextEditor
+              Wallet
+              KDELibs4Support)
+
 find_package (TelepathyQt5 0.9.2.1 REQUIRED)
 find_package (TelepathyLoggerQt5 QUIET)
 find_package (KPeople 0.3 QUIET)
diff --git a/KTp/CMakeLists.txt b/KTp/CMakeLists.txt
index 3dc66f7..dc4a2ca 100644
--- a/KTp/CMakeLists.txt
+++ b/KTp/CMakeLists.txt
@@ -67,7 +67,7 @@ set (ktp_common_internals_private_HDRS
 set (ktp_private_LIBS
                        KF5::Wallet
                        KF5::KIOWidgets
-                       KF5::KDE4Support
+                       KF5::KDELibs4Support
                        ${TELEPATHY_QT5_LIBRARIES}
                        ${KDEPIMLIBS_KABC_LIBS}
 )
diff --git a/KTp/Declarative/CMakeLists.txt b/KTp/Declarative/CMakeLists.txt
index 31de0ef..9776e5c 100644
--- a/KTp/Declarative/CMakeLists.txt
+++ b/KTp/Declarative/CMakeLists.txt
@@ -22,7 +22,7 @@ target_link_libraries (ktpqmlplugin
     Qt5::Qml
     
     ${TELEPATHY_QT5_LIBRARIES}
-    KF5::KDE4Support
+    KF5::KDELibs4Support
     ktpcommoninternalsprivate
     ktploggerprivate
     ktpmodelsprivate
diff --git a/KTp/Widgets/CMakeLists.txt b/KTp/Widgets/CMakeLists.txt
index 6d46417..b6e6a3b 100644
--- a/KTp/Widgets/CMakeLists.txt
+++ b/KTp/Widgets/CMakeLists.txt
@@ -46,7 +46,7 @@ set_target_properties(ktpwidgetsprivate PROPERTIES
 target_link_libraries (ktpwidgetsprivate
                        
                        ${TELEPATHY_QT5_LIBRARIES}
-                       KF5::KDE4Support
+                       KF5::KDELibs4Support
                        KF5::NotifyConfig
                        KF5::KCMUtils
                        ktpcommoninternalsprivate
diff --git a/tools/debugger/CMakeLists.txt b/tools/debugger/CMakeLists.txt
index 9e501a8..0002549 100644
--- a/tools/debugger/CMakeLists.txt
+++ b/tools/debugger/CMakeLists.txt
@@ -20,7 +20,7 @@ target_link_libraries(ktp-debugger
     KF5::TextEditor
     KF5::I18n
     KF5::IconThemes
-    KF5::KDE4Support
+    KF5::KDELibs4Support
 )
 
 install(TARGETS ktp-debugger DESTINATION ${BIN_INSTALL_DIR})

-- 
ktp-common-internals packaging