From kde-commits Mon May 15 14:32:59 2006 From: =?utf-8?q?Peter=20K=C3=BCmmel?= Date: Mon, 15 May 2006 14:32:59 +0000 To: kde-commits Subject: KDE/kdelibs/kabc/plugins Message-Id: <1147703579.368956.6697.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=114770362411285 SVN commit 541085 by kuemmel: build plugins without additional shared support library M +7 -22 dir/CMakeLists.txt M +0 -8 dir/resourcedir.cpp M +5 -22 file/CMakeLists.txt M +5 -22 ldapkio/CMakeLists.txt M +6 -23 net/CMakeLists.txt --- trunk/KDE/kdelibs/kabc/plugins/dir/CMakeLists.txt #541084:541085 @@ -4,36 +4,21 @@ ########### next target ############### -set(kabc_dir_LIB_SRCS resourcedir.cpp resourcedirconfig.cpp ) +set(kabc_dir_SRCS resourcedirplugin.cpp resourcedir.cpp resourcedirconfig.cpp ) -kde4_automoc(${kabc_dir_LIB_SRCS}) +kde4_automoc(${kabc_dir_SRCS}) -kde4_add_library(kabc_dir SHARED ${kabc_dir_LIB_SRCS}) +kde4_add_plugin(kabc_dir ${kabc_dir_SRCS}) -target_link_libraries(kabc_dir ${KDE4_KDECORE_LIBS} kabc) +target_link_libraries(kabc_dir ${KDE4_KDECORE_LIBS} kabc ) -set_target_properties(kabc_dir PROPERTIES VERSION 4.0.0 SOVERSION 4 ) +kde4_install_libtool_file(${PLUGIN_INSTALL_DIR} kabc_dir ) -install_targets(${LIB_INSTALL_DIR} kabc_dir ) +set_target_properties(kabc_dir PROPERTIES OUTPUT_NAME kabc_directory ) +install_targets(${PLUGIN_INSTALL_DIR} kabc_dir ) -########### next target ############### -set(kabc_dir_plugin_PART_SRCS resourcedirplugin.cpp ) - -kde4_automoc(${kabc_dir_plugin_PART_SRCS}) - -kde4_add_plugin(kabc_dir_plugin ${kabc_dir_plugin_PART_SRCS}) - -target_link_libraries(kabc_dir_plugin ${KDE4_KDECORE_LIBS} kabc_dir) - -kde4_install_libtool_file(${PLUGIN_INSTALL_DIR} kabc_dir_plugin ) - -set_target_properties(kabc_dir_plugin PROPERTIES OUTPUT_NAME kabc_directory ) - -install_targets(${PLUGIN_INSTALL_DIR} kabc_dir_plugin ) - - ########### install files ############### install_files( ${SERVICES_INSTALL_DIR}/kresources/kabc FILES dir.desktop ) --- trunk/KDE/kdelibs/kabc/plugins/dir/resourcedir.cpp #541084:541085 @@ -43,15 +43,7 @@ using namespace KABC; -extern "C" -{ - void *init_kabc_dir() - { - return new KRES::PluginFactory(); - } -} - ResourceDir::ResourceDir( const KConfig *config ) : Resource( config ), mAsynchronous( false ) { --- trunk/KDE/kdelibs/kabc/plugins/file/CMakeLists.txt #541084:541085 @@ -4,36 +4,19 @@ ########### next target ############### -set(kabc_file_LIB_SRCS resourcefile.cpp resourcefileconfig.cpp ) +set(kabc_file_SRCS resourcefileplugin.cpp resourcefile.cpp resourcefileconfig.cpp ) -kde4_automoc(${kabc_file_LIB_SRCS}) +kde4_automoc(${kabc_file_SRCS}) -kde4_add_library(kabc_file SHARED ${kabc_file_LIB_SRCS}) +kde4_add_plugin(kabc_file ${kabc_file_SRCS}) target_link_libraries(kabc_file ${KDE4_KDECORE_LIBS} kabc) -set_target_properties(kabc_file PROPERTIES VERSION 4.0.0 SOVERSION 4 ) +kde4_install_libtool_file(${PLUGIN_INSTALL_DIR} kabc_file ) -install_targets(${LIB_INSTALL_DIR} kabc_file ) +install_targets(${PLUGIN_INSTALL_DIR} kabc_file ) -########### next target ############### - -set(kabc_file_plugin_PART_SRCS resourcefileplugin.cpp) - -kde4_automoc(${kabc_file_plugin_PART_SRCS}) - -kde4_add_plugin(kabc_file_plugin ${kabc_file_plugin_PART_SRCS}) - -target_link_libraries(kabc_file_plugin ${KDE4_KDECORE_LIBS} kabc_file) - -kde4_install_libtool_file(${PLUGIN_INSTALL_DIR} kabc_file_plugin ) - -set_target_properties(kabc_file_plugin PROPERTIES OUTPUT_NAME kabc_file) - -install_targets(${PLUGIN_INSTALL_DIR} kabc_file_plugin ) - - ########### install files ############### install_files( ${SERVICES_INSTALL_DIR}/kresources/kabc FILES file.desktop ) --- trunk/KDE/kdelibs/kabc/plugins/ldapkio/CMakeLists.txt #541084:541085 @@ -4,36 +4,19 @@ ########### next target ############### -set(kabc_ldapkio_LIB_SRCS resourceldapkio.cpp resourceldapkioconfig.cpp ) +set(kabc_ldapkio_SRCS resourceldapkioplugin.cpp resourceldapkio.cpp resourceldapkioconfig.cpp ) -kde4_automoc(${kabc_ldapkio_LIB_SRCS}) +kde4_automoc(${kabc_ldapkio_SRCS}) -kde4_add_library(kabc_ldapkio SHARED ${kabc_ldapkio_LIB_SRCS}) +kde4_add_plugin(kabc_ldapkio ${kabc_ldapkio_SRCS}) target_link_libraries(kabc_ldapkio ${KDE4_KDECORE_LIBS} kabc kio ) -set_target_properties(kabc_ldapkio PROPERTIES VERSION 4.0.0 SOVERSION 4 ) +kde4_install_libtool_file(${PLUGIN_INSTALL_DIR} kabc_ldapkio ) -install_targets(${LIB_INSTALL_DIR} kabc_ldapkio ) +install_targets(${PLUGIN_INSTALL_DIR} kabc_ldapkio ) -########### next target ############### - -set(kabc_ldapkio_plugin_PART_SRCS resourceldapkioplugin.cpp ) - -kde4_automoc(${kabc_ldapkio_plugin_PART_SRCS}) - -kde4_add_plugin(kabc_ldapkio_plugin ${kabc_ldapkio_plugin_PART_SRCS}) - -target_link_libraries(kabc_ldapkio_plugin ${KDE4_KDECORE_LIBS} kabc_ldapkio ) - -kde4_install_libtool_file(${PLUGIN_INSTALL_DIR} kabc_ldapkio_plugin ) - -set_target_properties(kabc_ldapkio_plugin PROPERTIES OUTPUT_NAME kabc_ldapkio) - -install_targets(${PLUGIN_INSTALL_DIR} kabc_ldapkio_plugin ) - - ########### install files ############### install_files( ${SERVICES_INSTALL_DIR}/kresources/kabc FILES ldapkio.desktop ) --- trunk/KDE/kdelibs/kabc/plugins/net/CMakeLists.txt #541084:541085 @@ -4,36 +4,19 @@ ########### next target ############### -set(kabc_net_LIB_SRCS resourcenet.cpp resourcenetconfig.cpp ) +set(kabc_net_SRCS resourcenetplugin.cpp resourcenet.cpp resourcenetconfig.cpp ) -kde4_automoc(${kabc_net_LIB_SRCS}) +kde4_automoc(${kabc_net_SRCS}) -kde4_add_library(kabc_net SHARED ${kabc_net_LIB_SRCS}) +kde4_add_plugin(kabc_net ${kabc_net_SRCS}) -target_link_libraries(kabc_net ${KDE4_KDECORE_LIBS} kabc kio ) +target_link_libraries(kabc_net ${KDE4_KDECORE_LIBS} kabc kio) -set_target_properties(kabc_net PROPERTIES VERSION 4.0.0 SOVERSION 4 ) +kde4_install_libtool_file(${PLUGIN_INSTALL_DIR} kabc_net ) -install_targets(${LIB_INSTALL_DIR} kabc_net ) +install_targets(${PLUGIN_INSTALL_DIR} kabc_net ) -########### next target ############### - -set(kabc_net_plugin_PART_SRCS resourcenetplugin.cpp ) - -kde4_automoc(${kabc_net_plugin_PART_SRCS}) - -kde4_add_plugin(kabc_net_plugin ${kabc_net_plugin_PART_SRCS}) - -target_link_libraries(kabc_net_plugin ${KDE4_KDECORE_LIBS} kabc_net) - -kde4_install_libtool_file(${PLUGIN_INSTALL_DIR} kabc_net_plugin ) - -set_target_properties(kabc_net_plugin PROPERTIES OUTPUT_NAME kabc_net) - -install_targets(${PLUGIN_INSTALL_DIR} kabc_net_plugin ) - - ########### install files ############### install_files( ${SERVICES_INSTALL_DIR}/kresources/kabc FILES net.desktop )