[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=f54b435

The following commit has been merged in the master branch:
commit f54b435449ee828f6a54cf7830dc2ad40e47cbc5
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Wed Aug 4 10:59:01 2010 +0000

    Move the ontologies generation to the ontologies subdirectory. This is a hack until we remove generated classes from the public libktelepathy api.
    
    svn path=/trunk/playground/network/telepathy-contactlist/; revision=1159090
---
 CMakeLists.txt            | 62 +++++++++--------------------------------------
 ontologies/CMakeLists.txt | 53 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 51 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 359ff82..759241e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,19 +11,6 @@ find_package (TelepathyQt4 REQUIRED)
 find_package (KTelepathy REQUIRED)
 find_package (Nepomuk REQUIRED)
 
-include (KDE4Defaults)
-include (MacroLibrary)
-
-add_definitions (${KDE4_DEFINITIONS}
-                 -DDISABLE_NEPOMUK_LEGACY
-)
-
-include_directories (${KDE4_INCLUDES}
-                     ${TELEPATHY_QT4_INCLUDE_DIR}
-                     ${NEPOMUK_INCLUDES}
-                     ${KTELEPATHY_INCLUDES}
-)
-
 # Find telepathy.trig, which is installed already by telepathy-integration-daemon.
 find_file (TELEPATHY_TRIG_SOURCE
            telepathy.trig
@@ -39,44 +26,21 @@ if (NOT TELEPATHY_TRIG_SOURCE)
     )
 endif (NOT TELEPATHY_TRIG_SOURCE)
 
-nepomuk_add_ontology_classes (nie_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
-                              ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/pimo/pimo.trig
-                              ${TELEPATHY_TRIG_SOURCE}
-)
-
-# Add the ontologies we want to build the vocabulary for.
-soprano_add_ontology (pimo_SRCS
-                      ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/pimo/pimo.trig
-                      "PIMO"
-                      "Nepomuk::Vocabulary"
-                      "trig"
-)
+include (KDE4Defaults)
+include (MacroLibrary)
 
-soprano_add_ontology (nco_SRCS
-                      ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nco.trig
-                      "NCO"
-                      "Nepomuk::Vocabulary"
-                      "trig"
+add_definitions (${KDE4_DEFINITIONS}
+                 -DDISABLE_NEPOMUK_LEGACY
 )
 
-soprano_add_ontology (nao_SRCS
-                      ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nepomuk/nao.trig
-                      "NAO"
-                      "Nepomuk::Vocabulary"
-                      "trig"
+include_directories (${KDE4_INCLUDES}
+                     ${TELEPATHY_QT4_INCLUDE_DIR}
+                     ${NEPOMUK_INCLUDES}
+                     ${KTELEPATHY_INCLUDES}
+                     "${CMAKE_CURRENT_BINARY_DIR}/ontologies"
 )
 
-soprano_add_ontology (telepathy_SRCS
-                      ${TELEPATHY_TRIG_SOURCE}
-                      "Telepathy"
-                      "Nepomuk::Vocabulary"
-                      "trig"
-)
+add_subdirectory (ontologies)
 
 set (contactlist_SRCS
      main.cpp
@@ -88,11 +52,6 @@ kde4_add_ui_files (contactlist_SRCS
 )
 
 kde4_add_executable (telepathy_contactlist_prototype
-                     ${nie_SRCS}
-                     ${pimo_SRCS}
-                     ${nco_SRCS}
-                     ${nao_SRCS}
-                     ${telepathy_SRCS}
                      ${contactlist_SRCS}
 
 )
@@ -100,6 +59,7 @@ kde4_add_executable (telepathy_contactlist_prototype
 target_link_libraries (telepathy_contactlist_prototype
                        ${KTELEPATHY_LIBRARIES}
                        ${KDE4_KDEUI_LIBS}
+                       ontologies
 )
 
 # Install:
diff --git a/ontologies/CMakeLists.txt b/ontologies/CMakeLists.txt
new file mode 100644
index 0000000..92dcb36
--- /dev/null
+++ b/ontologies/CMakeLists.txt
@@ -0,0 +1,53 @@
+include_directories (${CMAKE_CURRENT_SOURCE_DIR}
+                     ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+# 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
+                              ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/pimo/pimo.trig
+                              ${TELEPATHY_TRIG_SOURCE}
+)
+
+# Add the ontologies we want to build the vocabulary for.
+soprano_add_ontology (pimo_ontology_SRCS
+                      ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/pimo/pimo.trig
+                      "PIMO"
+                      "Nepomuk::Vocabulary"
+                      "trig"
+)
+
+soprano_add_ontology (nco_ontology_SRCS
+                      ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nco.trig
+                      "NCO"
+                      "Nepomuk::Vocabulary"
+                      "trig"
+)
+
+soprano_add_ontology (nao_ontology_SRCS
+                      ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nepomuk/nao.trig
+                      "NAO"
+                      "Nepomuk::Vocabulary"
+                      "trig"
+)
+
+soprano_add_ontology (telepathy_ontology_SRCS
+                      ${TELEPATHY_TRIG_SOURCE}
+                      "Telepathy"
+                      "Nepomuk::Vocabulary"
+                      "trig"
+)
+
+kde4_add_library (ontologies
+                  STATIC
+                  ${telepathynie_SRCS}
+                  ${pimo_ontology_SRCS}
+                  ${nco_ontology_SRCS}
+                  ${nao_ontology_SRCS}
+                  ${telepathy_ontology_SRCS}
+)
+

-- 
ktp-contact-list packaging