[Bug 145501] cmake error on Solaris in kdepimlibs with ldap/lber

[Szombathelyi György]

------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
         
http://bugs.kde.org/show_bug.cgi?id=145501         




------- Additional Comments From gyurco freemail hu  2007-05-17 21:20 -------
SVN commit 665745 by gyurco:

Allow build without liblber.

CCBUG: 145501


 M  +5 -2      cmake/modules/FindLdap.cmake  
 M  +1 -1      kldap/CMakeLists.txt  


--- trunk/KDE/kdepimlibs/cmake/modules/FindLdap.cmake #665744:665745
 @ -3,7 +3,7  @
 #
 #  LDAP_FOUND - system has libldap
 #  LDAP_INCLUDE_DIR - the ldap include directory
-#  LDAP_LIBRARIES - libldap library
+#  LDAP_LIBRARIES - libldap + liblber (if found) library
 #  LBER_LIBRARIES - liblber library
 
 if(LDAP_INCLUDE_DIR AND LDAP_LIBRARIES)
 @ -39,11 +39,14  @
 
 if(LDAP_INCLUDE_DIR AND LDAP_LIBRARIES)
    set(LDAP_FOUND TRUE)
+   if(LBER_LIBRARIES)
+     set(LDAP_LIBRARIES ${LDAP_LIBRARIES} ${LBER_LIBRARIES})
+   endif(LBER_LIBRARIES)
 endif(LDAP_INCLUDE_DIR AND LDAP_LIBRARIES)
 
 if(LDAP_FOUND)
    if(NOT Ldap_FIND_QUIETLY)
-      message(STATUS "Found ldap: ${LDAP_LIBRARIES} ${LBER_LIBRARIES}")
+      message(STATUS "Found ldap: ${LDAP_LIBRARIES}")
    endif(NOT Ldap_FIND_QUIETLY)
 endif(LDAP_FOUND)
 
--- trunk/KDE/kdepimlibs/kldap/CMakeLists.txt #665744:665745
 @ -15,7 +15,7  @
 set(kldap_EXTRA_INCLUDES)
 
 if (LDAP_FOUND)
-set(kldap_EXTRA_LIBS ${LDAP_LIBRARIES} ${LBER_LIBRARIES})
+set(kldap_EXTRA_LIBS ${LDAP_LIBRARIES})
 set(klap_EXTRA_INCLUDES ${LDAP_INCLUDE_DIR})
 endif (LDAP_FOUND)