[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=894190c

The following commit has been merged in the master branch:
commit 894190cf6eaded8e9b861b6123d872e17f43c797
Author: Dario Freddi <drf at kde.org>
Date:   Fri Mar 26 18:59:17 2010 +0000

    Fixing buildsystem:
     - Use shared desktop ontologies, as kdebase-runtime no longer ships ontologies
     - Add ${CMAKE_INSTALL_PREFIX}/share to telepathy.trig find path, which should make the whole system more solid
    
    
    svn path=/trunk/playground/network/telepathy-contactlist/; revision=1107773
---
 CMakeLists.txt | 123 +++++++++++++++------------------------------------------
 1 file changed, 32 insertions(+), 91 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 149c801..c04d8b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,87 +11,19 @@ find_package(Nepomuk REQUIRED)
 
 include (KDE4Defaults)
 include (MacroLibrary)
-include (NepomukAddOntologyClasses)
 
-# Find pimo.trig, which is installed already by kdebase.
-find_file (PIMO_TRIG_SOURCE
-           pimo.trig
-           PATHS "${DATA_INSTALL_DIR}" "${KDE4_DATA_DIR}"
-           ENV XDG_DATA_DIRS
-           PATH_SUFFIXES "ontology/pimo"
-)
-
-# We depend on pimo.trig, so fail horribly if it's not found.
-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)
-
-# Find nco.trig, which is installed already by kdebase.
-find_file (NCO_TRIG_SOURCE
-           nco.trig
-           PATHS "${DATA_INSTALL_DIR}" "${KDE4_DATA_DIR}"
-           ENV XDG_DATA_DIRS
-           PATH_SUFFIXES "ontology/nie"
-)
-
-# We depend on nco.trig, so fail horribly if it's not found.
-if (NOT NCO_TRIG_SOURCE)
-    message (ERROR_FATAL
-             "Could not find nco.trig NCO source file. Is kdebase-runtime installed?"
-    )
-endif (NOT NCO_TRIG_SOURCE)
-
-# Find nfo.trig, which is installed already by kdebase.
-find_file (NFO_TRIG_SOURCE
-           nfo.trig
-           PATHS "${DATA_INSTALL_DIR}" "${KDE4_DATA_DIR}"
-           ENV XDG_DATA_DIRS
-           PATH_SUFFIXES "ontology/nie"
-)
-
-# We depend on nfo.trig, so fail horribly if it's not found.
-if (NOT NFO_TRIG_SOURCE)
-    message (ERROR_FATAL
-             "Could not find nfo.trig NFO source file. Is kdebase-runtime installed?"
-    )
-endif (NOT NFO_TRIG_SOURCE)
-
-# Find nie.trig, which is installed already by kdebase.
-find_file (NIE_TRIG_SOURCE
-           nie.trig
-           PATHS "${DATA_INSTALL_DIR}" "${KDE4_DATA_DIR}"
-           ENV XDG_DATA_DIRS
-           PATH_SUFFIXES "ontology/nie"
-)
-
-# We depend on nie.trig, so fail horribly if it's not found.
-if (NOT NIE_TRIG_SOURCE)
-    message (ERROR_FATAL
-             "Could not find nie.trig NIE source file. Is kdebase-runtime installed?"
-    )
-endif (NOT NIE_TRIG_SOURCE)
+add_definitions (${KDE4_DEFINITIONS})
 
-# Find nmo.trig, which is installed already by kdebase.
-find_file (NMO_TRIG_SOURCE
-           nmo.trig
-           PATHS "${DATA_INSTALL_DIR}" "${KDE4_DATA_DIR}"
-           ENV XDG_DATA_DIRS
-           PATH_SUFFIXES "ontology/nie"
+include_directories (${KDE4_INCLUDES}
+                     ${TELEPATHY_QT4_INCLUDE_DIR}
+                     ${NEPOMUK_INCLUDES}
+                     ${CMAKE_CURRENT_BINARY_DIR}/nie
 )
 
-# We depend on nmo.trig, so fail horribly if it's not found.
-if (NOT NMO_TRIG_SOURCE)
-    message (ERROR_FATAL
-             "Could not find nmo.trig NMO source file. Is kdebase-runtime installed?"
-    )
-endif (NOT NMO_TRIG_SOURCE)
-
 # Find telepathy.trig, which is installed already by telepathy-integration-daemon.
 find_file (TELEPATHY_TRIG_SOURCE
            telepathy.trig
-           PATHS "${DATA_INSTALL_DIR}" "${KDE4_DATA_DIR}"
+           PATHS "${DATA_INSTALL_DIR}" "${KDE4_DATA_DIR}" "${CMAKE_INSTALL_PREFIX}/share"
            ENV XDG_DATA_DIRS
            PATH_SUFFIXES "ontology/telepathy"
 )
@@ -103,25 +35,16 @@ if (NOT TELEPATHY_TRIG_SOURCE)
     )
 endif (NOT TELEPATHY_TRIG_SOURCE)
 
-
-add_definitions (${KDE4_DEFINITIONS})
-
-include_directories (${KDE4_INCLUDES}
-                     ${TELEPATHY_QT4_INCLUDE_DIR}
-                     ${NEPOMUK_INCLUDES}
-                     ${CMAKE_CURRENT_BINARY_DIR}/nie
-)
-
 ###################################
 # First target - NIE static library
 
 nepomuk_add_ontology_classes (nie_SRCS
                               ONTOLOGIES
-                              ${NIE_TRIG_SOURCE}
-                              ${NFO_TRIG_SOURCE}
-                              ${NCO_TRIG_SOURCE}
-                              ${NMO_TRIG_SOURCE}
-                              ${PIMO_TRIG_SOURCE}
+                              ${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}
 )
 
@@ -153,9 +76,27 @@ kde4_add_ui_files (contactlist_SRCS
                    main-widget.ui
 )
 
-soprano_add_ontology(nco_SRCS ${NCO_TRIG_SOURCE} "NCO" "Nepomuk::Vocabulary" "trig")
-soprano_add_ontology(pimo_SRCS ${PIMO_TRIG_SOURCE} "PIMO" "Nepomuk::Vocabulary" "trig")
-soprano_add_ontology(telepathy_SRCS ${TELEPATHY_TRIG_SOURCE} "Telepathy" "Nepomuk::Vocabulary" "trig")
+# 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"
+)
+
+soprano_add_ontology (nco_SRCS
+                      ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nco.trig
+                      "NCO"
+                      "Nepomuk::Vocabulary"
+                      "trig"
+)
+
+soprano_add_ontology (telepathy_SRCS
+                      ${TELEPATHY_TRIG_SOURCE}
+                      "Telepathy"
+                      "Nepomuk::Vocabulary"
+                      "trig"
+)
 
 kde4_add_executable (telepathy_contactlist_prototype
                      ${contactlist_SRCS}

-- 
ktp-contact-list packaging