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

List:       kde-commits
Subject:    KDE/kdepimlibs/kabc/plugins/dir
From:       Laurent Montel <montel () kde ! org>
Date:       2006-08-02 13:26:05
Message-ID: 1154525165.763145.20433.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 568866 by mlaurent:

Fix load plugins
Before we had kabc_directory.so and kabc_dir.la
=> it was not possible to load it.
Now name is kabc_directory
(it was renamed to avoid conflict)


 M  +7 -7      CMakeLists.txt  
 M  +1 -1      dir.desktop  
 M  +1 -1      resourcedirplugin.cpp  


--- trunk/KDE/kdepimlibs/kabc/plugins/dir/CMakeLists.txt #568865:568866
@@ -4,21 +4,21 @@
 
 ########### next target ###############
 
-set(kabc_dir_SRCS resourcedirplugin.cpp resourcedir.cpp resourcedirconfig.cpp )
+set(kabc_directory_SRCS resourcedirplugin.cpp resourcedir.cpp resourcedirconfig.cpp )
 
-kde4_automoc(${kabc_dir_SRCS})
+kde4_automoc(${kabc_directory_SRCS})
 
-kde4_add_plugin(kabc_dir ${kabc_dir_SRCS})
+kde4_add_plugin(kabc_directory ${kabc_directory_SRCS})
 
-target_link_libraries(kabc_dir ${KDE4_KDECORE_LIBS} kabc )
+target_link_libraries(kabc_directory ${KDE4_KDECORE_LIBS} kabc )
 
-kde4_install_libtool_file(${PLUGIN_INSTALL_DIR} kabc_dir )
 
-set_target_properties(kabc_dir PROPERTIES OUTPUT_NAME kabc_directory )
+kde4_install_libtool_file(${PLUGIN_INSTALL_DIR} kabc_directory )
 
-install(TARGETS kabc_dir  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
+install(TARGETS kabc_directory  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
+
 ########### install files ###############
 
 install( FILES dir.desktop  DESTINATION  ${SERVICES_INSTALL_DIR}/kresources/kabc )
--- trunk/KDE/kdepimlibs/kabc/plugins/dir/dir.desktop #568865:568866
@@ -3,7 +3,7 @@
 Name=Directory
 Name[fr]=Dossier
 Name[x-test]=xxDirectoryxx
-X-KDE-Library=kabc_dir
+X-KDE-Library=kabc_directory
 Type=Service
 ServiceTypes=KResources/Plugin
 X-KDE-ResourceFamily=contact
--- trunk/KDE/kdepimlibs/kabc/plugins/dir/resourcedirplugin.cpp #568865:568866
@@ -25,7 +25,7 @@
 
 extern "C"
 {
-  KDE_EXPORT void *init_kabc_dir()
+  KDE_EXPORT void *init_kabc_directory()
   {
     return new KRES::PluginFactory<ResourceDir, ResourceDirConfig>();
   }
[prev in list] [next in list] [prev in thread] [next in thread]