[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9
Maximiliano Curia
maxy at moszumanska.debian.org
Mon May 9 09:07:12 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=68467ff
The following commit has been merged in the master branch:
commit 68467ff191e0a85f7b36e4e68bc7e4c7e7d27b57
Author: George Goldberg <george.goldberg at collabora.co.uk>
Date: Thu Oct 14 21:46:16 2010 +0100
Build the autogenerated ontologies stuff in a separate directory so we don't get name conflicts between header files.
---
kpeople/nepomuk-feeder/CMakeLists.txt | 54 ++--------------------
kpeople/nepomuk-feeder/ontologies/CMakeLists.txt | 50 ++++++++++++++++++++
kpeople/nepomuk-feeder/telepathyaccount.cpp | 8 ++--
kpeople/nepomuk-feeder/telepathyaccount.h | 4 +-
kpeople/nepomuk-feeder/telepathyaccountmonitor.cpp | 4 +-
kpeople/nepomuk-feeder/telepathycontact.cpp | 12 ++---
kpeople/nepomuk-feeder/telepathycontact.h | 4 +-
kpeople/nepomuk-feeder/tests/account-test.cpp | 6 +--
kpeople/nepomuk-feeder/tests/contact-test.cpp | 6 +--
kpeople/nepomuk-feeder/tests/contact-test.h | 2 +-
kpeople/nepomuk-feeder/tests/tid-base-test.cpp | 2 +-
11 files changed, 79 insertions(+), 73 deletions(-)
diff --git a/kpeople/nepomuk-feeder/CMakeLists.txt b/kpeople/nepomuk-feeder/CMakeLists.txt
index c93c830..7db848f 100644
--- a/kpeople/nepomuk-feeder/CMakeLists.txt
+++ b/kpeople/nepomuk-feeder/CMakeLists.txt
@@ -35,39 +35,17 @@ include_directories (${KDE4_INCLUDES}
${KDEPIMLIBS_INCLUDE_DIRS}
${TELEPATHY_QT4_INCLUDE_DIR}
${NEPOMUK_INCLUDES}
- ${CMAKE_CURRENT_BINARY_DIR}/nie
+ ${CMAKE_BINARY_DIR}
)
set (CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}"
)
-###################################
-# First target - NIE static library
-
-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
- ${CMAKE_CURRENT_SOURCE_DIR}/telepathy.trig
-)
-
-kde4_add_library (nie
- STATIC
- ${nie_SRCS}
-)
-
-target_link_libraries (nie
- ${QT_QTCORE_LIBRARY}
- ${NEPOMUK_LIBRARIES}
-)
-
-set_property(TARGET nie PROPERTY COMPILE_FLAGS -fPIC)
+add_subdirectory (ontologies)
####################################
-# Second target - nepomuktelepathyservice static library
+# First target - nepomuktelepathyservice static library
set (nepomuktelepathyservice_static_SRCS
telepathyaccountmonitor.cpp
@@ -75,28 +53,6 @@ set (nepomuktelepathyservice_static_SRCS
telepathycontact.cpp
)
-# 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
- ${CMAKE_CURRENT_SOURCE_DIR}/telepathy.trig
- "Telepathy"
- "Nepomuk::Vocabulary"
- "trig"
-)
-
kde4_add_library (nepomuktelepathyservice-static
STATIC
${nepomuktelepathyservice_static_SRCS}
@@ -113,13 +69,13 @@ target_link_libraries (nepomuktelepathyservice-static
${SOPRANO_LIBRARIES}
${NEPOMUK_LIBRARIES}
${NEPOMUK_QUERY_LIBRARIES}
- nie
+ ontologies
)
set_property(TARGET nepomuktelepathyservice-static PROPERTY COMPILE_FLAGS -fPIC)
####################################
-# Third target - nepomuktelepatyservice
+# Second target - nepomuktelepatyservice
set (nepomuktelepathyservice_SRCS
nepomuktelepathyservice.cpp
diff --git a/kpeople/nepomuk-feeder/ontologies/CMakeLists.txt b/kpeople/nepomuk-feeder/ontologies/CMakeLists.txt
new file mode 100644
index 0000000..117f9d6
--- /dev/null
+++ b/kpeople/nepomuk-feeder/ontologies/CMakeLists.txt
@@ -0,0 +1,50 @@
+# 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 (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
+ ${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)
+
diff --git a/kpeople/nepomuk-feeder/telepathyaccount.cpp b/kpeople/nepomuk-feeder/telepathyaccount.cpp
index ecb5463..e683bbe 100644
--- a/kpeople/nepomuk-feeder/telepathyaccount.cpp
+++ b/kpeople/nepomuk-feeder/telepathyaccount.cpp
@@ -25,11 +25,11 @@
#include "telepathycontact.h"
// Ontology Vocabularies
-#include "nco.h"
-#include "telepathy.h"
+#include "ontologies/nco.h"
+#include "ontologies/telepathy.h"
-#include <informationelement.h>
-#include <dataobject.h>
+#include "ontologies/informationelement.h"
+#include "ontologies/dataobject.h"
#include <KDebug>
#include <kdeversion.h>
diff --git a/kpeople/nepomuk-feeder/telepathyaccount.h b/kpeople/nepomuk-feeder/telepathyaccount.h
index e01c0a3..d0283ea 100644
--- a/kpeople/nepomuk-feeder/telepathyaccount.h
+++ b/kpeople/nepomuk-feeder/telepathyaccount.h
@@ -22,8 +22,8 @@
#ifndef TELEPATHY_INTEGRATION_DAEMON_TELEPATHYACCOUNT_H
#define TELEPATHY_INTEGRATION_DAEMON_TELEPATHYACCOUNT_H
-#include "imaccount.h"
-#include "personcontact.h"
+#include "ontologies/imaccount.h"
+#include "ontologies/personcontact.h"
#include <QtCore/QObject>
#include <QtCore/QString>
diff --git a/kpeople/nepomuk-feeder/telepathyaccountmonitor.cpp b/kpeople/nepomuk-feeder/telepathyaccountmonitor.cpp
index e77b72b..5e1a041 100644
--- a/kpeople/nepomuk-feeder/telepathyaccountmonitor.cpp
+++ b/kpeople/nepomuk-feeder/telepathyaccountmonitor.cpp
@@ -22,8 +22,8 @@
#include "telepathyaccountmonitor.h"
// Ontology Vocabularies
-#include "nco.h"
-#include "pimo.h"
+#include "ontologies/nco.h"
+#include "ontologies/pimo.h"
#include <KDebug>
diff --git a/kpeople/nepomuk-feeder/telepathycontact.cpp b/kpeople/nepomuk-feeder/telepathycontact.cpp
index 6f5b2f0..dcba982 100644
--- a/kpeople/nepomuk-feeder/telepathycontact.cpp
+++ b/kpeople/nepomuk-feeder/telepathycontact.cpp
@@ -27,14 +27,14 @@
#include <TelepathyQt4/ContactCapabilities>
// Ontology Vocabularies
-#include "nco.h"
-#include "pimo.h"
-#include "telepathy.h"
+#include "ontologies/nco.h"
+#include "ontologies/pimo.h"
+#include "ontologies/telepathy.h"
// Full Resource Classes
-#include "contactgroup.h"
-#include "dataobject.h"
-#include "imcapability.h"
+#include "ontologies/contactgroup.h"
+#include "ontologies/dataobject.h"
+#include "ontologies/imcapability.h"
#include <KDebug>
diff --git a/kpeople/nepomuk-feeder/telepathycontact.h b/kpeople/nepomuk-feeder/telepathycontact.h
index 153ebd9..d496512 100644
--- a/kpeople/nepomuk-feeder/telepathycontact.h
+++ b/kpeople/nepomuk-feeder/telepathycontact.h
@@ -22,8 +22,8 @@
#ifndef TELEPATHY_INTEGRATION_DAEMON_TELEPATHYCONTACT_H
#define TELEPATHY_INTEGRATION_DAEMON_TELEPATHYCONTACT_H
-#include "imaccount.h"
-#include "personcontact.h"
+#include "ontologies/imaccount.h"
+#include "ontologies/personcontact.h"
#include <QtCore/QObject>
diff --git a/kpeople/nepomuk-feeder/tests/account-test.cpp b/kpeople/nepomuk-feeder/tests/account-test.cpp
index 473d689..712932b 100644
--- a/kpeople/nepomuk-feeder/tests/account-test.cpp
+++ b/kpeople/nepomuk-feeder/tests/account-test.cpp
@@ -32,9 +32,9 @@
#include <Nepomuk/Thing>
#include <Nepomuk/Variant>
-#include <nco.h>
-#include <dataobject.h>
-#include <informationelement.h>
+#include "ontologies/nco.h"
+#include "ontologies/dataobject.h"
+#include "ontologies/informationelement.h"
#include <TelepathyQt4/ConnectionManager>
diff --git a/kpeople/nepomuk-feeder/tests/contact-test.cpp b/kpeople/nepomuk-feeder/tests/contact-test.cpp
index c5460a8..389d7b3 100644
--- a/kpeople/nepomuk-feeder/tests/contact-test.cpp
+++ b/kpeople/nepomuk-feeder/tests/contact-test.cpp
@@ -25,12 +25,12 @@
#include <TelepathyQt4/PendingReady>
#include <TelepathyQt4/ContactManager>
#include <Soprano/Node>
-#include <telepathy.h>
-#include <nco.h>
+#include "ontologies/telepathy.h"
+#include "ontologies/nco.h"
#include <Nepomuk/ResourceManager>
#include <Soprano/QueryResultIterator>
#include <Soprano/Model>
-#include <imaccount.h>
+#include "ontologies/imaccount.h"
#include <TelepathyQt4/Account>
#include <TelepathyQt4/PendingVoid>
diff --git a/kpeople/nepomuk-feeder/tests/contact-test.h b/kpeople/nepomuk-feeder/tests/contact-test.h
index e30c197..cd12041 100644
--- a/kpeople/nepomuk-feeder/tests/contact-test.h
+++ b/kpeople/nepomuk-feeder/tests/contact-test.h
@@ -23,7 +23,7 @@
#define CONTACT_TEST_H
#include <tid-base-test.h>
-#include <imaccount.h>
+#include "ontologies/imaccount.h"
class ContactTest : public TidBaseTest
{
diff --git a/kpeople/nepomuk-feeder/tests/tid-base-test.cpp b/kpeople/nepomuk-feeder/tests/tid-base-test.cpp
index f4ff017..da2d629 100644
--- a/kpeople/nepomuk-feeder/tests/tid-base-test.cpp
+++ b/kpeople/nepomuk-feeder/tests/tid-base-test.cpp
@@ -28,7 +28,7 @@
#include <Nepomuk/ResourceManager>
#include <Nepomuk/Thing>
-#include <nco.h>
+#include "ontologies/nco.h"
#include <TelepathyQt4/PendingAccount>
#include <TelepathyQt4/PendingReady>
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list