[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=1a1969f

The following commit has been merged in the master branch:
commit 1a1969f42f24b73334064590ca7d774b7e57042e
Author: Aleix Pol <aleixpol at kde.org>
Date:   Tue Sep 23 20:05:22 2014 +0200

    Port to new QCA cmake structure, now it's called Qca
    
    and the target name is qca
---
 CMakeLists.txt              | 2 +-
 core/CMakeLists.txt         | 3 +--
 plugins/CMakeLists.txt      | 2 +-
 plugins/sftp/CMakeLists.txt | 1 +
 tests/CMakeLists.txt        | 3 +--
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93a8f3f..84d45ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_SOURCE_DI
 
 find_package(Qt5 5.2 REQUIRED COMPONENTS Quick Test)
 find_package(KF5 REQUIRED COMPONENTS I18n KIO Notifications ConfigWidgets DBusAddons KCMUtils IconThemes)
-find_package(QCA2 REQUIRED)
+find_package(Qca REQUIRED)
 
 include(KDEInstallDirs)
 include(KDECompilerSettings)
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 7b5d16d..5caeedc 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -9,7 +9,6 @@ set(KDECONNECT_VERSION "${KDECONNECT_VERSION_MAJOR}.${KDECONNECT_VERSION_MINOR}.
 
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${QCA2_INCLUDE_DIR}
 )
 
 add_subdirectory(backends/lan)
@@ -35,8 +34,8 @@ target_link_libraries(kdeconnectcore
 PUBLIC
     Qt5::Network
     KF5::KIOCore
+    qca
 PRIVATE
-    ${QCA2_LIBRARIES}
     Qt5::DBus
     Qt5::Gui
     KF5::KIOWidgets
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 5e84ac5..058834a 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}/core ${QCA2_INCLUDE_DIR})
+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}/core)
 add_definitions(-DTRANSLATION_DOMAIN=\"kdeconnect-plugins\")
 install(FILES kdeconnect_plugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
 
diff --git a/plugins/sftp/CMakeLists.txt b/plugins/sftp/CMakeLists.txt
index f672815..8d1fbc9 100644
--- a/plugins/sftp/CMakeLists.txt
+++ b/plugins/sftp/CMakeLists.txt
@@ -41,6 +41,7 @@ target_link_libraries( kdeconnect_sftp_config
     KF5::KIOWidgets
     KF5::KCMUtils
     KF5::IconThemes
+    qca
 )
 
 install(TARGETS kdeconnect_sftp_config DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8a63153..a02dd24 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,5 +1,4 @@
 include_directories(
-    ${QCA2_INCLUDE_DIR}
     ${KDEConnectCore_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}
 )
@@ -7,9 +6,9 @@ include_directories(
 set(kdeconnect_libraries
     KF5::KIOWidgets
     Qt5::Network
-    ${QCA2_LIBRARIES}
     Qt5::Test
     kdeconnectcore
+    qca
 )
 
 ecm_add_test(networkpackagetests.cpp LINK_LIBRARIES ${kdeconnect_libraries})

-- 
kdeconnect packaging