[Opensync-commits] r5893 - in plugins/ldap-sync: . src

[<svn...@op...>]

Author: scriptor
Date: Fri Oct 23 20:12:54 2009
New Revision: 5893
URL: http://www.opensync.org/changeset/5893

Log:
- The version of a binary package ("make package") should be in line with
  the version of a source code package ("make package_source").  I have
  adjusted CMakeLists.txt accordingly.
- I have added OPENSYNC_MIN_VERSION.
- I have added messages for the presence/lack of the check libraries.  So
  that the user knows, why the test suite can not be built, if it is missing.
- I have fixed an entry with the TARGET_LINK_LIBRARIES macro in 
  src/CMakeLists.txt.  cmake of a newer version (2.6.3) complained about that.
- I have increased the version to 0.40.
- As of today the LDAP plugin build has been tested on linux (fedora 10 and 11)
  and freebsd-7.2.

Modified:
   plugins/ldap-sync/CMakeLists.txt
   plugins/ldap-sync/src/CMakeLists.txt

Modified: plugins/ldap-sync/CMakeLists.txt
==============================================================================
--- plugins/ldap-sync/CMakeLists.txt	Fri Oct 23 20:12:45 2009	(r5892)
+++ plugins/ldap-sync/CMakeLists.txt	Fri Oct 23 20:12:54 2009	(r5893)
@@ -23,7 +23,9 @@
 
 PROJECT( libopensync-plugin-ldap )
 
-SET( VERSION "0.39" )
+SET( VERSION "0.40" )
+SET( CPACK_PACKAGE_VERSION "${VERSION}" )
+SET( OPENSYNC_MIN_VERSION "${VERSION}" )
 
 cmake_minimum_required(VERSION 2.4)
 IF(COMMAND cmake_policy)
@@ -47,6 +49,9 @@
 FIND_PACKAGE( LibGSSAPIV2 )
 FIND_PACKAGE( Check )
 
+IF ( NOT CHECK_FOUND )
+  MESSAGE( STATUS "  Could NOT find the check library: \"check\" or \"libcheck\": http://check.sourceforge.net/ .  The test suite can NOT be built, therefore.")
+ENDIF ( NOT CHECK_FOUND )
 
 # By default use openldap, if available. 
 # Fall back to mozldap only, if necessary (and possible, of course).

Modified: plugins/ldap-sync/src/CMakeLists.txt
==============================================================================
--- plugins/ldap-sync/src/CMakeLists.txt	Fri Oct 23 20:12:45 2009	(r5892)
+++ plugins/ldap-sync/src/CMakeLists.txt	Fri Oct 23 20:12:54 2009	(r5893)
@@ -124,8 +124,8 @@
 
 
 
-TARGET_LINK_LIBRARIES( ldap-sync ${OPENSYNC_LIBRARIES} ${GLIB2_LIBRARIES} ${LIBXML2_LIBRARY_DIRS} ${LIBXSLT_LIBRARIES} ${_LDAP_LIBRARIES} ${GCRYPT_LIBRARY} ${SASL2_LIBRARY})
-TARGET_LINK_LIBRARIES( ldap-format ${OPENSYNC_LIBRARIES} ${GLIB2_LIBRARIES} ${LIBXML2_LIBRARY_DIRS} ${LIBXSLT_LIBRARIES} ${_LDAP_LIBRARIES} ${GCRYPT_LIBRARY})
+TARGET_LINK_LIBRARIES( ldap-sync ${OPENSYNC_LIBRARIES} ${GLIB2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${_LDAP_LIBRARIES} ${GCRYPT_LIBRARY} ${SASL2_LIBRARY})
+TARGET_LINK_LIBRARIES( ldap-format ${OPENSYNC_LIBRARIES} ${GLIB2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${_LDAP_LIBRARIES} ${GCRYPT_LIBRARY})