[Opensync-commits] r6024 - in plugins/ldap-sync: misc src

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

Author: scriptor
Date: Mon Jan 25 20:57:02 2010
New Revision: 6024
URL: http://www.opensync.org/changeset/6024

Log:
The FindLibXslt.cmake and FindLibXml2.cmake from cmake version 2.6.4
use 

		LIBXML2_INCLUDE_DIR rather than LIBXML2_INCLUDE_DIRS and
		LIBXSLT_INCLUDE_DIR rather than LIBXSLT_INCLUDE_DIRS.

I have added the new name and left the old one to keep backwards-compatibility.

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

Modified: plugins/ldap-sync/misc/CMakeLists.txt
==============================================================================
--- plugins/ldap-sync/misc/CMakeLists.txt	Mon Jan 25 20:56:09 2010	(r6023)
+++ plugins/ldap-sync/misc/CMakeLists.txt	Mon Jan 25 20:57:02 2010	(r6024)
@@ -22,7 +22,8 @@
 
 
 LINK_DIRECTORIES( ${OPENSYNC_LIBRARY_DIRS} ${GLIB2_LIBRARY_DIRS} ${LIBXML2_LIBRARY_DIRS} )
-INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${OPENSYNC_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIRS} )
+INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${OPENSYNC_INCLUDE_DIRS}
+${GLIB2_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR} )
 INCLUDE( Compiler )
 
 

Modified: plugins/ldap-sync/src/CMakeLists.txt
==============================================================================
--- plugins/ldap-sync/src/CMakeLists.txt	Mon Jan 25 20:56:09 2010	(r6023)
+++ plugins/ldap-sync/src/CMakeLists.txt	Mon Jan 25 20:57:02 2010	(r6024)
@@ -43,10 +43,10 @@
 
 IF (LIBSASL2_FOUND)
 	LINK_DIRECTORIES( ${OPENSYNC_LIBRARY_DIRS} ${GLIB2_LIBRARY_DIRS} ${LIBXML2_LIBRARY_DIRS} ${LIBXSLT_LIBRARY_DIRS} ${_LDAP_LIBRARY_DIRS} ${SASL2_LIBRARY_DIRS} ${GSSAPIV2_LIBRARY_DIRS})
-	INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${OPENSYNC_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIRS} ${LIBXSLT_INCLUDE_DIRS} ${_LDAP_INCLUDE_DIRS} ${SASL2_INCLUDE_DIRS} ${GSSAPIV2_INCLUDE_DIRS})
+	INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${OPENSYNC_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR} ${LIBXSLT_INCLUDE_DIRS}  ${LIBXSLT_INCLUDE_DIR} ${_LDAP_INCLUDE_DIRS} ${SASL2_INCLUDE_DIRS} ${GSSAPIV2_INCLUDE_DIRS})
 ELSE (LIBSASL2_FOUND)
 	LINK_DIRECTORIES( ${OPENSYNC_LIBRARY_DIRS} ${GLIB2_LIBRARY_DIRS} ${LIBXML2_LIBRARY_DIRS} ${LIBXSLT_LIBRARY_DIRS} ${_LDAP_LIBRARY_DIRS} ${GSSAPIV2_LIBRARY_DIRS})
-	INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${OPENSYNC_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIRS} ${LIBXSLT_INCLUDE_DIRS} ${_LDAP_INCLUDE_DIRS} ${GSSAPIV2_INCLUDE_DIRS})
+	INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${OPENSYNC_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR} ${LIBXSLT_INCLUDE_DIRS} ${LIBXSLT_INCLUDE_DIR} ${_LDAP_INCLUDE_DIRS} ${GSSAPIV2_INCLUDE_DIRS})
 ENDIF (LIBSASL2_FOUND)
 
 INCLUDE( Compiler )