[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=2aff937

The following commit has been merged in the master branch:
commit 2aff937ccc700d8a2981c19348b5e156531a9005
Author: Dario Freddi <drf at kde.org>
Date:   Sun Sep 19 12:40:26 2010 +0000

    Make the tests optional
    
    svn path=/trunk/playground/network/telepathy-integration-daemon/; revision=1177100
---
 kpeople/nepomuk-feeder/CMakeLists.txt       | 6 +++++-
 kpeople/nepomuk-feeder/tests/CMakeLists.txt | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/kpeople/nepomuk-feeder/CMakeLists.txt b/kpeople/nepomuk-feeder/CMakeLists.txt
index b8a5e47..ec763ec 100644
--- a/kpeople/nepomuk-feeder/CMakeLists.txt
+++ b/kpeople/nepomuk-feeder/CMakeLists.txt
@@ -141,4 +141,8 @@ endmacro(INSTALL_ONTOLOGY)
 
 install_ontology (telepathy telepathy)
 
-add_subdirectory(tests)
+find_package (KTelepathyTestLib)
+
+if (KTelepathyTestLib_DIR)
+    add_subdirectory(tests)
+endif (KTelepathyTestLib_DIR)
diff --git a/kpeople/nepomuk-feeder/tests/CMakeLists.txt b/kpeople/nepomuk-feeder/tests/CMakeLists.txt
index 7914ceb..8320bf1 100644
--- a/kpeople/nepomuk-feeder/tests/CMakeLists.txt
+++ b/kpeople/nepomuk-feeder/tests/CMakeLists.txt
@@ -1,4 +1,3 @@
-find_package (KTelepathyTestLib REQUIRED)
 include (KTelepathyTestLibMacros)
 
 include_directories(${KTELEPATHYTESTLIB_INCLUDE_DIR})

-- 
ktp-common-internals packaging