playground/base/nepomuk-kde

[Michael Jansen]

SVN commit 1014080 by mjansen:

The file are installed into ${DATA_INSTALL_DIR}/nepomuk/ontologies by
kdebase/runtime . So we have to look in KDE_DATA_INSTALL_DIR for them.
Which already contains the "apps/" part.

CCMAIL: kde-buildsystem at kde.org

 M  +3 -3      contactapi/CMakeLists.txt  
 M  +2 -2      kioslaves/tags/CMakeLists.txt  
 M  +9 -9      nepomukutils/CMakeLists.txt  


--- trunk/playground/base/nepomuk-kde/contactapi/CMakeLists.txt #1014079:1014080
@@ -13,10 +13,10 @@
   ${CMAKE_CURRENT_BINARY_DIR}
   )
 
-find_file(NCO_SOURCE 
+find_file(NCO_SOURCE
   nco.trig
-  PATHS ${KDE4_DATA_INSTALL_DIR}/.. ENV XDG_DATA_DIRS
-  PATH_SUFFIXES "apps/nepomuk/ontologies"
+  PATHS ${KDE4_DATA_INSTALL_DIR}
+  PATH_SUFFIXES "nepomuk/ontologies"
   NO_DEFAULT_PATH
   )
 
--- trunk/playground/base/nepomuk-kde/kioslaves/tags/CMakeLists.txt #1014079:1014080
@@ -9,8 +9,8 @@
 
 find_file(NIE_TRIG_SOURCE 
   nie.trig
-  PATHS "${KDE4_DATA_INSTALL_DIR}/.." "${KDE4_DATA_INSTALL_DIR}" ENV XDG_DATA_DIRS
-  PATH_SUFFIXES "apps/nepomuk/ontologies"
+  PATHS ${KDE4_DATA_INSTALL_DIR}
+  PATH_SUFFIXES "nepomuk/ontologies"
   NO_DEFAULT_PATH
   )
 if(NOT NIE_TRIG_SOURCE)
--- trunk/playground/base/nepomuk-kde/nepomukutils/CMakeLists.txt #1014079:1014080
@@ -23,22 +23,22 @@
   )
 
 # find the pimo.trig file from the kdebase installation
-find_file(NIE_TRIG_SOURCE 
+find_file(NIE_TRIG_SOURCE
   nie.trig
-  PATHS ${KDE4_DATA_INSTALL_DIR}/.. ENV XDG_DATA_DIRS
-  PATH_SUFFIXES "apps/nepomuk/ontologies"
+  PATHS ${KDE4_DATA_INSTALL_DIR}
+  PATH_SUFFIXES "nepomuk/ontologies"
   NO_DEFAULT_PATH
   )
-find_file(NFO_TRIG_SOURCE 
+find_file(NFO_TRIG_SOURCE
   nfo.trig
-  PATHS ${KDE4_DATA_INSTALL_DIR}/.. ENV XDG_DATA_DIRS
-  PATH_SUFFIXES "apps/nepomuk/ontologies"
+  PATHS ${KDE4_DATA_INSTALL_DIR}
+  PATH_SUFFIXES "nepomuk/ontologies"
   NO_DEFAULT_PATH
   )
-find_file(PIMO_TRIG_SOURCE 
+find_file(PIMO_TRIG_SOURCE
   pimo.trig
-  PATHS "${DATA_INSTALL_DIR}" "${KDE4_DATA_DIR}" ENV XDG_DATA_DIRS
-  PATH_SUFFIXES "apps/nepomuk/ontologies"
+  PATHS ${KDE4_DATA_INSTALL_DIR}
+  PATH_SUFFIXES "nepomuk/ontologies"
   NO_DEFAULT_PATH
   )