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

List:       kde-commits
Subject:    KDE/kdepimlibs/kldap
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2010-03-25 14:45:22
Message-ID: 20100325144522.BB559AC881 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1107402 by tokoe:

Moved LdapSearchDialog and LdapClient from libkdepim to kldap


 M  +27 -4     CMakeLists.txt  
 A             addhostdialog.cpp   \
trunk/KDE/kdepim/kaddressbook/xxport/ldap/addhostdialog.cpp#1106601 [License: LGPL \
(v2+)]  A             addhostdialog_p.h   \
trunk/KDE/kdepim/kaddressbook/xxport/ldap/addhostdialog.h#1106601 [License: LGPL \
(v2+)]  A             kcmldap.cpp   \
trunk/KDE/kdepim/kaddressbook/xxport/ldap/kcmldap.cpp#1106601 [License: LGPL (v2+)]  \
A             kcmldap.desktop   \
trunk/KDE/kdepim/kaddressbook/xxport/ldap/kcmldap.desktop#1106601  A             \
kcmldap_p.h   trunk/KDE/kdepim/kaddressbook/xxport/ldap/kcmldap.h#1106601 [License: \
LGPL (v2+)]  A             ldapclient.cpp   \
trunk/KDE/kdepim/libkdepim/ldapclient.cpp#1106601 [License: GPL (v2+)]  A             \
ldapclient.h   trunk/KDE/kdepim/libkdepim/ldapclient.h#1106601 [License: GPL (v2+)]  \
A             ldapsearchdialog.cpp   \
trunk/KDE/kdepim/kaddressbook/xxport/ldap/ldapsearchdialog.cpp#1106601 [License: GPL \
(v2+)]  A             ldapsearchdialog.h   \
trunk/KDE/kdepim/kaddressbook/xxport/ldap/ldapsearchdialog.h#1106601 [License: GPL \
(v2+)]  M  +7 -0      tests/CMakeLists.txt  
 A             tests/testldapclient.cpp   \
trunk/KDE/kdepim/libkdepim/tests/testldapclient.cpp#1106601 [License: LGPL (v2)]  A   \
tests/testldapclient.h   trunk/KDE/kdepim/libkdepim/tests/testldapclient.h#1106601 \
[License: LGPL (v2)]


--- trunk/KDE/kdepimlibs/kldap/CMakeLists.txt #1107401:1107402
@@ -54,8 +54,10 @@
    ldapobject.cpp
    ldapconnection.cpp
    ldapoperation.cpp
+   ldapclient.cpp
    ldapcontrol.cpp
    ldapsearch.cpp
+   ldapsearchdialog.cpp
    ldapconfigwidget.cpp
    ldapdn.cpp
    ldapmodelnode_p.cpp
@@ -67,17 +69,38 @@
 
 kde4_add_library(kldap SHARED ${kldap_LIB_SRCS})
 
-include_directories( ${kldap_EXTRA_INCLUDES} )
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${Boost_INCLUDE_DIR}
+    ${CMAKE_SOURCE_DIR}/kabc
+    ${kldap_EXTRA_INCLUDES} 
+)
 
-target_link_libraries(kldap ${KDE4_KIO_LIBS} ${KDE4_KDECORE_LIBS} \
${kldap_EXTRA_LIBS} ) +target_link_libraries(kldap ${KDE4_KIO_LIBS} \
${KDE4_KUTILS_LIBS} ${KDE4_KDECORE_LIBS} ${kldap_EXTRA_LIBS} kabc )  
 set_target_properties(kldap PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION \
${GENERIC_LIB_SOVERSION})  install(TARGETS kldap EXPORT kdepimlibsLibraryTargets \
${INSTALL_TARGETS_DEFAULT_ARGS})  
+########### next target ###############
+
+set( kcm_ldap_SRCS
+     addhostdialog.cpp
+     kcmldap.cpp
+)
+
+kde4_add_plugin(kcm_ldap ${kcm_ldap_SRCS})
+
+target_link_libraries(kcm_ldap ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} kldap)
+
+install(TARGETS kcm_ldap DESTINATION ${PLUGIN_INSTALL_DIR})
+
 ########### install files ###############
 
 install( FILES ber.h kldap_export.h ldapdefs.h ldif.h ldapurl.h ldapserver.h \
                ldapobject.h
-  ldapconnection.h ldapoperation.h
-  ldapconfigwidget.h ldapcontrol.h ldapsearch.h
+  ldapconnection.h ldapoperation.h ldapclient.h
+  ldapconfigwidget.h ldapcontrol.h ldapsearch.h ldapsearchdialog.h
   ldapdn.h ldapmodel.h ldapstructureproxymodel.h ldapattributeproxymodel.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/kldap COMPONENT Devel)
+
+install(FILES kcmldap.desktop DESTINATION ${SERVICES_INSTALL_DIR})
--- trunk/KDE/kdepimlibs/kldap/tests/CMakeLists.txt #1107401:1107402
@@ -16,3 +16,10 @@
 
 endif(LDAP_FOUND)
 
+########### next target ###############
+
+set(testldapclient_SRCS testldapclient.cpp )
+
+kde4_add_executable(testldapclient TEST ${testldapclient_SRCS})
+
+target_link_libraries(testldapclient kdepim ${KDE4_KDEUI_LIBS} kldap)


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