[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: trunk [POSSIBLY UNSAFE]
From: Sebastian Trueg <sebastian () trueg ! de>
Date: 2007-04-30 21:48:27
Message-ID: 1177969707.439512.25479.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 659840 by trueg:
* Moved Soprano/QRDF to kdesupport
* Moved libKnepomuk, libKonto, and libKMetaData into kdelibs
(the GUI elements still need to be sorted out.)
* Moved the KNepomuk coreservices and the service registry into
kdebase/runtime.
It was agreed that this move makes sense even though KDE should be frozen
already since it is an important technology.
All of the new modules are optional which means that if Soprano is not installed
none of the KNepomuk parts will be. Still missing is a cmake message
stating this.
CCMAIL: nepomuk-kde@semanticdesktop.org
M +2 -0 KDE/kdebase/CMakeLists.txt
A KDE/kdebase/cmake/modules/FindKNepomuk.cmake
A KDE/kdebase/cmake/modules/FindSoprano.cmake \
kdereview/nepomuk-kde/backbone/cmake/modules/FindSoprano.cmake#659730 M +3 -0 \
KDE/kdebase/runtime/CMakeLists.txt A KDE/kdebase/runtime/knepomuk \
(directory) A KDE/kdebase/runtime/knepomuk/CMakeLists.txt \
kdereview/nepomuk-kde/backbone/CMakeLists.txt#659730 A \
KDE/kdebase/runtime/knepomuk/coreservices (directory) \
kdereview/nepomuk-kde/backbone/coreservices#659730 A \
KDE/kdebase/runtime/knepomuk/coreservices/CMakeLists.txt \
kdereview/nepomuk-kde/backbone/coreservices/CMakeLists.txt#659838 A \
KDE/kdebase/runtime/knepomuk/coreservices/cache.cpp \
kdereview/nepomuk-kde/backbone/coreservices/cache.cpp#659838 [License: GPL (v2+)] A \
KDE/kdebase/runtime/knepomuk/coreservices/cache.h \
kdereview/nepomuk-kde/backbone/coreservices/cache.h#659838 [License: GPL (v2+)] A \
KDE/kdebase/runtime/knepomuk/coreservices/coreservices.cpp \
kdereview/nepomuk-kde/backbone/coreservices/coreservices.cpp#659838 [POSSIBLY UNSAFE: \
system] [License: GPL (v2+)] A \
KDE/kdebase/runtime/knepomuk/coreservices/coreservices.h \
kdereview/nepomuk-kde/backbone/coreservices/coreservices.h#659838 [License: GPL \
(v2+)] A KDE/kdebase/runtime/knepomuk/coreservices/dbusinterface.cpp \
kdereview/nepomuk-kde/backbone/coreservices/dbusinterface.cpp#659838 [License: GPL \
(v2+)] A KDE/kdebase/runtime/knepomuk/coreservices/dbusinterface.h \
kdereview/nepomuk-kde/backbone/coreservices/dbusinterface.h#659838 [License: GPL \
(v2+)] A \
KDE/kdebase/runtime/knepomuk/coreservices/knepomuk-coreservices.desktop \
kdereview/nepomuk-kde/backbone/coreservices/knepomuk-coreservices.desktop#659838 A \
KDE/kdebase/runtime/knepomuk/coreservices/main.cpp \
kdereview/nepomuk-kde/backbone/coreservices/main.cpp#659838 [License: GPL (v2+)] A \
KDE/kdebase/runtime/knepomuk/coreservices/querydefinition.cpp \
kdereview/nepomuk-kde/backbone/coreservices/querydefinition.cpp#659838 [License: GPL \
(v2+)] A KDE/kdebase/runtime/knepomuk/coreservices/querydefinition.h \
kdereview/nepomuk-kde/backbone/coreservices/querydefinition.h#659838 [License: GPL \
(v2+)] A \
KDE/kdebase/runtime/knepomuk/coreservices/sopranordfrepository.cpp \
kdereview/nepomuk-kde/backbone/coreservices/sopranordfrepository.cpp#659838 [POSSIBLY \
UNSAFE: system] [License: GPL (v2+)] A \
KDE/kdebase/runtime/knepomuk/coreservices/sopranordfrepository.h \
kdereview/nepomuk-kde/backbone/coreservices/sopranordfrepository.h#659838 [License: \
GPL (v2+)] A \
KDE/kdebase/runtime/knepomuk/coreservices/uniqueurigenerator.cpp \
kdereview/nepomuk-kde/backbone/coreservices/uniqueurigenerator.cpp#659838 [License: \
GPL (v2+)] A \
KDE/kdebase/runtime/knepomuk/coreservices/uniqueurigenerator.h \
kdereview/nepomuk-kde/backbone/coreservices/uniqueurigenerator.h#659838 [License: GPL \
(v2+)] A KDE/kdebase/runtime/knepomuk/service-registry (directory) \
kdereview/nepomuk-kde/backbone/service-registry#659730 A \
KDE/kdebase/runtime/knepomuk/service-registry/CMakeLists.txt \
kdereview/nepomuk-kde/backbone/service-registry/CMakeLists.txt#659838 A \
KDE/kdebase/runtime/knepomuk/service-registry/TODO \
kdereview/nepomuk-kde/backbone/service-registry/TODO#659838 A \
KDE/kdebase/runtime/knepomuk/service-registry/core (directory) \
kdereview/nepomuk-kde/backbone/service-registry/core#659838 M +3 -2 \
KDE/kdebase/runtime/knepomuk/service-registry/core/CMakeLists.txt A \
KDE/kdebase/runtime/knepomuk/service-registry/daemon (directory) \
kdereview/nepomuk-kde/backbone/service-registry/daemon#659838 M +10 -0 \
KDE/kdelibs/CMakeLists.txt A KDE/kdelibs/cmake/modules/FindKonto.cmake \
kdereview/nepomuk-kde/konto/cmake/FindKonto.cmake#659730 A \
KDE/kdelibs/kmetadata (directory) kdereview/nepomuk-kde/kmetadata#659730 A \
KDE/kdelibs/kmetadata/CMakeLists.txt \
kdereview/nepomuk-kde/kmetadata/CMakeLists.txt#659838 A \
KDE/kdelibs/kmetadata/Doxyfile kdereview/nepomuk-kde/kmetadata/Doxyfile#659838 A \
KDE/kdelibs/kmetadata/Doxyfile.cmake \
kdereview/nepomuk-kde/kmetadata/Doxyfile.cmake#659838 A \
KDE/kdelibs/kmetadata/README kdereview/nepomuk-kde/kmetadata/README#659838 A \
KDE/kdelibs/kmetadata/TODO kdereview/nepomuk-kde/kmetadata/TODO#659838 A \
KDE/kdelibs/kmetadata/cmake (directory) \
kdereview/nepomuk-kde/kmetadata/cmake#659838 A \
KDE/kdelibs/kmetadata/kmetadata (directory) \
kdereview/nepomuk-kde/kmetadata/kmetadata#659838 M +7 -7 \
KDE/kdelibs/kmetadata/kmetadata/CMakeLists.txt M +0 -1 \
KDE/kdelibs/kmetadata/kmetadata/kmetadata.h M +1 -0 \
KDE/kdelibs/kmetadata/kmetadata/resourcemanager.cpp M +0 -2 \
KDE/kdelibs/kmetadata/kmetadata/resourcemanager.h M +1 -1 \
KDE/kdelibs/kmetadata/kmetadata/ui/ktagcloudwidget.cpp A \
KDE/kdelibs/kmetadata/ontologies (directory) \
kdereview/nepomuk-kde/kmetadata/ontologies#659838 A \
KDE/kdelibs/kmetadata/ontology.rdf \
kdereview/nepomuk-kde/kmetadata/ontology.rdf#659838 A \
KDE/kdelibs/kmetadata/rcgen (directory) \
kdereview/nepomuk-kde/kmetadata/rcgen#659838 M +0 -23 \
KDE/kdelibs/kmetadata/rcgen/CMakeLists.txt A \
KDE/kdelibs/kmetadata/tests (directory) \
kdereview/nepomuk-kde/kmetadata/tests#659838 M +1 -3 \
KDE/kdelibs/kmetadata/tests/CMakeLists.txt A KDE/kdelibs/knepomuk \
(directory) kdereview/nepomuk-kde/backbone/knepomuk#659730 A \
KDE/kdelibs/knepomuk/CMakeLists.txt \
kdereview/nepomuk-kde/backbone/knepomuk/CMakeLists.txt#659838 A \
KDE/kdelibs/knepomuk/TODO kdereview/nepomuk-kde/backbone/knepomuk/TODO#659838 D \
KDE/kdelibs/knepomuk/cmake (directory) A \
KDE/kdelibs/knepomuk/dbustools.cpp \
kdereview/nepomuk-kde/backbone/knepomuk/dbustools.cpp#659838 [License: GPL (v2+)] A \
KDE/kdelibs/knepomuk/dbustools.h \
kdereview/nepomuk-kde/backbone/knepomuk/dbustools.h#659838 [License: GPL (v2+)] A \
KDE/kdelibs/knepomuk/error.h kdereview/nepomuk-kde/backbone/knepomuk/error.h#659838 \
[License: GPL (v2+)] A KDE/kdelibs/knepomuk/knepomuk.h \
kdereview/nepomuk-kde/backbone/knepomuk/knepomuk.h#659838 [License: GPL (v2+)] A \
KDE/kdelibs/knepomuk/knepomuk_export.h \
kdereview/nepomuk-kde/backbone/knepomuk/knepomuk_export.h#659838 [License: LGPL \
(v2+)] A KDE/kdelibs/knepomuk/message.cpp \
kdereview/nepomuk-kde/backbone/knepomuk/message.cpp#659838 [License: GPL (v2+)] A \
KDE/kdelibs/knepomuk/message.h \
kdereview/nepomuk-kde/backbone/knepomuk/message.h#659838 [License: GPL (v2+)] A \
KDE/kdelibs/knepomuk/rdf (directory) \
kdereview/nepomuk-kde/backbone/knepomuk/rdf#659838 A \
KDE/kdelibs/knepomuk/registry.cpp \
kdereview/nepomuk-kde/backbone/knepomuk/registry.cpp#659838 [License: GPL (v2+)] A \
KDE/kdelibs/knepomuk/registry.h \
kdereview/nepomuk-kde/backbone/knepomuk/registry.h#659838 [License: GPL (v2+)] A \
KDE/kdelibs/knepomuk/registrydbusbackend.cpp \
kdereview/nepomuk-kde/backbone/knepomuk/registrydbusbackend.cpp#659838 [License: GPL \
(v2+)] A KDE/kdelibs/knepomuk/registrydbusbackend.h \
kdereview/nepomuk-kde/backbone/knepomuk/registrydbusbackend.h#659838 [License: GPL \
(v2+)] A KDE/kdelibs/knepomuk/registrydbusinterface.cpp \
kdereview/nepomuk-kde/backbone/knepomuk/registrydbusinterface.cpp#659838 [License: \
GPL (v2+)] A KDE/kdelibs/knepomuk/registrydbusinterface.h \
kdereview/nepomuk-kde/backbone/knepomuk/registrydbusinterface.h#659838 [License: GPL \
(v2+)] A KDE/kdelibs/knepomuk/result.cpp \
kdereview/nepomuk-kde/backbone/knepomuk/result.cpp#659838 [License: GPL (v2+)] A \
KDE/kdelibs/knepomuk/result.h \
kdereview/nepomuk-kde/backbone/knepomuk/result.h#659838 [License: GPL (v2+)] A \
KDE/kdelibs/knepomuk/service.cpp \
kdereview/nepomuk-kde/backbone/knepomuk/service.cpp#659838 [License: GPL (v2+)] A \
KDE/kdelibs/knepomuk/service.h \
kdereview/nepomuk-kde/backbone/knepomuk/service.h#659838 [License: GPL (v2+)] A \
KDE/kdelibs/knepomuk/servicedbusinterfacebackend.cpp \
kdereview/nepomuk-kde/backbone/knepomuk/servicedbusinterfacebackend.cpp#659838 \
[License: GPL (v2+)] A \
KDE/kdelibs/knepomuk/servicedbusinterfacebackend.h \
kdereview/nepomuk-kde/backbone/knepomuk/servicedbusinterfacebackend.h#659838 \
[License: GPL (v2+)] A KDE/kdelibs/knepomuk/servicedesc.h \
kdereview/nepomuk-kde/backbone/knepomuk/servicedesc.h#659838 [License: GPL (v2+)] A \
KDE/kdelibs/knepomuk/servicepublisher.cpp \
kdereview/nepomuk-kde/backbone/knepomuk/servicepublisher.cpp#659838 [License: GPL \
(v2+)] A KDE/kdelibs/knepomuk/servicepublisher.h \
kdereview/nepomuk-kde/backbone/knepomuk/servicepublisher.h#659838 [License: GPL \
(v2+)] A KDE/kdelibs/knepomuk/servicepublisherdbusinterface.cpp \
kdereview/nepomuk-kde/backbone/knepomuk/servicepublisherdbusinterface.cpp#659838 \
[License: GPL (v2+)] A \
KDE/kdelibs/knepomuk/servicepublisherdbusinterface.h \
kdereview/nepomuk-kde/backbone/knepomuk/servicepublisherdbusinterface.h#659838 \
[License: GPL (v2+)] A KDE/kdelibs/knepomuk/services (directory) \
kdereview/nepomuk-kde/backbone/knepomuk/services#659838 A \
KDE/kdelibs/knepomuk/servicewrapper.cpp \
kdereview/nepomuk-kde/backbone/knepomuk/servicewrapper.cpp#659838 [License: GPL \
(v2+)] A KDE/kdelibs/knepomuk/servicewrapper.h \
kdereview/nepomuk-kde/backbone/knepomuk/servicewrapper.h#659838 [License: GPL (v2+)] \
A KDE/kdelibs/konto (directory) kdereview/nepomuk-kde/konto#659730 A \
KDE/kdelibs/konto/CMakeLists.txt kdereview/nepomuk-kde/konto/CMakeLists.txt#659838 \
A KDE/kdelibs/konto/README kdereview/nepomuk-kde/konto/README#659838 A \
KDE/kdelibs/konto/class.cpp kdereview/nepomuk-kde/konto/class.cpp#659838 [License: \
LGPL (v2+)] A KDE/kdelibs/konto/class.h \
kdereview/nepomuk-kde/konto/class.h#659838 [License: LGPL (v2+)] A \
KDE/kdelibs/konto/class_p.h kdereview/nepomuk-kde/konto/class_p.h#659838 [License: \
LGPL (v2+)] D KDE/kdelibs/konto/cmake (directory)
A KDE/kdelibs/konto/desktopontologyloader.cpp \
kdereview/nepomuk-kde/konto/desktopontologyloader.cpp#659838 [License: LGPL (v2+)] A \
KDE/kdelibs/konto/desktopontologyloader.h \
kdereview/nepomuk-kde/konto/desktopontologyloader.h#659838 [License: LGPL (v2+)] A \
KDE/kdelibs/konto/entity.cpp kdereview/nepomuk-kde/konto/entity.cpp#659838 \
[License: LGPL (v2+)] A KDE/kdelibs/konto/entity.h \
kdereview/nepomuk-kde/konto/entity.h#659838 [License: LGPL (v2+)] A \
KDE/kdelibs/konto/entity_p.h kdereview/nepomuk-kde/konto/entity_p.h#659838 \
[License: LGPL (v2+)] A KDE/kdelibs/konto/fileontologyloader.cpp \
kdereview/nepomuk-kde/konto/fileontologyloader.cpp#659838 [License: LGPL (v2+)] A \
KDE/kdelibs/konto/fileontologyloader.h \
kdereview/nepomuk-kde/konto/fileontologyloader.h#659838 [License: LGPL (v2+)] A \
KDE/kdelibs/konto/global.cpp kdereview/nepomuk-kde/konto/global.cpp#659838 \
[License: LGPL (v2+)] A KDE/kdelibs/konto/global.h \
kdereview/nepomuk-kde/konto/global.h#659838 [License: LGPL (v2+)] A \
KDE/kdelibs/konto/konto_export.h kdereview/nepomuk-kde/konto/konto_export.h#659838 \
[License: LGPL (v2+)] A KDE/kdelibs/konto/literal.cpp \
kdereview/nepomuk-kde/konto/literal.cpp#659838 [License: LGPL (v2+)] A \
KDE/kdelibs/konto/literal.h kdereview/nepomuk-kde/konto/literal.h#659838 [License: \
LGPL (v2+)] A KDE/kdelibs/konto/literal_p.h \
kdereview/nepomuk-kde/konto/literal_p.h#659838 [License: LGPL (v2+)] A \
KDE/kdelibs/konto/nepomukontologyloader.cpp \
kdereview/nepomuk-kde/konto/nepomukontologyloader.cpp#659838 [License: LGPL (v2+)] A \
KDE/kdelibs/konto/nepomukontologyloader.h \
kdereview/nepomuk-kde/konto/nepomukontologyloader.h#659838 [License: LGPL (v2+)] A \
KDE/kdelibs/konto/ontology.cpp kdereview/nepomuk-kde/konto/ontology.cpp#659838 \
[License: LGPL (v2+)] A KDE/kdelibs/konto/ontology.h \
kdereview/nepomuk-kde/konto/ontology.h#659838 [License: LGPL (v2+)] A \
KDE/kdelibs/konto/ontology_p.h kdereview/nepomuk-kde/konto/ontology_p.h#659838 \
[License: LGPL (v2+)] A KDE/kdelibs/konto/ontologyloader.cpp \
kdereview/nepomuk-kde/konto/ontologyloader.cpp#659838 [License: LGPL (v2+)] A \
KDE/kdelibs/konto/ontologyloader.h \
kdereview/nepomuk-kde/konto/ontologyloader.h#659838 [License: LGPL (v2+)] A \
KDE/kdelibs/konto/ontologymanager.cpp \
kdereview/nepomuk-kde/konto/ontologymanager.cpp#659838 [License: LGPL (v2+)] A \
KDE/kdelibs/konto/ontologymanager.h \
kdereview/nepomuk-kde/konto/ontologymanager.h#659838 [License: LGPL (v2+)] A \
KDE/kdelibs/konto/property.cpp kdereview/nepomuk-kde/konto/property.cpp#659838 \
[License: LGPL (v2+)] A KDE/kdelibs/konto/property.h \
kdereview/nepomuk-kde/konto/property.h#659838 [License: LGPL (v2+)] A \
KDE/kdelibs/konto/property_p.h kdereview/nepomuk-kde/konto/property_p.h#659838 \
[License: LGPL (v2+)] A KDE/kdelibs/konto/qurlhash.cpp \
kdereview/nepomuk-kde/konto/qurlhash.cpp#659838 [License: LGPL (v2+)] A \
KDE/kdelibs/konto/qurlhash.h kdereview/nepomuk-kde/konto/qurlhash.h#659838 \
[License: LGPL (v2+)] A KDE/kdelibs/konto/test (directory) \
kdereview/nepomuk-kde/konto/test#659838 M +3 -3 \
KDE/kdelibs/konto/test/desktopontologyloadertest.cpp M +0 -7 \
kdereview/CMakeLists.txt D \
kdereview/nepomuk-kde/backbone/CMakeLists.txt D \
kdereview/nepomuk-kde/backbone/cmake/modules/FindSoprano.cmake D \
kdereview/nepomuk-kde/backbone/coreservices (directory) D \
kdereview/nepomuk-kde/backbone/knepomuk (directory) D \
kdereview/nepomuk-kde/backbone/service-registry (directory) D \
kdereview/nepomuk-kde/kmetadata (directory) D \
kdereview/nepomuk-kde/konto (directory) D kdereview/qrdf (directory)
M +5 -0 kdesupport/CMakeLists.txt
A kdesupport/soprano (directory) kdereview/qrdf#659730
M +1 -1 kdesupport/soprano/CMakeLists.txt
M +2 -3 kdesupport/soprano/test/CMakeLists.txt
--- trunk/KDE/kdebase/CMakeLists.txt #659839:659840
@@ -6,6 +6,8 @@
# search packages used by KDE
find_package(KDE4 REQUIRED)
find_package(Strigi REQUIRED)
+find_package(Soprano)
+find_package(KNepomuk)
include (KDE4Defaults)
include (MacroLibrary)
include(MacroOptionalAddSubdirectory)
--- trunk/KDE/kdebase/runtime/CMakeLists.txt #659839:659840
@@ -29,3 +29,6 @@
endif (Q_WS_X11)
add_subdirectory(knotify)
+if(Soprano_FOUND AND KNEPOMUK_FOUND)
+ macro_optional_add_subdirectory(knepomuk)
+endif(Soprano_FOUND AND KNEPOMUK_FOUND)
--- trunk/KDE/kdebase/runtime/knepomuk/service-registry/core/CMakeLists.txt \
#659838:659840 @@ -1,10 +1,11 @@
project(knepregcore)
include_directories(
- ${nepomuk_backbone_SOURCE_DIR}
+ ${CMAKE_SOURCE_DIR}
${knepregistry_SOURCE_DIR}
${QT_INCLUDES}
${KDE4_INCLUDES}
+ ${KNEPOMUK_INCLUDES}
)
set( knepregcore_LIB_SRCS
@@ -20,7 +21,7 @@
kde4_add_library(knepregcore STATIC ${knepregcore_LIB_SRCS})
target_link_libraries(knepregcore
- knepomuk
+ ${KNEPOMUK_LIBRARIES}
${QT_QTCORE_LIBRARY}
${QT_QTDBUS_LIBRARY}
${QT_QTXML_LIBRARY}
--- trunk/KDE/kdelibs/CMakeLists.txt #659839:659840
@@ -14,6 +14,10 @@
find_package(Carbon REQUIRED)
endif (APPLE)
+# Soprano can be found in kdesupport and is used
+# for Konto and KNepomuk
+find_package(Soprano)
+
# set some default settings
include(KDE4Defaults)
@@ -174,7 +178,13 @@
add_subdirectory( kross )
add_subdirectory( includes )
+if(Soprano_FOUND)
+ macro_optional_add_subdirectory(konto)
+ macro_optional_add_subdirectory(knepomuk)
+ macro_optional_add_subdirectory(kmetadata)
+endif(Soprano_FOUND)
+
########### install files ###############
# we need the absolute directories where stuff will be installed too
--- trunk/KDE/kdelibs/kmetadata/kmetadata/CMakeLists.txt #659838:659840
@@ -1,14 +1,13 @@
project(libkmetadata)
include_directories(
- ${kmetadata_BINARY_DIR}
${kmetadata_SOURCE_DIR}
${libkmetadata_SOURCE_DIR}
- ${nepomuk_backbone_SOURCE_DIR}
+ ${kdecore_SOURCE_DIR}/utils
+ ${CMAKE_SOURCE_DIR}
${QT_INCLUDES}
${KDE4_INCLUDES}
- ${KNEPOMUK_INCLUDE_DIR}
- ${nepomuk-kde_SOURCE_DIR}
+ ${SOPRANO_INCLUDE_DIR}
)
set(kmetadata_LIB_SRCS
@@ -40,11 +39,12 @@
${QT_QTGUI_LIBRARY}
${QT_QTDBUS_LIBRARY}
${KDE4_KDECORE_LIBRARY}
- ${KDE4_KDEUI_LIBRARY}
- ${KDE4_KDEFX_LIBRARY}
+ kdeui
+ kdefx
)
-set_target_properties(kmetadata PROPERTIES VERSION 1.0.0 SOVERSION 1 )
+set_target_properties(kmetadata PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION \
${GENERIC_LIB_SOVERSION} ) +
install(TARGETS kmetadata DESTINATION ${LIB_INSTALL_DIR} )
install(FILES
variant.h
--- trunk/KDE/kdelibs/kmetadata/kmetadata/kmetadata.h #659838:659840
@@ -15,5 +15,4 @@
#include <kmetadata/resource.h>
#include <kmetadata/variant.h>
#include <kmetadata/resourcemanager.h>
-#include <kmetadata/allresources.h>
#include <kmetadata/tools.h>
--- trunk/KDE/kdelibs/kmetadata/kmetadata/resourcemanager.cpp #659838:659840
@@ -24,6 +24,7 @@
#include <kstaticdeleter.h>
#include <kdebug.h>
+#include <krandom.h>
#include <QtCore/QThread>
#include <QtCore/QMutex>
--- trunk/KDE/kdelibs/kmetadata/kmetadata/resourcemanager.h #659838:659840
@@ -19,9 +19,7 @@
#include <QtCore/QObject>
-#include <krandom.h>
-
namespace Nepomuk {
namespace Backbone {
class Registry;
--- trunk/KDE/kdelibs/kmetadata/kmetadata/ui/ktagcloudwidget.cpp #659838:659840
@@ -19,7 +19,7 @@
#include "ktagcloudwidget.h"
#include "kblocklayout.h"
-#include <KUrlLabel>
+#include <kurllabel.h>
#include <QtGui/QHBoxLayout>
#include <QtGui/QVBoxLayout>
--- trunk/KDE/kdelibs/kmetadata/rcgen/CMakeLists.txt #659838:659840
@@ -1,28 +1,5 @@
project(kmetadata_rcgen)
-set(CMAKE_MODULE_PATH
- ${CMAKE_MODULE_PATH}
- ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules
- ${CMAKE_CURRENT_SOURCE_DIR}/../../backbone/cmake/modules
-)
-
-# search packages used by KDE
-find_package(KDE4 REQUIRED)
-include(KDE4Defaults)
-include(MacroLibrary)
-
-if(WIN32)
- find_package(GNUWIN32)
- find_package(Soprano REQUIRED)
-else(WIN32)
- # CE: this is an ugly hack and should be fixed!
- # Soprano is in the same module now
- set(SOPRANO_INCLUDE_DIR ../../../qrdf)
- LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../../../qrdf/soprano)
- set(SOPRANO_LIBRARIES soprano)
- set(SOPRANO_FOUND )
-endif(WIN32)
-
include_directories(
${kmetadata_rcgen_SOURCE_DIR}
${QT_INCLUDES}
--- trunk/KDE/kdelibs/kmetadata/tests/CMakeLists.txt #659838:659840
@@ -1,14 +1,12 @@
project(kmetadata_tests)
include_directories(
- ${kmetadata_BINARY_DIR}
${kmetadata_SOURCE_DIR}
${libkmetadata_SOURCE_DIR}
${kmetadata_ui_SOURCE_DIR}
- ${nepomuk_backbone_SOURCE_DIR}
- ${nepomuk_kde_SOURCE_DIR}
${QT_INCLUDES}
${KDE4_INCLUDES}
+ ${SOPRANO_INCLUDE_DIR}
)
# The basis of all the tests handling statements
--- trunk/KDE/kdelibs/konto/test/desktopontologyloadertest.cpp #659838:659840
@@ -26,9 +26,9 @@
#include <QtCore/QTextStream>
#include <QtCore/QList>
-#include <KStandardDirs>
-#include <KDesktopFile>
-#include <KUrl>
+#include <kstandarddirs.h>
+#include <kdesktopfile.h>
+#include <kurl.h>
#include <kio/global.h>
#include <kio/deletejob.h>
#include <qtest_kde.h>
--- trunk/kdereview/CMakeLists.txt #659839:659840
@@ -16,13 +16,6 @@
endif ( Q_WS_X11 )
macro_optional_add_subdirectory( autostart )
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/qrdf/cmake/modules)
-macro_optional_find_package(Redland)
-if (REDLAND_FOUND)
-macro_optional_add_subdirectory(qrdf)
-macro_optional_add_subdirectory(nepomuk-kde)
-endif (REDLAND_FOUND)
-
macro_optional_add_subdirectory(doc)
macro_display_feature_log()
--- trunk/kdesupport/CMakeLists.txt #659839:659840
@@ -13,3 +13,8 @@
add_subdirectory(kdewin32)
endif (WIN32)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} \
${CMAKE_SOURCE_DIR}/soprano/cmake/modules) +find_package(Redland)
+if (REDLAND_FOUND)
+ macro_optional_add_subdirectory(soprano)
+endif (REDLAND_FOUND)
--- trunk/kdesupport/soprano/CMakeLists.txt #659730:659840
@@ -1,4 +1,4 @@
-project(Soprano)
+project(soprano)
enable_testing()
--- trunk/kdesupport/soprano/test/CMakeLists.txt #659730:659840
@@ -1,10 +1,9 @@
project(soprano_tests)
include_directories(
- ${soprano_tests_BINARY_DIR}
- ${CMAKE_SOURCE_DIR}
- ${CMAKE_SOURCE_DIR}/qrdf
+ ${soprano_SOURCE_DIR}
${QT_INCLUDES}
+ ${CMAKE_CURRENT_BINARY_DIR}
)
# Node
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic