[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=3946ff2

The following commit has been merged in the master branch:
commit 3946ff2608684824f33875d1f2bf896e8d5404b8
Author: Vishesh Handa <handa.vish at gmail.com>
Date:   Thu Feb 16 16:46:33 2012 +0530

    Remove the separate ontologies static library
    
    We're just generating the Telepathy Ontology. It really doesn't
    make much sense.
---
 kpeople/nepomuk-feeder/CMakeLists.txt            | 11 ++++++---
 kpeople/nepomuk-feeder/nepomuk-storage.cpp       |  2 +-
 kpeople/nepomuk-feeder/ontologies/CMakeLists.txt | 29 ------------------------
 3 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/kpeople/nepomuk-feeder/CMakeLists.txt b/kpeople/nepomuk-feeder/CMakeLists.txt
index 4afc841..946d069 100644
--- a/kpeople/nepomuk-feeder/CMakeLists.txt
+++ b/kpeople/nepomuk-feeder/CMakeLists.txt
@@ -16,6 +16,7 @@ find_package(SharedDesktopOntologies ${SDO_MIN_VERSION} REQUIRED)
 include (CheckIncludeFiles)
 include (KDE4Defaults)
 include (MacroLibrary)
+include (SopranoAddOntology)
 
 # Some magic win32 stuff. FIXME: What does this do?
 if (WIN32)
@@ -42,8 +43,6 @@ set (CMAKE_CXX_FLAGS
      "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}"
 )
 
-add_subdirectory (ontologies)
-
 ####################################
 # First target - nepomuktelepathyservice static library
 
@@ -56,6 +55,13 @@ set (nepomuktelepathyservice_static_SRCS
      test-backdoors.cpp
 )
 
+soprano_add_ontology (nepomuktelepathyservice_static_SRCS
+                      ${CMAKE_SOURCE_DIR}/telepathy.trig
+                      "Telepathy"
+                      "Nepomuk::Vocabulary"
+                      "trig"
+)
+
 kde4_add_library (nepomuktelepathyservice-static
                   STATIC
                   ${nepomuktelepathyservice_static_SRCS}
@@ -69,7 +75,6 @@ target_link_libraries (nepomuktelepathyservice-static
                        ${SOPRANO_LIBRARIES}
                        ${NEPOMUK_LIBRARIES}
                        ${NEPOMUK_QUERY_LIBRARIES}
-                       ontologies
 )
 
 set_property(TARGET nepomuktelepathyservice-static PROPERTY COMPILE_FLAGS -fPIC)
diff --git a/kpeople/nepomuk-feeder/nepomuk-storage.cpp b/kpeople/nepomuk-feeder/nepomuk-storage.cpp
index acc24cf..83c4499 100644
--- a/kpeople/nepomuk-feeder/nepomuk-storage.cpp
+++ b/kpeople/nepomuk-feeder/nepomuk-storage.cpp
@@ -22,7 +22,7 @@
  */
 
 #include "nepomuk-storage.h"
-#include "ontologies/telepathy.h"
+#include "telepathy.h"
 
 #include <KDebug>
 #include <KJob>
diff --git a/kpeople/nepomuk-feeder/ontologies/CMakeLists.txt b/kpeople/nepomuk-feeder/ontologies/CMakeLists.txt
deleted file mode 100644
index e6e9fd0..0000000
--- a/kpeople/nepomuk-feeder/ontologies/CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-# Build the nie static lib here so the tests can use it too.
-#nepomuk_add_ontology_classes (telepathynie_SRCS
-#                              ONTOLOGIES
-#                              ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nie.trig
-#                              ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nfo.trig
-#                              ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nco.trig
-#                              ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nmo.trig
-#                              ${CMAKE_SOURCE_DIR}/telepathy.trig
-#)
-
-# Add the ontologies we want to build the vocabulary for.
-soprano_add_ontology (telepathy_ontology_SRCS
-                      ${CMAKE_SOURCE_DIR}/telepathy.trig
-                      "Telepathy"
-                      "Nepomuk::Vocabulary"
-                      "trig"
-)
-
-kde4_add_library (ontologies
-                  STATIC
-                  ${telepathynie_SRCS}
-                  ${pimo_ontology_SRCS}
-                  ${nco_ontology_SRCS}
-                  ${nao_ontology_SRCS}
-                  ${telepathy_ontology_SRCS}
-)
-
-set_property(TARGET ontologies PROPERTY COMPILE_FLAGS -fPIC)
-

-- 
ktp-common-internals packaging