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

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdelibs-4.1-branch
From:       Frank Osterfeld <frank.osterfeld () kdemail ! net>
Date:       2008-08-29 22:06:33
Message-ID: 1220047593.267946.8744.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 854614 by osterfeld:

add kemoticons lib to kutils dependencies

 M  +6 -1      cmake/modules/FindKDE4Internal.cmake  
 M  +2 -0      kutils/dummy.cpp  


--- branches/kdepim/enterprise4/kdelibs-4.1-branch/cmake/modules/FindKDE4Internal.cmake \
#854613:854614 @@ -54,6 +54,7 @@
 #  KDE4_KPARTS_LIBS           - the kparts library and all depending libraries
 #  KDE4_KCMUTILS_LIBS         - the kcmutils library and all depending libraries
 #  KDE4_KPRINTUTILS_LIBS      - the kprintutils library and all depending libraries
+#  KDE4_KEMOTICONS_LIBS       - the kemoticons library and all depending libraries
 #  KDE4_KUTILS_LIBS           - the kutils library and all depending libraries \
(deprecated)  #  KDE4_KDE3SUPPORT_LIBS      - the kde3support library and all \
depending libraries  #  KDE4_KFILE_LIBS            - the kfile library and all \
depending libraries @@ -319,8 +320,9 @@
       set(KDE4_KPTY_LIBS ${KDE4_KDECORE_LIBS} kpty)
    endif (UNIX)
    set(KDE4_KCMUTILS_LIBS ${KDE4_KDEUI_LIBS} kcmutils)
+   set(KDE4_KEMOTICONS_LIBS ${KDE4_KDEUI_LIBS} kemoticons)
    set(KDE4_KPRINTUTILS_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} kprintutils)
-   set(KDE4_KUTILS_LIBS ${KDE4_KCMUTILS_LIBS} ${KDE4_KPRINTUTILS_LIBS} kutils)
+   set(KDE4_KUTILS_LIBS ${KDE4_KCMUTILS_LIBS} ${KDE4_KPRINTUTILS_LIBS} \
${KDE4_KEMOTICONS_LIBS} kutils)  set(KDE4_KDE3SUPPORT_LIBS ${KDE4_KIO_LIBS} \
kde3support)  set(KDE4_SOLID_LIBS ${KDE4_KDECORE_LIBS} solid)
    set(KDE4_KFILE_LIBS ${KDE4_KDE3SUPPORT_LIBS} kfile)
@@ -417,6 +419,9 @@
    find_library(KDE4_KPRINTUTILS_LIBRARY NAMES kprintutils PATHS \
${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )  set(KDE4_KPRINTUTILS_LIBS \
${kprintutils_LIB_DEPENDS} ${KDE4_KPRINTUTILS_LIBRARY} )  
+   find_library(KDE4_KEMOTICONS_LIBRARY NAMES kemoticons PATHS \
${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) +   set(KDE4_KEMOTICONS_LIBS \
${kemoticons_LIB_DEPENDS} ${KDE4_KEMOTICONS_LIBRARY} ) +
    find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR} \
NO_DEFAULT_PATH )  set(KDE4_KUTILS_LIBS ${kutils_LIB_DEPENDS} ${KDE4_KUTILS_LIBRARY} \
)  
--- branches/kdepim/enterprise4/kdelibs-4.1-branch/kutils/dummy.cpp #854613:854614
@@ -1,5 +1,7 @@
 #include <kcmoduleproxy.h>
 #include <kprintpreview.h>
+#include <kemoticons/kemoticons.h>
 
 Q_GLOBAL_STATIC_WITH_ARGS( KCModuleProxy, foo, ( 0 ) )
 Q_GLOBAL_STATIC_WITH_ARGS( KPrintPreview, bar, ( 0, 0 ) )
+Q_GLOBAL_STATIC( KEmoticons, foobar )


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