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

The following commit has been merged in the master branch:
commit df754392e7b54771dfc18cd5a63a0705dc73a34e
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Sat Jun 20 18:59:10 2009 +0000

    Build the pimo ontology generated C++ into the program.
    
    We do this because the lib for pimo is still in playground, so this is the simplest thing to do for now.
    
    svn path=/trunk/playground/network/telepathy-integration-daemon/; revision=984447
---
 kpeople/nepomuk-feeder/CMakeLists.txt | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/kpeople/nepomuk-feeder/CMakeLists.txt b/kpeople/nepomuk-feeder/CMakeLists.txt
index 45cf7fc..b816a41 100644
--- a/kpeople/nepomuk-feeder/CMakeLists.txt
+++ b/kpeople/nepomuk-feeder/CMakeLists.txt
@@ -12,6 +12,18 @@ find_package (KdepimLibs REQUIRED)
 
 find_package (TelepathyQt4 REQUIRED)
 find_package(Nepomuk REQUIRED)
+include(MacroAddOntology)
+
+# find the pimo.trig file from the kdebase installation
+find_file(PIMO_TRIG_SOURCE
+  pimo.trig
+  PATHS "${DATA_INSTALL_DIR}" "${KDE4_DATA_DIR}" ENV XDG_DATA_DIRS
+  PATH_SUFFIXES "nepomuk/ontologies"
+  )
+
+if(NOT PIMO_TRIG_SOURCE)
+  message(ERROR_FATAL "Could not find pimo.trig PIMO source file. Is kdebase-runtime installed?")
+endif(NOT PIMO_TRIG_SOURCE)
 
 if(WIN32)
     set(LIB_INSTALL_DIR ${LIB_INSTALL_DIR}
@@ -40,7 +52,11 @@ set(telepathy_integration_daemon_SRCS
     main.cpp
 )
 
-kde4_add_executable(telepathy-integration-daemon ${telepathy_integration_daemon_SRCS})
+kde4_add_ontology(pimo_SRCS ${PIMO_TRIG_SOURCE} "PIMO" "Nepomuk::Vocabulary" "trig")
+
+kde4_add_executable(telepathy-integration-daemon ${telepathy_integration_daemon_SRCS}
+                                                 ${pimo_SRCS}
+)
 
 target_link_libraries(telepathy-integration-daemon ${KDE4_AKONADI_LIBS}
                                                    ${QT_QTCORE_LIBRARY}

-- 
ktp-common-internals packaging