rev 10299 - in branches/kde4/packages/kdepimlibs/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Sun Apr 27 12:23:10 UTC 2008
Author: modax-guest
Date: 2008-04-27 12:23:10 +0000 (Sun, 27 Apr 2008)
New Revision: 10299
Added:
branches/kde4/packages/kdepimlibs/debian/patches/01_fix_target_link_libraries.diff
branches/kde4/packages/kdepimlibs/debian/patches/97_use_imported_targets_with_cmake26.diff
branches/kde4/packages/kdepimlibs/debian/patches/series
Modified:
branches/kde4/packages/kdepimlibs/debian/changelog
Log:
New snapshot.
Modified: branches/kde4/packages/kdepimlibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdepimlibs/debian/changelog 2008-04-27 12:08:11 UTC (rev 10298)
+++ branches/kde4/packages/kdepimlibs/debian/changelog 2008-04-27 12:23:10 UTC (rev 10299)
@@ -1,8 +1,8 @@
-kdepimlibs (4:4.0.71+svn801124-1~pre1) UNRELEASED; urgency=low
+kdepimlibs (4:4.0.71+svn801448-1~pre1) UNRELEASED; urgency=low
* New upstream development snapshot:
- - The latest upstream commit is r801124 by pino
- - Date: Fri, 25 Apr 2008 21:12:06 -0000
+ - The latest upstream commit is r801448 by neundorf
+ - Date: Sun, 27 Apr 2008 12:12:47 -0000
+++ Changes by Modestas Vainius:
@@ -22,7 +22,7 @@
more, it is unnecesarily painful to deal with (esp. with regard to
snapshots).
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 26 Apr 2008 00:16:37 +0300
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 27 Apr 2008 15:16:58 +0300
kdepimlibs (4:4.0.68+svn794641-1) experimental; urgency=low
Added: branches/kde4/packages/kdepimlibs/debian/patches/01_fix_target_link_libraries.diff
===================================================================
--- branches/kde4/packages/kdepimlibs/debian/patches/01_fix_target_link_libraries.diff (rev 0)
+++ branches/kde4/packages/kdepimlibs/debian/patches/01_fix_target_link_libraries.diff 2008-04-27 12:23:10 UTC (rev 10299)
@@ -0,0 +1,266 @@
+--- kdepimlibs-4.0.71+svn800950.orig/kioslave/smtp/CMakeLists.txt 2008-03-23 13:43:41.000000000 +0200
++++ kdepimlibs-4.0.71+svn800950/kioslave/smtp/CMakeLists.txt 2008-04-25 22:05:52.000000000 +0300
+@@ -32,7 +32,7 @@
+ kde4_add_plugin(kio_smtp ${kio_smtp_PART_SRCS})
+
+
+-target_link_libraries(kio_smtp ${KDE4_KIO_LIBS} ${smtp_optional_libs})
++target_link_libraries(kio_smtp ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBRARY} ${smtp_optional_libs} ${QT_QTNETWORK_LIBRARY} )
+
+ install(TARGETS kio_smtp DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+--- kdepimlibs-4.0.71+svn800950.orig/kpimidentities/CMakeLists.txt 2008-03-23 13:42:49.000000000 +0200
++++ kdepimlibs-4.0.71+svn800950/kpimidentities/CMakeLists.txt 2008-04-25 20:42:09.000000000 +0300
+@@ -6,7 +6,7 @@
+
+ kde4_add_library(kpimidentities SHARED ${kpimidentities_LIB_SRCS})
+
+-target_link_libraries(kpimidentities ${QT_AND_KDECORE_LIBS} kpimutils ${KDE4_KIO_LIBS})
++target_link_libraries(kpimidentities ${QT_AND_KDECORE_LIBS} kpimutils ${KDE4_KIO_LIBS} ${QT_QTDBUS_LIBRARY} )
+
+ set_target_properties(kpimidentities PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS kpimidentities ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- kdepimlibs-4.0.71+svn800950.orig/kresources/CMakeLists.txt 2008-03-23 13:42:57.000000000 +0200
++++ kdepimlibs-4.0.71+svn800950/kresources/CMakeLists.txt 2008-04-25 21:47:16.000000000 +0300
+@@ -24,7 +24,8 @@
+
+ kde4_add_library(kresources SHARED ${kresources_LIB_SRCS})
+
+-target_link_libraries(kresources ${KDE4_KIO_LIBS} )
++target_link_libraries(kresources ${KDE4_KDEUI_LIBS} ${QT_QTDBUS_LIBRARY} )
++set_target_properties(kresources PROPERTIES LINK_INTERFACE_LIBRARIES "")
+
+ set_target_properties(kresources PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS kresources ${INSTALL_TARGETS_DEFAULT_ARGS})
+@@ -36,7 +37,7 @@
+
+ kde4_add_plugin(kcm_kresources ${kcm_kresources_PART_SRCS})
+
+-target_link_libraries(kcm_kresources ${KDE4_KDECORE_LIBS} kresources )
++target_link_libraries(kcm_kresources ${KDE4_KDEUI_LIBS} kresources )
+
+ install(TARGETS kcm_kresources DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+--- kdepimlibs-4.0.71+svn800950.orig/kxmlrpcclient/CMakeLists.txt 2008-03-23 13:42:45.000000000 +0200
++++ kdepimlibs-4.0.71+svn800950/kxmlrpcclient/CMakeLists.txt 2008-04-25 22:15:44.000000000 +0300
+@@ -10,7 +10,8 @@
+
+ kde4_add_library(kxmlrpcclient SHARED ${kxmlrpcclient_LIB_SRCS})
+
+-target_link_libraries(kxmlrpcclient ${KDE4_KIO_LIBS})
++target_link_libraries(kxmlrpcclient ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} )
++set_target_properties(kxmlrpcclient PROPERTIES LINK_INTERFACE_LIBRARIES "")
+
+ set_target_properties(kxmlrpcclient PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS kxmlrpcclient ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- kdepimlibs-4.0.71+svn800950.orig/mailtransport/CMakeLists.txt 2008-03-23 13:44:05.000000000 +0200
++++ kdepimlibs-4.0.71+svn800950/mailtransport/CMakeLists.txt 2008-04-25 22:04:59.000000000 +0300
+@@ -31,7 +31,8 @@
+ kde4_add_kcfg_files(mailtransport_lib_srcs transportbase.kcfgc)
+
+ kde4_add_library(mailtransport SHARED ${mailtransport_lib_srcs})
+-target_link_libraries(mailtransport ${KDE4_KIO_LIBS})
++target_link_libraries(mailtransport ${KDE4_KIO_LIBS} ${QT_QTDBUS_LIBRARY} ${QT_QTNETWORK_LIBRARY} )
++set_target_properties(mailtransport PROPERTIES LINK_INTERFACE_LIBRARIES "")
+ set_target_properties(mailtransport PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+
+ install(TARGETS mailtransport ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- kdepimlibs-4.0.71+svn800950.orig/syndication/CMakeLists.txt 2008-03-23 13:42:55.000000000 +0200
++++ kdepimlibs-4.0.71+svn800950/syndication/CMakeLists.txt 2008-04-25 22:18:31.000000000 +0300
+@@ -117,7 +117,8 @@
+
+ kde4_add_library(syndication SHARED ${syndication_LIB_SRCS})
+
+-target_link_libraries(syndication ${KDE4_KIO_LIBS} )
++target_link_libraries(syndication ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} )
++set_target_properties(syndication PROPERTIES LINK_INTERFACE_LIBRARIES "")
+
+ set_target_properties(syndication PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS syndication ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- kdepimlibs-4.0.71+svn800950.orig/kioslave/imap4/CMakeLists.txt 2008-03-23 13:43:47.000000000 +0200
++++ kdepimlibs-4.0.71+svn800950/kioslave/imap4/CMakeLists.txt 2008-04-25 22:13:46.000000000 +0300
+@@ -32,7 +32,7 @@
+
+ kde4_add_plugin(kio_imap4 ${kio_imap4_PART_SRCS})
+
+-target_link_libraries(kio_imap4 ${KDE4_KDE3SUPPORT_LIBS} kmime kimap)
++target_link_libraries(kio_imap4 ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBRARY} kmime kimap)
+ if (SASL2_FOUND)
+ target_link_libraries(kio_imap4 ${SASL2_LIBRARIES} )
+ endif(SASL2_FOUND)
+--- kdepimlibs-4.0.71+svn800950.orig/akonadi/CMakeLists.txt 2008-04-25 16:42:47.000000000 +0300
++++ kdepimlibs-4.0.71+svn800950/akonadi/CMakeLists.txt 2008-04-25 20:42:09.000000000 +0300
+@@ -112,7 +112,8 @@
+
+ kde4_add_library( akonadi-kde SHARED ${akonadikde_LIB_SRC} )
+
+-target_link_libraries( akonadi-kde ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${AKONADI_COMMON_LIBRARIES} )
++target_link_libraries( akonadi-kde ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBRARY} ${KDE4_KIO_LIBS} ${AKONADI_COMMON_LIBRARIES} )
++set_target_properties( akonadi-kde PROPERTIES LINK_INTERFACE_LIBRARIES "")
+ set_target_properties( akonadi-kde PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install( TARGETS akonadi-kde ${INSTALL_TARGETS_DEFAULT_ARGS} )
+
+--- kdepimlibs-4.0.71+svn800950.orig/akonadi/kmime/CMakeLists.txt 2008-04-25 16:42:45.000000000 +0300
++++ kdepimlibs-4.0.71+svn800950/akonadi/kmime/CMakeLists.txt 2008-04-25 20:42:09.000000000 +0300
+@@ -17,7 +17,7 @@
+
+ kde4_add_library( akonadi-kmime SHARED ${kmimeakonadi_LIB_SRC} )
+
+-target_link_libraries( akonadi-kmime akonadi-kde kmime )
++target_link_libraries( akonadi-kmime akonadi-kde kmime ${QT_QTGUI_LIBRARY} )
+ set_target_properties( akonadi-kmime PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS akonadi-kmime ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+--- kdepimlibs-4.0.71+svn800950.orig/kabc/CMakeLists.txt 2008-04-25 20:54:45.000000000 +0300
++++ kdepimlibs-4.0.71+svn800950/kabc/CMakeLists.txt 2008-04-25 21:25:16.000000000 +0300
+@@ -85,7 +85,8 @@
+
+ kde4_add_library(kabc SHARED ${kabc_LIB_SRCS})
+
+-target_link_libraries(kabc kresources kldap ${KDE4_KDE3SUPPORT_LIBRARY})
++target_link_libraries(kabc ${KDE4_KDEUI_LIBS} kresources kldap ${KDE4_KDE3SUPPORT_LIBRARY} ${QT_QTDBUS_LIBRARY})
++set_target_properties(kabc PROPERTIES LINK_INTERFACE_LIBRARIES "kio;kresources")
+
+ set_target_properties(kabc PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS kabc ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- kdepimlibs-4.0.71+svn800950.orig/kabc/plugins/dir/CMakeLists.txt 2008-04-25 21:56:22.000000000 +0300
++++ kdepimlibs-4.0.71+svn800950/kabc/plugins/dir/CMakeLists.txt 2008-04-25 21:56:43.000000000 +0300
+@@ -9,7 +9,7 @@
+
+ kde4_add_plugin(kabc_directory ${kabc_directory_SRCS})
+
+-target_link_libraries(kabc_directory ${KDE4_KDECORE_LIBS} kabc )
++target_link_libraries(kabc_directory ${KDE4_KDEUI_LIBS} kabc )
+
+ install(TARGETS kabc_directory DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+--- kdepimlibs-4.0.71+svn800950.orig/kabc/plugins/file/CMakeLists.txt 2008-04-25 21:10:21.000000000 +0300
++++ kdepimlibs-4.0.71+svn800950/kabc/plugins/file/CMakeLists.txt 2008-04-25 21:46:44.000000000 +0300
+@@ -9,7 +9,8 @@
+
+ kde4_add_library(kabc_file_core SHARED ${kabc_file_core_SRCS})
+
+-target_link_libraries(kabc_file_core ${KDE4_KDECORE_LIBS} kabc)
++target_link_libraries(kabc_file_core ${KDE4_KDEUI_LIBS} kabc)
++set_target_properties(kabc_file_core PROPERTIES LINK_INTERFACE_LIBRARIES "")
+
+ set_target_properties(kabc_file_core PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+
+@@ -22,7 +23,7 @@
+
+ kde4_add_plugin(kabc_file ${kabc_file_SRCS})
+
+-target_link_libraries(kabc_file ${KDE4_KDECORE_LIBS} kabc_file_core)
++target_link_libraries(kabc_file ${KDE4_KDECORE_LIBS} kabc_file_core kresources)
+
+
+ install(TARGETS kabc_file DESTINATION ${PLUGIN_INSTALL_DIR} )
+--- kdepimlibs-4.0.71+svn800950.orig/kabc/plugins/net/CMakeLists.txt 2008-04-25 21:57:30.000000000 +0300
++++ kdepimlibs-4.0.71+svn800950/kabc/plugins/net/CMakeLists.txt 2008-04-25 21:58:03.000000000 +0300
+@@ -9,7 +9,7 @@
+
+ kde4_add_plugin(kabc_net ${kabc_net_SRCS})
+
+-target_link_libraries(kabc_net ${KDE4_KIO_LIBS} kabc)
++target_link_libraries(kabc_net ${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS} kabc)
+
+
+ install(TARGETS kabc_net DESTINATION ${PLUGIN_INSTALL_DIR} )
+--- kdepimlibs-4.0.71+svn800950.orig/kcal/CMakeLists.txt 2008-04-25 21:12:04.000000000 +0300
++++ kdepimlibs-4.0.71+svn800950/kcal/CMakeLists.txt 2008-04-25 22:21:17.000000000 +0300
+@@ -259,6 +259,7 @@
+ kde4_add_library(kcal SHARED ${kcal_LIB_SRCS})
+
+ target_link_libraries(kcal ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} kresources kabc kpimutils )
++set_target_properties(kcal PROPERTIES LINK_INTERFACE_LIBRARIES "kresources")
+
+ set_target_properties(kcal PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
+ install(TARGETS kcal ${INSTALL_TARGETS_DEFAULT_ARGS} COMPONENT Devel)
+--- kdepimlibs-4.0.71+svn800950.orig/kioslave/ldap/CMakeLists.txt 2008-04-25 20:52:24.000000000 +0300
++++ kdepimlibs-4.0.71+svn800950/kioslave/ldap/CMakeLists.txt 2008-04-25 22:08:22.000000000 +0300
+@@ -3,7 +3,7 @@
+
+ kde4_add_plugin(kio_ldap ${kio_ldap_PART_SRCS})
+
+-target_link_libraries(kio_ldap ${KDE4_KIO_LIBS} kldap)
++target_link_libraries(kio_ldap ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBRARY} kldap)
+
+ install(TARGETS kio_ldap DESTINATION ${PLUGIN_INSTALL_DIR})
+
+--- kdepimlibs-4.0.71+svn800950.orig/kioslave/nntp/CMakeLists.txt 2008-04-25 22:10:52.000000000 +0300
++++ kdepimlibs-4.0.71+svn800950/kioslave/nntp/CMakeLists.txt 2008-04-25 22:11:06.000000000 +0300
+@@ -10,7 +10,7 @@
+ kde4_add_plugin(kio_nntp ${kio_nntp_PART_SRCS})
+
+
+-target_link_libraries(kio_nntp ${KDE4_KIO_LIBS} )
++target_link_libraries(kio_nntp ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBRARY} )
+
+ install(TARGETS kio_nntp DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+--- kdepimlibs-4.0.71+svn800950.orig/kioslave/pop3/CMakeLists.txt 2008-04-25 22:09:54.000000000 +0300
++++ kdepimlibs-4.0.71+svn800950/kioslave/pop3/CMakeLists.txt 2008-04-25 22:10:25.000000000 +0300
+@@ -23,7 +23,7 @@
+ kde4_add_plugin(kio_pop3 ${kio_pop3_PART_SRCS})
+
+
+-target_link_libraries(kio_pop3 ${KDE4_KIO_LIBS} ${pop3_optional_libs})
++target_link_libraries(kio_pop3 ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBRARY} ${pop3_optional_libs})
+
+ install(TARGETS kio_pop3 DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+--- kdepimlibs-4.0.71+svn800950.orig/kioslave/sieve/CMakeLists.txt 2008-04-25 22:11:31.000000000 +0300
++++ kdepimlibs-4.0.71+svn800950/kioslave/sieve/CMakeLists.txt 2008-04-25 22:11:46.000000000 +0300
+@@ -12,7 +12,7 @@
+
+
+
+-target_link_libraries(kio_sieve ${KDE4_KIO_LIBS} ${SASL2_LIBRARIES})
++target_link_libraries(kio_sieve ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBRARY} ${SASL2_LIBRARIES})
+
+ install(TARGETS kio_sieve DESTINATION ${PLUGIN_INSTALL_DIR})
+
+--- kdepimlibs-4.0.71+svn800950.orig/kldap/CMakeLists.txt 2008-04-25 20:52:44.000000000 +0300
++++ kdepimlibs-4.0.71+svn800950/kldap/CMakeLists.txt 2008-04-25 22:03:52.000000000 +0300
+@@ -69,7 +69,8 @@
+
+ include_directories( ${kldap_EXTRA_INCLUDES} )
+
+-target_link_libraries(kldap ${KDE4_KIO_LIBS} ${kldap_EXTRA_LIBS} )
++target_link_libraries(kldap ${KDE4_KDEUI_LIBS} ${kldap_EXTRA_LIBS} )
++set_target_properties(kldap PROPERTIES LINK_INTERFACE_LIBRARIES "")
+
+ set_target_properties(kldap PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
+ install(TARGETS kldap ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- kdepimlibs-4.0.71+svn800950.orig/kpimutils/CMakeLists.txt 2008-04-25 21:13:50.000000000 +0300
++++ kdepimlibs-4.0.71+svn800950/kpimutils/CMakeLists.txt 2008-04-25 21:14:52.000000000 +0300
+@@ -15,6 +15,7 @@
+ kde4_add_library(kpimutils SHARED ${kpimutils_LIB_SRCS})
+
+ target_link_libraries(kpimutils ${KDE4_KDEUI_LIBS} kmime)
++set_target_properties(kpimutils PROPERTIES LINK_INTERFACE_LIBRARIES "")
+
+ set_target_properties(kpimutils PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS kpimutils ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- kdepimlibs-4.0.71+svn800950.orig/ktnef/CMakeLists.txt 2008-04-25 21:36:34.000000000 +0300
++++ kdepimlibs-4.0.71+svn800950/ktnef/CMakeLists.txt 2008-04-25 22:24:43.000000000 +0300
+@@ -27,7 +27,7 @@
+
+ kde4_add_library(ktnef SHARED ${ktnef_LIB_SRCS})
+
+-target_link_libraries(ktnef ${KDE4_KIO_LIBS} kabc kcal)
++target_link_libraries(ktnef kabc kcal)
+
+ set_target_properties(ktnef PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
+ install(TARGETS ktnef ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- kdepimlibs-4.0.71+svn800950.orig/kioslave/mbox/CMakeLists.txt 2008-04-25 22:27:57.000000000 +0300
++++ kdepimlibs-4.0.71+svn800950/kioslave/mbox/CMakeLists.txt 2008-04-25 22:28:13.000000000 +0300
+@@ -16,7 +16,7 @@
+
+
+
+-target_link_libraries(kio_mbox ${KDE4_KIO_LIBS} )
++target_link_libraries(kio_mbox ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBRARY} )
+
+ install(TARGETS kio_mbox DESTINATION ${PLUGIN_INSTALL_DIR})
+
Added: branches/kde4/packages/kdepimlibs/debian/patches/97_use_imported_targets_with_cmake26.diff
===================================================================
--- branches/kde4/packages/kdepimlibs/debian/patches/97_use_imported_targets_with_cmake26.diff (rev 0)
+++ branches/kde4/packages/kdepimlibs/debian/patches/97_use_imported_targets_with_cmake26.diff 2008-04-27 12:23:10 UTC (rev 10299)
@@ -0,0 +1,49 @@
+--- kdepimlibs-4.0.71+svn800950.orig/CMakeLists.txt 2008-04-25 16:42:47.000000000 +0300
++++ kdepimlibs-4.0.71+svn800950/CMakeLists.txt 2008-04-25 20:11:10.000000000 +0300
+@@ -7,6 +7,11 @@
+ include (KDE4Defaults)
+ include (MacroLibrary)
+
++# Whether to use IMPORTED target to export library dependencies
++if (KDELIBS_EXPORT)
++ set(KDEPIMLIBS_EXPORT EXPORT kdepimlibs)
++endif (KDELIBS_EXPORT)
++
+ # Remove the following lines once we depend on kdelibs trunk again
+ if (NOT DEFINED INSTALL_TARGETS_DEFAULT_ARGS)
+ set(INSTALL_TARGETS_DEFAULT_ARGS RUNTIME DESTINATION "${BIN_INSTALL_DIR}"
+@@ -69,9 +74,20 @@
+
+ add_subdirectory(cmake)
+
+-# ...and append all library dependencies
+-string(REGEX REPLACE "gpgmepp" "gpgme++" qgpgme_LIB_DEPENDS "${qgpgme_LIB_DEPENDS}")
+-export_library_dependencies(${CMAKE_CURRENT_BINARY_DIR}/KDEPimLibsDependencies.cmake APPEND)
++if (KDEPIMLIBS_EXPORT)
++ install(${KDEPIMLIBS_EXPORT} DESTINATION ${DATA_INSTALL_DIR}/cmake/modules FILE KDEPimLibsImports.cmake)
++ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/KDELibsDependencies.cmake "
++
++# Import KDEPimLibs libraries as IMPORTED targets
++include(KDEPimLibsImports)
++")
++
++else (KDEPIMLIBS_EXPORT)
++ # ...and append all library dependencies
++ string(REGEX REPLACE "gpgmepp" "gpgme++" qgpgme_LIB_DEPENDS "${qgpgme_LIB_DEPENDS}")
++ export_library_dependencies(${CMAKE_CURRENT_BINARY_DIR}/KDEPimLibsDependencies.cmake APPEND)
++endif (KDEPIMLIBS_EXPORT)
++
+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/KDEPimLibsDependencies.cmake DESTINATION ${DATA_INSTALL_DIR}/cmake/modules)
+
+ macro_display_feature_log()
+--- kdepimlibs-4.0.71+svn800950.orig/kmime/CMakeLists.txt 2008-03-23 13:43:03.000000000 +0200
++++ kdepimlibs-4.0.71+svn800950/kmime/CMakeLists.txt 2008-04-25 20:05:21.000000000 +0300
+@@ -34,7 +34,7 @@
+
+ set_target_properties(kmime PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
+
+-install(TARGETS kmime ${INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS kmime ${KDEPIMLIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ install( FILES
+ boolflags.h
Added: branches/kde4/packages/kdepimlibs/debian/patches/series
===================================================================
--- branches/kde4/packages/kdepimlibs/debian/patches/series (rev 0)
+++ branches/kde4/packages/kdepimlibs/debian/patches/series 2008-04-27 12:23:10 UTC (rev 10299)
@@ -0,0 +1,2 @@
+01_fix_target_link_libraries.diff
+97_use_imported_targets_with_cmake26.diff
More information about the pkg-kde-commits
mailing list