[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=3caf5e7

The following commit has been merged in the master branch:
commit 3caf5e790850a655b1fb7dc7d2c374ec84e9e8cf
Author: Aleix Pol <aleixpol at kde.org>
Date:   Fri Apr 10 17:48:48 2015 +0200

    Move some find_package dependencies to the children directories as agreed
---
 core/CMakeLists.txt                 | 2 +-
 fileitemactionplugin/CMakeLists.txt | 2 ++
 kcmplugin/CMakeLists.txt            | 6 ++----
 kio/CMakeLists.txt                  | 1 +
 plugins/pausemusic/CMakeLists.txt   | 6 ++----
 plugins/sftp/CMakeLists.txt         | 2 +-
 plugins/share/CMakeLists.txt        | 2 +-
 tests/CMakeLists.txt                | 2 ++
 8 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index cecb8fe..f465959 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -29,7 +29,7 @@ set(kdeconnectcore_SRCS
     device.cpp
 )
 
-add_library(kdeconnectcore SHARED ${kdeconnectcore_SRCS})
+add_library(kdeconnectcore ${kdeconnectcore_SRCS})
 target_link_libraries(kdeconnectcore
 PUBLIC
     Qt5::Network
diff --git a/fileitemactionplugin/CMakeLists.txt b/fileitemactionplugin/CMakeLists.txt
index fddb897..08e72dc 100644
--- a/fileitemactionplugin/CMakeLists.txt
+++ b/fileitemactionplugin/CMakeLists.txt
@@ -1,3 +1,5 @@
+find_package(KF5 REQUIRED COMPONENTS KIO)
+
 add_definitions(-DTRANSLATION_DOMAIN="kdeconnect-fileitemaction")
 include_directories(${CMAKE_SOURCE_DIR})
 
diff --git a/kcmplugin/CMakeLists.txt b/kcmplugin/CMakeLists.txt
index 06f3d6c..18b7c09 100644
--- a/kcmplugin/CMakeLists.txt
+++ b/kcmplugin/CMakeLists.txt
@@ -2,11 +2,9 @@ project(kdeconnectpluginkcm)
 
 add_definitions(-DTRANSLATION_DOMAIN=\"kdeconnect-core\")
 
-set(kdeconnectpluginkcm_SRCS
-    kdeconnectpluginkcm.cpp
-)
+find_package(KF5 REQUIRED COMPONENTS KCMUtils)
 
-add_library(kdeconnectpluginkcm SHARED ${kdeconnectpluginkcm_SRCS})
+add_library(kdeconnectpluginkcm kdeconnectpluginkcm.cpp)
 target_link_libraries(kdeconnectpluginkcm
 PUBLIC
     kdeconnectcore
diff --git a/kio/CMakeLists.txt b/kio/CMakeLists.txt
index fc81f4a..d3eaf68 100644
--- a/kio/CMakeLists.txt
+++ b/kio/CMakeLists.txt
@@ -1,5 +1,6 @@
 include_directories(${CMAKE_SOURCE_DIR})
 add_definitions(-DTRANSLATION_DOMAIN="kdeconnect-kio")
+find_package(KF5 REQUIRED COMPONENTS KIO)
 
 set(kio_kdeconnect_PART_SRCS
    kiokdeconnect.cpp
diff --git a/plugins/pausemusic/CMakeLists.txt b/plugins/pausemusic/CMakeLists.txt
index c30af34..0f472cb 100644
--- a/plugins/pausemusic/CMakeLists.txt
+++ b/plugins/pausemusic/CMakeLists.txt
@@ -1,8 +1,6 @@
-set(kdeconnect_pausemusic_SRCS
-    pausemusicplugin.cpp
-)
+find_package(KF5 REQUIRED COMPONENTS KCMUtils)
 
-kdeconnect_add_plugin(kdeconnect_pausemusic JSON kdeconnect_pausemusic.json SOURCES  ${kdeconnect_pausemusic_SRCS})
+kdeconnect_add_plugin(kdeconnect_pausemusic JSON kdeconnect_pausemusic.json SOURCES pausemusicplugin.cpp)
 
 target_link_libraries(kdeconnect_pausemusic
     kdeconnectcore
diff --git a/plugins/sftp/CMakeLists.txt b/plugins/sftp/CMakeLists.txt
index 3407031..8c9d65d 100644
--- a/plugins/sftp/CMakeLists.txt
+++ b/plugins/sftp/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(KF5 REQUIRED COMPONENTS Notifications)
+find_package(KF5 REQUIRED COMPONENTS Notifications KIO)
 
 set(kdeconnect_sftp_SRCS
     mounter.cpp
diff --git a/plugins/share/CMakeLists.txt b/plugins/share/CMakeLists.txt
index fa70800..4debe88 100644
--- a/plugins/share/CMakeLists.txt
+++ b/plugins/share/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(KF5 REQUIRED COMPONENTS Notifications)
+find_package(KF5 REQUIRED COMPONENTS Notifications KIO)
 
 set(kdeconnect_share_SRCS
     shareplugin.cpp
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index b21a04f..b00a574 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,3 +1,5 @@
+find_package(KF5 REQUIRED COMPONENTS KIO)
+
 include_directories(
     ${KDEConnectCore_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}

-- 
kdeconnect packaging