dbus/cmake/modules FindLibExpat.cmake,1.1,1.2

[Ralf Habacker]

Update of /cvs/dbus/dbus/cmake/modules
In directory kemper:/tmp/cvs-serv24409/cmake/modules

Modified Files:
	FindLibExpat.cmake 
Log Message:
* cmake/modules/FindExpat.cmake: fix package detection on win32.
* README.win: update install instructions.

Index: FindLibExpat.cmake
===================================================================
RCS file: /cvs/dbus/dbus/cmake/modules/FindLibExpat.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FindLibExpat.cmake	3 Mar 2007 14:32:17 -0000	1.1
+++ FindLibExpat.cmake	16 Mar 2007 22:34:40 -0000	1.2
@@ -13,13 +13,23 @@
 
 else (LIBEXPAT_INCLUDE_DIR AND LIBEXPAT_LIBRARIES)
 
-    IF (NOT WIN32)
+    IF (WIN32)
+		file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _progFiles)
+		find_FILE(LIBEXPAT_DIR expat Source/lib/expat.h
+   			PATHS
+   			"${_progFiles}"
+		)
+        if (LIBEXPAT_DIR)
+            set (_LIBEXPATIncDir  ${LIBEXPAT_DIR}/Source/lib)
+            set (_LIBEXPATLinkDir ${LIBEXPAT_DIR}/libs)
+        endif (LIBEXPAT_DIR)
+    ELSE (WIN32)
         # use pkg-config to get the directories and then use these values
         # in the FIND_PATH() and FIND_LIBRARY() calls
         INCLUDE(UsePkgConfig)
         PKGCONFIG(LIBEXPAT-2.0 _LIBEXPATIncDir _LIBEXPATLinkDir _LIBEXPATLinkFlags _LiIconvCflags)
         SET(LIBEXPAT_DEFINITIONS ${_LIBEXPATCflags})
-    ENDIF (NOT WIN32)
+    ENDIF (WIN32)
 
     FIND_PATH(LIBEXPAT_INCLUDE_DIR expat.h
       PATHS