- Merged KMetaData, Konto, and KNepomuk into one nepomuk folder with two libs:

  1. libnepomuk now contains KMetaData and Konto, only using one single namespace "Nepomuk"
  2. libnepomuk-middleware is now what knepomuk was before and has the namespace "Nepomuk::Middleware"

This makes the design much cleaner and less confusing since we have one name for everything: Nepomuk.
I was not happy with Braid and we did not find another name so I stick to Nepomuk now. In the end people
now already now this stuff as Nepomuk and it makes the project happy. ;)

CCMAIL: nepomuk-kde.semanticdesktop.org

svn path=/trunk/KDE/kdelibs/; revision=674110

3 files changed, 48 insertions, 48 deletions

diff --git a/modules/FindKMetaData.cmake b/modules/FindKMetaData.cmake
deleted file mode 100644
index 9cb59542..00000000
--- a/modules/FindKMetaData.cmake
+++ /dev/null
@@ -1,43 +0,0 @@
-# Once done this will define
-#
-#  KMETADATA_FOUND - system has KMetaData
-#  KMETADATA_INCLUDE_DIR - the KMetaData include directory
-#  KMETADATA_LIBRARIES - Link these to use KMetaData
-#  KMETADATA_DEFINITIONS - Compiler switches required for using KMetaData
-#
-
-FIND_PATH(KMETADATA_INCLUDE_DIR
-  NAMES
-  kmetadata/kmetadata.h
-  PATHS
-  ${KDE4_INCLUDE_DIR}
-  ${INCLUDE_INSTALL_DIR}
-)
-
-FIND_LIBRARY(KMETADATA_LIBRARIES
-  NAMES
-  kmetadata
-  kmetadatatools
-  PATHS
-  ${KDE4_LIB_DIR}
-  ${LIB_INSTALL_DIR}
-)
-
-if(KMETADATA_INCLUDE_DIR AND KMETADATA_LIBRARIES)
-  set(KMetaData_FOUND TRUE)
-endif(KMETADATA_INCLUDE_DIR AND KMETADATA_LIBRARIES)
-
-if(KMetaData_FOUND)
-  if(NOT KMetaData_FIND_QUIETLY)
-    message(STATUS "Found KMetaData: ${KMETADATA_LIBRARIES}")
-  endif(NOT KMetaData_FIND_QUIETLY)
-else(KMetaData_FOUND)
-  if(KMetaData_FIND_REQUIRED)
-    if(NOT KMETADATA_INCLUDE_DIR)
-      message(FATAL_ERROR "Could not find KMetaData includes.")
-    endif(NOT KMETADATA_INCLUDE_DIR)
-    if(NOT KMETADATA_LIBRARIES)
-      message(FATAL_ERROR "Could not find KMetaData library.")
-    endif(NOT KMETADATA_LIBRARIES)
-  endif(KMetaData_FIND_REQUIRED)
-endif(KMetaData_FOUND)
diff --git a/modules/FindNepomuk.cmake b/modules/FindNepomuk.cmake
new file mode 100644
index 00000000..dc1d36a7
--- /dev/null
+++ b/modules/FindNepomuk.cmake
@@ -0,0 +1,43 @@
+# Once done this will define
+#
+#  NEPOMUK_FOUND - system has Nepomuk
+#  NEPOMUK_INCLUDE_DIR - the Nepomuk include directory
+#  NEPOMUK_LIBRARIES - Link these to use Nepomuk
+#  NEPOMUK_DEFINITIONS - Compiler switches required for using Nepomuk
+#
+
+FIND_PATH(NEPOMUK_INCLUDE_DIR
+  NAMES
+  nepomuk/resource.h
+  PATHS
+  ${KDE4_INCLUDE_DIR}
+  ${INCLUDE_INSTALL_DIR}
+)
+
+FIND_LIBRARY(NEPOMUK_LIBRARIES
+  NAMES
+  nepomuk
+  nepomuk-middleware
+  PATHS
+  ${KDE4_LIB_DIR}
+  ${LIB_INSTALL_DIR}
+)
+
+if(NEPOMUK_INCLUDE_DIR AND NEPOMUK_LIBRARIES)
+  set(Nepomuk_FOUND TRUE)
+endif(NEPOMUK_INCLUDE_DIR AND NEPOMUK_LIBRARIES)
+
+if(Nepomuk_FOUND)
+  if(NOT Nepomuk_FIND_QUIETLY)
+    message(STATUS "Found Nepomuk: ${NEPOMUK_LIBRARIES}")
+  endif(NOT Nepomuk_FIND_QUIETLY)
+else(Nepomuk_FOUND)
+  if(Nepomuk_FIND_REQUIRED)
+    if(NOT NEPOMUK_INCLUDE_DIR)
+      message(FATAL_ERROR "Could not find Nepomuk includes.")
+    endif(NOT NEPOMUK_INCLUDE_DIR)
+    if(NOT NEPOMUK_LIBRARIES)
+      message(FATAL_ERROR "Could not find Nepomuk library.")
+    endif(NOT NEPOMUK_LIBRARIES)
+  endif(Nepomuk_FIND_REQUIRED)
+endif(Nepomuk_FOUND)
diff --git a/modules/KMetaDataMacros.cmake b/modules/NepomukMacros.cmake
index b65542e8..af534451 100644
--- a/modules/KMetaDataMacros.cmake
+++ b/modules/NepomukMacros.cmake
@@ -1,11 +1,11 @@
 # This file contains the following macros:
 #
-# KMETADATA_GENERATE_FROM_ONTOLOGY
+# NEPOMUK_GENERATE_FROM_ONTOLOGY
 #
 
 
 #
-# KMETADATA_GENERATE_FROM_ONTOLOGY
+# NEPOMUK_GENERATE_FROM_ONTOLOGY
 # (C) 2007 Sebastian Trueg <trueg@kde.org>
 #
 # Parameters:
@@ -18,9 +18,9 @@
 #
 # In addition to the parameters an arbitrary number of template filenames can be set as arguments
 #
-macro(KMETADATA_GENERATE_FROM_ONTOLOGY ontofile targetdir out_headers out_sources out_includes)
+macro(NEPOMUK_GENERATE_FROM_ONTOLOGY ontofile targetdir out_headers out_sources out_includes)
 
-  FIND_PROGRAM(RCGEN kmetadata_rcgen PATHS ${BIN_INSTALL_DIR})
+  FIND_PROGRAM(RCGEN nepomuk-rcgen PATHS ${BIN_INSTALL_DIR})
   if(RCGEN-NOTFOUND)
     message( FATAL_ERROR "Failed to find the KMetaData source generator" )
   endif(RCGEN-NOTFOUND)
@@ -46,4 +46,4 @@ macro(KMETADATA_GENERATE_FROM_ONTOLOGY ontofile targetdir out_headers out_source
     COMMAND ${RCGEN} --writeall --templates ${ARGN} --target ${targetdir}/ --ontologies ${ontofile}
     )
   
-endmacro(KMETADATA_GENERATE_FROM_ONTOLOGY)
+endmacro(NEPOMUK_GENERATE_FROM_ONTOLOGY)