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

List:       kde-commits
Subject:    koffice/tools
From:       Matthias Lechner <matthias () lmme ! de>
Date:       2007-03-23 9:37:35
Message-ID: 1174642655.181875.27907.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 645657 by lechner:

adds the koffice StreamThroughAnalyzer used by strigi (replaces old koffice \
KFilePlugin). In comparison to the old plugin, two additional information have been \
added.

 M  +1 -1      CMakeLists.txt  
 M  +3 -3      kfile-plugins/CMakeLists.txt  
 M  +9 -12     kfile-plugins/koffice/CMakeLists.txt  
 A             kfile-plugins/koffice/kofficethroughanalyzer.cpp   [License: GPL]


--- trunk/koffice/tools/CMakeLists.txt #645656:645657
@@ -2,6 +2,6 @@
 add_subdirectory( thumbnail )
 add_subdirectory( thesaurus )
 add_subdirectory( kthesaurus )
-#add_subdirectory( kfile-plugins )
+add_subdirectory( kfile-plugins )
 add_subdirectory( quickprint )
 
--- trunk/koffice/tools/kfile-plugins/CMakeLists.txt #645656:645657
@@ -1,4 +1,4 @@
 add_subdirectory( koffice )
-add_subdirectory( ooo )
-add_subdirectory( gnumeric )
-add_subdirectory( abiword )
+#add_subdirectory( ooo )
+#add_subdirectory( gnumeric )
+#add_subdirectory( abiword )
--- trunk/koffice/tools/kfile-plugins/koffice/CMakeLists.txt #645656:645657
@@ -1,18 +1,15 @@
 include_directories( ${KOFFICECORE_INCLUDES})
 
-set(kfile_koffice_SRCS kfile_koffice.cpp )
+# build the analyzer as a module
+kde4_add_library(koffice MODULE kofficethroughanalyzer.cpp)
 
-kde4_automoc(${kfile_koffice_SRCS})
+# link with the required libraries
+target_link_libraries(koffice ${STREAMANALYZER_LIBRARY} ${KDE4_KIO_LIBS})
 
-kde4_add_plugin(kfile_koffice ${kfile_koffice_SRCS})
+# adjust the name so the module is recognized as a strigi plugin
+set_target_properties(koffice PROPERTIES
+    PREFIX strigita_)
 
+# install the module in the right directory so it is picked up
+install(TARGETS koffice LIBRARY DESTINATION ${LIB_INSTALL_DIR}/strigi)
 
-
-target_link_libraries(kfile_koffice  ${KDE4_KDECORE_LIBS} kofficecore )
-
-install(TARGETS kfile_koffice  DESTINATION ${PLUGIN_INSTALL_DIR})
-
-
-########### install files ###############
-
-install( FILES  kfile_koffice.desktop  DESTINATION ${SERVICES_INSTALL_DIR})


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