[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-runtime] activitymanager/plugins/nepomuk: Reland Revision
From:       Raymond Wooninck <tittiatcoke () gmail ! com>
Date:       2011-09-01 11:37:14
Message-ID: 20110901113714.96EE1A6078 () git ! kde ! org
[Download RAW message or body]

Git commit 4107641ae477be8bf09835503234a146f3d1f908 by Raymond Wooninck.
Committed on 01/09/2011 at 13:36.
Pushed by rwooninck into branch 'master'.

Reland Revision a9cbf462: Fix building nepomuk plugin without symbol
collision

M  +1    -1    activitymanager/plugins/nepomuk/NepomukResourceScoreCache.cpp
M  +2    -10   activitymanager/plugins/nepomuk/CMakeLists.txt
M  +1    -1    activitymanager/plugins/nepomuk/NepomukCommon.h

http://commits.kde.org/kde-runtime/4107641ae477be8bf09835503234a146f3d1f908

diff --git a/activitymanager/plugins/nepomuk/CMakeLists.txt \
b/activitymanager/plugins/nepomuk/CMakeLists.txt index 7900519..dcb19fe 100644
--- a/activitymanager/plugins/nepomuk/CMakeLists.txt
+++ b/activitymanager/plugins/nepomuk/CMakeLists.txt
@@ -3,6 +3,8 @@ project(activitymanager-plugin-nepomuk)
 # Checking for Nepomuk
 find_package(Nepomuk REQUIRED)
 
+include_directories(${NEPOMUK_INCLUDE_DIR})
+
 set(
    nepomuk_SRCS
    NepomukPlugin.cpp
@@ -18,20 +20,10 @@ soprano_add_ontology(nepomuk_SRCS
     )
 
 soprano_add_ontology(nepomuk_SRCS
-    ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nie.trig
-    "NIE" "Nepomuk::Vocabulary" "trig"
-    )
-
-soprano_add_ontology(nepomuk_SRCS
     ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nepomuk/nao.trig
     "NAO" "Nepomuk::Vocabulary" "trig"
     )
 
-soprano_add_ontology(nepomuk_SRCS
-    ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nepomuk/nuao.trig
-    "NUAO" "Nepomuk::Vocabulary" "trig"
-    )
-
 include_directories(
    ${CMAKE_SOURCE_DIR}
    ${CMAKE_BINARY_DIR}
diff --git a/activitymanager/plugins/nepomuk/NepomukCommon.h \
b/activitymanager/plugins/nepomuk/NepomukCommon.h index 222c9c0..5cfb764 100644
--- a/activitymanager/plugins/nepomuk/NepomukCommon.h
+++ b/activitymanager/plugins/nepomuk/NepomukCommon.h
@@ -20,7 +20,7 @@
 #ifndef NEPOMUK_COMMON_H_
 #define NEPOMUK_COMMON_H_
 
-#include "nie.h"
+#include <nepomuk/nie.h>
 #include "NepomukPlugin.h"
 
 #include <Nepomuk/Variant>
diff --git a/activitymanager/plugins/nepomuk/NepomukResourceScoreCache.cpp \
b/activitymanager/plugins/nepomuk/NepomukResourceScoreCache.cpp index \
                702b3f9..c78c438 100644
--- a/activitymanager/plugins/nepomuk/NepomukResourceScoreCache.cpp
+++ b/activitymanager/plugins/nepomuk/NepomukResourceScoreCache.cpp
@@ -32,7 +32,7 @@
 
 #include "kext.h"
 #include "nao.h"
-#include "nuao.h"
+#include <nepomuk/nuao.h>
 
 #include "ActivityManager.h"
 


[prev in list] [next in list] [prev in thread] [next in thread]