* cmake/modules/FindExpat.cmake: fix package detection on win32.

* README.win: update install instructions.

diff --git a/ChangeLog b/ChangeLog
index 081e3a584994089a560cd7dd210e02669aedbdbb..808c9ebc8511180c8fb93efb21bc1c8faa2210af 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-16 Ralf.Habacker  <ralf.habacker@freenet.de>
+
+       * cmake/modules/FindExpat.cmake: fix package detection on win32.
+
+       * README.win: update install instructions. 
+
 2007-03-16 Ralf.Habacker  <ralf.habacker@freenet.de>
 
        * dbus/dbus-sysdeps.h (_dbus_split_paths_and_append):

diff --git a/README.win b/README.win
index b941a0882146e2e4fe58a44de488a0b24a2d1684..76469748ded17c60f58c45738e8a22caed76c1c1 100644 (file)
--- a/README.win
+++ b/README.win
@@ -5,7 +5,7 @@ Windows port of the freedesktop.org D-Bus
 Requirements 
 ------------
 - cmake version >= 2.4.4 see http://www.cmake.org 
-- installed libxml2 or libexpat 
+- installed libxml2 or libexpat from http://82.149.170.66/kde-windows/win32libs
 
 Build
 -----
@@ -23,18 +23,24 @@ win32
 1. Install your prefered compiler
        - Mingw from www.mingw.org 
        - Visual C++ 2005 Express/Studio
-2. Install win32libs packages from 
-               http://www.abi-neuhaus.de/chris/win32libs/
-   into a subdir win32libs in your program installation eg c:\Programme\win32libs (german) 
-   or "c:\Program Files\win32libs" (english) 
+       
+2. Install libxml2 or libexpat packages from 
+     http://82.149.170.66/kde-windows/win32libs
+   into a subdir win32libs in your program installation eg 
+     - german  => "c:\Programme\win32libs"
+     - english => "c:\Program Files\win32libs" 
+     
 3. download and install the most recent CMake version from http://www.cmake.org/files/
+
 4. apply dbus-win.patch: 'patch -p0 -i dbus-win.patch'
+
 5. open command shell and run in the created build folder which resides side by side 
    to the D-Bus sources:
        - for mingw: 
                cmake -G "MinGW Makefiles" <options> ..\<dbus-source-root>\cmake
        - for Visual C++
                cmake ..\<dbus-source-root>\cmake
+
 7. build
 
 

diff --git a/cmake/modules/FindLibExpat.cmake b/cmake/modules/FindLibExpat.cmake
index 155083b5e77c07e310be133afb9bb53479ea5bd7..a07c8de4c7b8231fd47e70a5a24590774dc25309 100644 (file)
--- a/cmake/modules/FindLibExpat.cmake
+++ b/cmake/modules/FindLibExpat.cmake
@@ -13,13 +13,23 @@ if (LIBEXPAT_INCLUDE_DIR AND LIBEXPAT_LIBRARIES)
 
 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