[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=1423000

The following commit has been merged in the master branch:
commit 1423000b4478d0ddad3ecde7f1786af3eb9bfeca
Author: Andreas Sturmlechner <andreas.sturmlechner at gmail.com>
Date:   Mon Sep 7 17:42:37 2015 +0200

    Make tests optional
    
    This patch makes it able to disable building tests by choice or unavailability of Qt5Test (by example of kwin).
    
    REVIEW: 122984
---
 CMakeLists.txt       | 8 ++++----
 tests/CMakeLists.txt | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index df7dd50..59e9268 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ cmake_minimum_required(VERSION 2.8.12)
 find_package(ECM 0.0.9 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_SOURCE_DIR}/cmake)
 
-find_package(Qt5 5.2 REQUIRED COMPONENTS Quick Test)
+find_package(Qt5 5.2 REQUIRED COMPONENTS Quick)
 find_package(KF5 REQUIRED COMPONENTS I18n ConfigWidgets DBusAddons IconThemes)
 find_package(Qca-qt5 2.1.0 REQUIRED)
 
@@ -49,7 +49,7 @@ add_subdirectory(plugins)
 add_subdirectory(plasmoid)
 add_subdirectory(cli)
 add_subdirectory(fileitemactionplugin)
-
-add_subdirectory(tests)
-
+if(BUILD_TESTING)
+    add_subdirectory(tests)
+endif()
 install(PROGRAMS kdeconnect-non-plasma.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index b00a574..727f395 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,3 +1,4 @@
+find_package(Qt5 REQUIRED COMPONENTS Test)
 find_package(KF5 REQUIRED COMPONENTS KIO)
 
 include_directories(

-- 
kdeconnect packaging