-moved the cmake code to find kdewin32 out of FindKDE4.cmake and into its own FindKDEWIN32.cmake file

-added a new FindGNUWIN32.cmake file, which tries to find the gnuwin32 base directory
-changed all "FOO_LIBRARY" variable names to "FOO_LIBRARIES" to be more consistent with the other cmake modules
-added a macro_getenv_win_path() which replaces all backslahes with slashes from environment variables
-modified the kde4_add_kcfg_files() command, so that the generated header is also processed by moc
-all tests compile and link

Alex

CCMAIL:kde-buildsystem@kde.org

The changes to the windows stuff are untested, since I don't have a windows box. 
Please check that everything still works. Please have a look at FindGNUWIN32.cmake, 
there are probably ways to improve this. The resulting GNUWIN32_DIR variable is used in other
cmake modules as default path to search for headers and libraries.




svn path=/trunk/KDE/kdelibs/; revision=508648

22 files changed, 362 insertions, 216 deletions

diff --git a/modules/FindAGG.cmake b/modules/FindAGG.cmake
index 8d294b18..ed02a46c 100644
--- a/modules/FindAGG.cmake
+++ b/modules/FindAGG.cmake
@@ -1,9 +1,9 @@
-# - Try to find AGG
+# - Try to find the AGG graphics library
 # Once done this will define
 #
 #  AGG_FOUND - system has AGG
 #  AGG_INCLUDE_DIR - the AGG include directory
-#  AGG_LIBRARY - Link these to use OpenGL and GLU
+#  AGG_LIBRARIES - Link these to use AGG
 #  AGG_DEFINITIONS - Compiler switches required for using AGG
 #
 
@@ -22,20 +22,20 @@ FIND_PATH(AGG_INCLUDE_DIR agg2/agg_pixfmt_gray.h
   /usr/local/include
 )
 
-FIND_LIBRARY(AGG_LIBRARY NAMES agg
+FIND_LIBRARY(AGG_LIBRARIES NAMES agg
   PATHS
   ${_AGGLinkDir}
   /usr/lib
   /usr/local/lib
 )
 
-IF(AGG_INCLUDE_DIR AND AGG_LIBRARY)
+IF(AGG_INCLUDE_DIR AND AGG_LIBRARIES)
    SET(AGG_FOUND TRUE)
-ENDIF(AGG_INCLUDE_DIR AND AGG_LIBRARY)
+ENDIF(AGG_INCLUDE_DIR AND AGG_LIBRARIES)
 
 IF(AGG_FOUND)
   IF(NOT AGG_FIND_QUIETLY)
-    MESSAGE(STATUS "Found AGG: ${AGG_LIBRARY}")
+    MESSAGE(STATUS "Found AGG: ${AGG_LIBRARIES}")
   ENDIF(NOT AGG_FIND_QUIETLY)
 ELSE(AGG_FOUND)
   IF(AGG_FIND_REQUIRED)
@@ -43,3 +43,4 @@ ELSE(AGG_FOUND)
   ENDIF(AGG_FIND_REQUIRED)
 ENDIF(AGG_FOUND)
 
+MARK_AS_ADVANCED(AGG_INCLUDE_DIR AGG_LIBRARIES)
diff --git a/modules/FindASPELL.cmake b/modules/FindASPELL.cmake
index 4c524cc3..1233c976 100644
--- a/modules/FindASPELL.cmake
+++ b/modules/FindASPELL.cmake
@@ -3,7 +3,7 @@
 #
 #  ASPELL_FOUND - system has ASPELL
 #  ASPELL_INCLUDE_DIR - the ASPELL include directory
-#  ASPELL_LIBRARY - Link these to use OpenGL and GLU
+#  ASPELL_LIBRARIES - The libraries needed to use ASPELL
 #  ASPELL_DEFINITIONS - Compiler switches required for using ASPELL
 #
 
@@ -13,19 +13,19 @@ FIND_PATH(ASPELL_INCLUDE_DIR aspell.h
   /usr/local/include
 )
 
-FIND_LIBRARY(ASPELL_LIBRARY NAMES aspell aspell-15
+FIND_LIBRARY(ASPELL_LIBRARIES NAMES aspell aspell-15
   PATHS
   /usr/lib
   /usr/local/lib
 )
 
-IF(ASPELL_INCLUDE_DIR AND ASPELL_LIBRARY)
+IF(ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES)
    SET(ASPELL_FOUND TRUE)
-ENDIF(ASPELL_INCLUDE_DIR AND ASPELL_LIBRARY)
+ENDIF(ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES)
 
 IF(ASPELL_FOUND)
   IF(NOT ASPELL_FIND_QUIETLY)
-    MESSAGE(STATUS "Found ASPELL: ${ASPELL_LIBRARY}")
+    MESSAGE(STATUS "Found ASPELL: ${ASPELL_LIBRARIES}")
   ENDIF(NOT ASPELL_FIND_QUIETLY)
 ELSE(ASPELL_FOUND)
   IF(ASPELL_FIND_REQUIRED)
@@ -33,3 +33,4 @@ ELSE(ASPELL_FOUND)
   ENDIF(ASPELL_FIND_REQUIRED)
 ENDIF(ASPELL_FOUND)
 
+MARK_AS_ADVANCED(ASPELL_INCLUDE_DIR ASPELL_LIBRARIES)
diff --git a/modules/FindBZip2.cmake b/modules/FindBZip2.cmake
index 3f4e493d..21f4a825 100644
--- a/modules/FindBZip2.cmake
+++ b/modules/FindBZip2.cmake
@@ -3,7 +3,7 @@
 #
 #  BZIP2_FOUND - system has BZip2
 #  BZIP2_INCLUDE_DIR - the BZip2 include directory
-#  BZIP2_LIBRARY - Link these to use OpenGL and GLU
+#  BZIP2_LIBRARIES - Link these to use BZip2
 #  BZIP2_DEFINITIONS - Compiler switches required for using BZip2
 #  BZIP2_NEED_PREFIX - this is set if the functions are prefixed with BZ2_
 #
@@ -14,21 +14,21 @@ FIND_PATH(BZIP2_INCLUDE_DIR bzlib.h
   /usr/local/include
 )
 
-FIND_LIBRARY(BZIP2_LIBRARY NAMES bz2 bzip2
+FIND_LIBRARY(BZIP2_LIBRARIES NAMES bz2 bzip2
   PATHS
   /usr/lib
   /usr/local/lib
 )
 
-IF(BZIP2_INCLUDE_DIR AND BZIP2_LIBRARY)
+IF(BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
    SET(BZIP2_FOUND TRUE)
    INCLUDE(CheckLibraryExists)
-   check_library_exists(${BZIP2_LIBRARY} BZ2_bzCompressInit "" BZIP2_NEED_PREFIX)
-ENDIF(BZIP2_INCLUDE_DIR AND BZIP2_LIBRARY)
+   CHECK_LIBRARY_EXISTS(${BZIP2_LIBRARIES} BZ2_bzCompressInit "" BZIP2_NEED_PREFIX)
+ENDIF(BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
 
 IF(BZIP2_FOUND)
   IF(NOT BZip2_FIND_QUIETLY)
-    MESSAGE(STATUS "Found BZip2: ${BZIP2_LIBRARY}")
+    MESSAGE(STATUS "Found BZip2: ${BZIP2_LIBRARIES}")
   ENDIF(NOT BZip2_FIND_QUIETLY)
 ELSE(BZIP2_FOUND)
   IF(BZip2_FIND_REQUIRED)
@@ -36,3 +36,4 @@ ELSE(BZIP2_FOUND)
   ENDIF(BZip2_FIND_REQUIRED)
 ENDIF(BZIP2_FOUND)
 
+MARK_AS_ADVANCED(BZIP2_INCLUDE_DIR BZIP2_LIBRARIES)
diff --git a/modules/FindCups.cmake b/modules/FindCups.cmake
index 3fa26686..fa97b6f1 100644
--- a/modules/FindCups.cmake
+++ b/modules/FindCups.cmake
@@ -1,9 +1,9 @@
-# - Try to find Cups
+# - Try to find the Cups printing system
 # Once done this will define
 #
 #  CUPS_FOUND - system has Cups
 #  CUPS_INCLUDE_DIR - the Cups include directory
-#  CUPS_LIBRARY - Link these to use OpenGL and GLU
+#  CUPS_LIBRARIES - Libraries needed to use Cups
 #  CUPS_DEFINITIONS - Compiler switches required for using Cups
 #
 
@@ -13,19 +13,19 @@ FIND_PATH(CUPS_INCLUDE_DIR cups/cups.h
   /usr/local/include
 )
 
-FIND_LIBRARY(CUPS_LIBRARY NAMES cups
+FIND_LIBRARY(CUPS_LIBRARIES NAMES cups
   PATHS
   /usr/lib
   /usr/local/lib
 )
 
-IF(CUPS_INCLUDE_DIR AND CUPS_LIBRARY)
+IF(CUPS_INCLUDE_DIR AND CUPS_LIBRARIES)
    SET(CUPS_FOUND TRUE)
-ENDIF(CUPS_INCLUDE_DIR AND CUPS_LIBRARY)
+ENDIF(CUPS_INCLUDE_DIR AND CUPS_LIBRARIES)
 
 IF(CUPS_FOUND)
   IF(NOT Cups_FIND_QUIETLY)
-    MESSAGE(STATUS "Found Cups: ${CUPS_LIBRARY}")
+    MESSAGE(STATUS "Found Cups: ${CUPS_LIBRARIES}")
   ENDIF(NOT Cups_FIND_QUIETLY)
 ELSE(CUPS_FOUND)
   IF(Cups_FIND_REQUIRED)
@@ -33,3 +33,4 @@ ELSE(CUPS_FOUND)
   ENDIF(Cups_FIND_REQUIRED)
 ENDIF(CUPS_FOUND)
 
+MARK_AS_ADVANCED(CUPS_INCLUDE_DIR CUPS_LIBRARIES)
diff --git a/modules/FindDNSSD.cmake b/modules/FindDNSSD.cmake
index 466dd3f2..7b6f81e3 100644
--- a/modules/FindDNSSD.cmake
+++ b/modules/FindDNSSD.cmake
@@ -3,7 +3,7 @@
 #
 #  DNSSD_FOUND - system has DNSSD
 #  DNSSD_INCLUDE_DIR - the DNSSD include directory
-#  DNSSD_LIBRARY - Link these to use dnssd
+#  DNSSD_LIBRARIES - Link these to use dnssd
 #  DNSSD_DEFINITIONS - Compiler switches required for using DNSSD
 #
 # need more test: look at into dnssd/configure.in.in
@@ -14,19 +14,19 @@ FIND_PATH(DNSSD_INCLUDE_DIR dns_sd.h
   /usr/include/avahi-compat-libdns_sd/
 )
 
-FIND_LIBRARY(DNSSD_LIBRARY NAMES dns_sd
+FIND_LIBRARY(DNSSD_LIBRARIES NAMES dns_sd
   PATHS
   /usr/lib
   /usr/local/lib
 )
 
-IF(DNSSD_INCLUDE_DIR AND DNSSD_LIBRARY)
+IF(DNSSD_INCLUDE_DIR AND DNSSD_LIBRARIES)
    SET(DNSSD_FOUND TRUE)
-ENDIF(DNSSD_INCLUDE_DIR AND DNSSD_LIBRARY)
+ENDIF(DNSSD_INCLUDE_DIR AND DNSSD_LIBRARIES)
 
 IF(DNSSD_FOUND)
   IF(NOT DNSSD_FIND_QUIETLY)
-    MESSAGE(STATUS "Found DNSSD: ${DNSSD_LIBRARY}")
+    MESSAGE(STATUS "Found DNSSD: ${DNSSD_LIBRARIES}")
   ENDIF(NOT DNSSD_FIND_QUIETLY)
 ELSE(DNSSD_FOUND)
   IF(DNSSD_FIND_REQUIRED)
@@ -34,3 +34,4 @@ ELSE(DNSSD_FOUND)
   ENDIF(DNSSD_FIND_REQUIRED)
 ENDIF(DNSSD_FOUND)
 
+MARK_AS_ADVANCED(DNSSD_INCLUDE_DIR DNSSD_LIBRARIES)
diff --git a/modules/FindFAM.cmake b/modules/FindFAM.cmake
index bfc553fe..0479bc8f 100644
--- a/modules/FindFAM.cmake
+++ b/modules/FindFAM.cmake
@@ -1,27 +1,36 @@
+# - Try to find the FAM directory notification library
+# Once done this will define
+#
+#  FAM_FOUND - system has FAM
+#  FAM_INCLUDE_DIR - the FAM include directory
+#  FAM_LIBRARIES - The libraries needed to use FAM
 
 FIND_PATH(FAM_INCLUDE_DIR fam.h
-/usr/include
-/usr/local/include
+   /usr/include
+   /usr/local/include
 )
 
-FIND_LIBRARY(FAM_LIBRARY NAMES fam
-PATHS
-/usr/lib
-/usr/local/lib
+FIND_LIBRARY(FAM_LIBRARIES NAMES fam
+   PATHS
+   /usr/lib
+   /usr/local/lib
 )
 
 
-IF(FAM_INCLUDE_DIR)
+IF(FAM_INCLUDE_DIR AND FAM_LIBRARIES)
    SET(FAM_FOUND TRUE)
-ENDIF(FAM_INCLUDE_DIR)
+ENDIF(FAM_INCLUDE_DIR AND FAM_LIBRARIES)
 
 
 IF(FAM_FOUND)
    IF(NOT FAM_FIND_QUIETLY)
-      MESSAGE(STATUS "Found fam: ${FAM_LIBRARY}")
+      MESSAGE(STATUS "Found fam: ${FAM_LIBRARIES}")
    ENDIF(NOT FAM_FIND_QUIETLY)
 ELSE(FAM_FOUND)
    IF(FAM_FIND_REQUIRED)
       MESSAGE(FATAL_ERROR "Could not find fam library")
    ENDIF(FAM_FIND_REQUIRED)
 ENDIF(FAM_FOUND)
+
+MARK_AS_ADVANCED(FAM_INCLUDE_DIR FAM_LIBRARIES)
+
diff --git a/modules/FindGIF.cmake b/modules/FindGIF.cmake
index b1dc4a57..94e75388 100644
--- a/modules/FindGIF.cmake
+++ b/modules/FindGIF.cmake
@@ -3,7 +3,7 @@
 #
 #  GIF_FOUND - system has GIF
 #  GIF_INCLUDE_DIR - the GIF include directory
-#  GIF_LIBRARY - Link these to use OpenGL and GLU
+#  GIF_LIBRARIES - Libraries needed to use GIF
 #  GIF_DEFINITIONS - Compiler switches required for using GIF
 #
 
@@ -13,19 +13,19 @@ FIND_PATH(GIF_INCLUDE_DIR gif_lib.h
   /usr/local/include
 )
 
-FIND_LIBRARY(GIF_LIBRARY NAMES gif libgif ungif libungif giflib
+FIND_LIBRARY(GIF_LIBRARIES NAMES gif libgif ungif libungif giflib
   PATHS
   /usr/lib
   /usr/local/lib
 )
 
-IF(GIF_INCLUDE_DIR AND GIF_LIBRARY)
+IF(GIF_INCLUDE_DIR AND GIF_LIBRARIES)
    SET(GIF_FOUND TRUE)
-ENDIF(GIF_INCLUDE_DIR AND GIF_LIBRARY)
+ENDIF(GIF_INCLUDE_DIR AND GIF_LIBRARIES)
 
 IF(GIF_FOUND)
   IF(NOT GIF_FIND_QUIETLY)
-    MESSAGE(STATUS "Found GIF: ${GIF_LIBRARY}")
+    MESSAGE(STATUS "Found GIF: ${GIF_LIBRARIES}")
   ENDIF(NOT GIF_FIND_QUIETLY)
 ELSE(GIF_FOUND)
   IF(GIF_FIND_REQUIRED)
@@ -33,3 +33,4 @@ ELSE(GIF_FOUND)
   ENDIF(GIF_FIND_REQUIRED)
 ENDIF(GIF_FOUND)
 
+MARK_AS_ADVANCED(GIF_INCLUDE_DIR GIF_LIBRARIES)
diff --git a/modules/FindGNUWIN32.cmake b/modules/FindGNUWIN32.cmake
new file mode 100644
index 00000000..fc57f022
--- /dev/null
+++ b/modules/FindGNUWIN32.cmake
@@ -0,0 +1,32 @@
+IF (WIN32)
+
+INCLUDE(MacroGetenvWinPath)
+
+MACRO_GETENV_WIN_PATH(_progFiles PROGRAMFILES)
+
+FIND_FILE(GNUWIN32_DIR GNUWIN32
+   ${_progFiles}
+   "C:/"
+)
+
+IF(GNUWIN32_DIRECTORY)
+   SET(GNUWIN32_INCLUDE_DIR ${GNUWIN32_DIR}/include)
+   SET(GNUWIN32_LIBRARY_DIR ${GNUWIN32_DIR}/lib)
+   SET(GNUWIN32_BINARY_DIR  ${GNUWIN32_DIR}/bin)
+   SET(GNUWIN32_FOUND TRUE)
+ELSE(GNUWIN32_DIRECTORY)
+   SET(GNUWIN32_FOUND)
+ENDIF(GNUWIN32_DIRECTORY)
+
+IF(GNUWIN32_FOUND)
+  IF(NOT GNUWIN32_FIND_QUIETLY)
+    MESSAGE(STATUS "Found GNUWIN32: ${GNUWIN32_DIR}")
+  ENDIF(NOT GNUWIN32_FIND_QUIETLY)
+ELSE(GNUWIN32_FOUND)
+  IF(GNUWIN32_FIND_REQUIRED)
+    MESSAGE(SEND_ERROR "Could not find GNUWIN32")
+  ENDIF(GNUWIN32_FIND_REQUIRED)
+ENDIF(GNUWIN32_FOUND)
+
+ENDIF (WIN32)
+
diff --git a/modules/FindHSPELL.cmake b/modules/FindHSPELL.cmake
index 5a5576e3..0ae31553 100644
--- a/modules/FindHSPELL.cmake
+++ b/modules/FindHSPELL.cmake
@@ -3,7 +3,7 @@
 #
 #  HSPELL_FOUND - system has HSPELL
 #  HSPELL_INCLUDE_DIR - the HSPELL include directory
-#  HSPELL_LIBRARY - Link these to use OpenGL and GLU
+#  HSPELL_LIBRARIES - The libraries needed to use HSPELL
 #  HSPELL_DEFINITIONS - Compiler switches required for using HSPELL
 #
 
@@ -13,19 +13,19 @@ FIND_PATH(HSPELL_INCLUDE_DIR hspell.h
   /usr/local/include
 )
 
-FIND_LIBRARY(HSPELL_LIBRARY NAMES hspell
+FIND_LIBRARY(HSPELL_LIBRARIES NAMES hspell
   PATHS
   /usr/lib
   /usr/local/lib
 )
 
-IF(HSPELL_INCLUDE_DIR AND HSPELL_LIBRARY)
+IF(HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES)
    SET(HSPELL_FOUND TRUE)
-ENDIF(HSPELL_INCLUDE_DIR AND HSPELL_LIBRARY)
+ENDIF(HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES)
 
 IF(HSPELL_FOUND)
   IF(NOT HSPELL_FIND_QUIETLY)
-    MESSAGE(STATUS "Found HSPELL: ${HSPELL_LIBRARY}")
+    MESSAGE(STATUS "Found HSPELL: ${HSPELL_LIBRARIES}")
   ENDIF(NOT HSPELL_FIND_QUIETLY)
 ELSE(HSPELL_FOUND)
   IF(HSPELL_FIND_REQUIRED)
@@ -33,3 +33,5 @@ ELSE(HSPELL_FOUND)
   ENDIF(HSPELL_FIND_REQUIRED)
 ENDIF(HSPELL_FOUND)
 
+MARK_AS_ADVANCED(HSPELL_INCLUDE_DIR HSPELL_LIBRARIES)
+
diff --git a/modules/FindJasper.cmake b/modules/FindJasper.cmake
index 5e86c1ca..5eff452e 100644
--- a/modules/FindJasper.cmake
+++ b/modules/FindJasper.cmake
@@ -1,27 +1,35 @@
+# - Try to find the Jasper JPEG2000 library
+# Once done this will define
+#
+#  JASPER_FOUND - system has Jasper
+#  JASPER_INCLUDE_DIR - the Jasper include directory
+#  JASPER_LIBRARIES - The libraries needed to use Jasper
 
 FIND_PATH(JASPER_INCLUDE_DIR jasper/jasper.h
-/usr/include
-/usr/local/include
+   /usr/include
+   /usr/local/include
 )
 
-FIND_LIBRARY(JASPER_LIBRARY NAMES jasper libjasper
-PATHS
-/usr/lib
-/usr/local/lib
+FIND_LIBRARY(JASPER_LIBRARIES NAMES jasper libjasper
+   PATHS
+   /usr/lib
+   /usr/local/lib
 )
 
 
-IF(JASPER_INCLUDE_DIR AND JASPER_LIBRARY)
+IF(JASPER_INCLUDE_DIR AND JASPER_LIBRARIES)
    SET(JASPER_FOUND TRUE)
-ENDIF(JASPER_INCLUDE_DIR AND JASPER_LIBRARY)
+ENDIF(JASPER_INCLUDE_DIR AND JASPER_LIBRARIES)
 
 
 IF(JASPER_FOUND)
    IF(NOT Jasper_FIND_QUIETLY)
-      MESSAGE(STATUS "Found jasper: ${JASPER_LIBRARY}")
+      MESSAGE(STATUS "Found jasper: ${JASPER_LIBRARIES}")
    ENDIF(NOT Jasper_FIND_QUIETLY)
 ELSE(JASPER_FOUND)
    IF(Jasper_FIND_REQUIRED)
       MESSAGE(FATAL_ERROR "Could not find jasper library")
    ENDIF(Jasper_FIND_REQUIRED)
 ENDIF(JASPER_FOUND)
+
+MARK_AS_ADVANCED(JASPER_INCLUDE_DIR JASPER_LIBRARIES)
diff --git a/modules/FindKDE4.cmake b/modules/FindKDE4.cmake
index 12e6b89b..f0b82112 100644
--- a/modules/FindKDE4.cmake
+++ b/modules/FindKDE4.cmake
@@ -193,43 +193,10 @@ IF (WIN32)
       MESSAGE(FATAL_ERROR "Support for Cygwin not yet implemented, please edit FindKDE4.cmake to enable it")
    ENDIF(CYGWIN)
 
-   
-   # at first find the kdewin32 library, this has to be compiled and installed before kdelibs/
-   # search for kdewin32 in the default install directory for applications (default of (n)make install)
-   FIND_LIBRARY(KDEWIN32_LIBRARY NAMES kdewin32 PATHS 
-      $ENV{ProgramFiles}/kdewin32/lib )
-   FIND_PATH(KDEWIN32_INCLUDE_DIR winposix_export.h
-      $ENV{ProgramFiles}/kdewin32/include )     
-
-
-   # kdelibs/win/ has to be built before the rest of kdelibs/
-   # eventually it will be moved out from kdelibs/
-   IF (NOT KDEWIN32_LIBRARY OR NOT KDEWIN32_INCLUDE_DIR)
-      MESSAGE(FATAL_ERROR "Could not find kdewin32 library, build and install kdelibs/win/ before building kdelibs/")
-   ENDIF (NOT KDEWIN32_LIBRARY OR NOT KDEWIN32_INCLUDE_DIR)
-
-   # add the winsock2 library, using find_library or something like this would probably be better
-   SET(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY} user32)
-   SET(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY} shell32)
-   SET(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY} ws2_32)
-
-   IF(MINGW)
-      #mingw compiler
-      SET(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/mingw ${QT_INCLUDES})
-   ELSE(MINGW)
-      # msvc compiler
-      SET(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/msvc  ${QT_INCLUDES})
-
-      # add the MS SDK include directory if available
-      SET(MS_SDK_DIR $ENV{MSSdk})
-      IF (MS_SDK_DIR)
-         SET(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDES} ${MS_SDK_DIR}/include )
-      ENDIF (MS_SDK_DIR)
-      
-   ENDIF(MINGW)
+   FIND_PACKAGE(KDEWIN32 REQUIRED)
    
    SET( _KDE4_PLATFORM_INCLUDE_DIRS ${KDEWIN32_INCLUDES})
-   SET( QT_AND_KDECORE_LIBS ${QT_AND_KDECORE_LIBS} ${KDEWIN32_LIBRARY} )
+   SET( QT_AND_KDECORE_LIBS ${QT_AND_KDECORE_LIBS} ${KDEWIN32_LIBRARIES} )
      
    # windows, mingw
    IF(MINGW)
diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake
new file mode 100644
index 00000000..131c0354
--- /dev/null
+++ b/modules/FindKDEWIN32.cmake
@@ -0,0 +1,58 @@
+# - Try to find the KDEWIN32 library
+# Once done this will define
+#
+#  KDEWIN32_FOUND - system has KDEWIN32
+#  KDEWIN32_INCLUDES - the KDEWIN32 include directories
+#  KDEWIN32_LIBRARIES - The libraries needed to use KDEWIN32
+
+IF (WIN32)
+
+INCLUDE(MacroGetenvWinPath)
+
+MACRO_GETENV_WIN_PATH(_program_FILES_DIR PROGRAMFILES)
+
+FIND_PACKAGE(Qt4 REQUIRED)
+
+FIND_PATH(KDEWIN32_INCLUDE_DIR winposix_export.h
+   ${_program_FILES_DIR}/kdewin32/include
+)
+
+
+# at first find the kdewin32 library, this has to be compiled and installed before kdelibs/
+# search for kdewin32 in the default install directory for applications (default of (n)make install)
+FIND_LIBRARY(KDEWIN32_LIBRARY NAMES kdewin32
+   PATHS
+   ${_program_FILES_DIR}/kdewin32/lib
+)
+
+
+# kdelibs/win/ has to be built before the rest of kdelibs/
+# eventually it will be moved out from kdelibs/
+IF (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR)
+   SET(KDEWIN32_FOUND TRUE)
+   # add the winsock2 library, using find_library or something like this would probably be better
+   SET(KDEWIN32_LIBRARIES ${KDEWIN32_LIBRARY} user32 shell32 ws2_32)
+
+   IF(MINGW)
+      #mingw compiler
+      SET(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/mingw ${QT_INCLUDES})
+   ELSE(MINGW)
+      # msvc compiler
+      # add the MS SDK include directory if available
+      MACRO_GETENV_WIN_PATH(MSSDK_DIR MSSDK)
+      SET(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/msvc  ${QT_INCLUDES} ${MSSDK_DIR})
+   ENDIF(MINGW)
+   
+ENDIF (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR)
+
+IF (KDEWIN32_FOUND)
+   IF (NOT KDEWIN32_FIND_QUIETLY)
+      MESSAGE(STATUS "Found KDEWIN32: ${KDEWIN32_LIBRARY}")
+   ENDIF (NOT KDEWIN32_FIND_QUIETLY)
+ELSE (KDEWIN32_FOUND)
+   IF (KDEWIN32_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find KDEWIN32 library")
+   ENDIF (KDEWIN32_FIND_REQUIRED)
+ENDIF (KDEWIN32_FOUND)
+
+ENDIF (WIN32)
diff --git a/modules/FindLibArt.cmake b/modules/FindLibArt.cmake
index da9d68e7..967e8818 100644
--- a/modules/FindLibArt.cmake
+++ b/modules/FindLibArt.cmake
@@ -1,3 +1,14 @@
+# - Try to find the LibArt 2D graphics library
+# Once done this will define
+#
+#  LIBART_FOUND - system has the LibArt
+#  LIBART_INCLUDE_DIR - the LibArt include directory
+#  LIBART_LIBRARIES - The libraries needed to use LibArt
+# under Windows this also checks in the GNUWIN32 directory, so make
+# sure that the GNUWIN32 directory gets found if you use the GNUWIN32 version of PCRE
+# under UNIX pkgconfig among others pkg-config is used to find the directories
+
+
 INCLUDE(UsePkgConfig)
 
 # use pkg-config to get the directories and then use these values
@@ -6,35 +17,39 @@ PKGCONFIG(libart-2.0 _libArtIncDir _libArtLinkDir _libArtLinkFlags _libArtCflags
 
 SET(LIBART_DEFINITIONS ${_libArtCflags})
 
-FIND_PATH(LIBART_ROOT_INCLUDE_DIR libart-2.0/libart_lgpl/libart.h
-   ${_libArtIncDir}
-   /usr/include
-   /usr/local/include
-)
-
-SET(LIBART_INCLUDE_DIR ${LIBART_ROOT_INCLUDE_DIR}/libart-2.0 CACHE PATH "LibArt include directory")
+# under windows, try to find the base gnuwin32 directory, do nothing under UNIX
+FIND_PACKAGE(GNUWIN32)
 
-MARK_AS_ADVANCED(LIBART_ROOT_INCLUDE_DIR)
+FIND_PATH(LIBART_INCLUDE_DIR libart_lgpl/libart.h
+   ${_libArtIncDir}/libart-2.0
+   /usr/include/libart-2.0
+   /usr/local/include/libart-2.0
+   ${GNUWIN32_DIR}/include
+)
 
-FIND_LIBRARY(LIBART_LIBRARY NAMES art_lgpl_2
-PATHS
-${_libArtLinkDir}
-/usr/lib
-/usr/local/lib
+FIND_LIBRARY(LIBART_LIBRARIES NAMES art_lgpl_2
+   PATHS
+   ${_libArtLinkDir}
+   /usr/lib
+   /usr/local/lib
+   ${GNUWIN32_DIR}/lib
 )
 
 
-IF(LIBART_INCLUDE_DIR AND LIBART_LIBRARY)
+IF(LIBART_INCLUDE_DIR AND LIBART_LIBRARIES)
    SET(LIBART_FOUND TRUE)
-ENDIF(LIBART_INCLUDE_DIR AND LIBART_LIBRARY)
+ENDIF(LIBART_INCLUDE_DIR AND LIBART_LIBRARIES)
 
 
 IF(LIBART_FOUND)
    IF(NOT LibArt_FIND_QUIETLY)
-      MESSAGE(STATUS "Found libart: ${LIBART_LIBRARY}")
+      MESSAGE(STATUS "Found libart: ${LIBART_LIBRARIES}")
    ENDIF(NOT LibArt_FIND_QUIETLY)
 ELSE(LIBART_FOUND)
    IF(LibArt_FIND_REQUIRED)
       MESSAGE(FATAL_ERROR "Could not find libart")
    ENDIF(LibArt_FIND_REQUIRED)
 ENDIF(LIBART_FOUND)
+
+MARK_AS_ADVANCED(LIBART_INCLUDE_DIR LIBART_LIBRARIES)
+
diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake
index b40635c8..0ccd8ca2 100644
--- a/modules/FindLibXml2.cmake
+++ b/modules/FindLibXml2.cmake
@@ -3,7 +3,7 @@
 #
 #  LIBXML2_FOUND - system has LibXml2
 #  LIBXML2_INCLUDE_DIR - the LibXml2 include directory
-#  LIBXML2_LIBRARY - Link these to use OpenGL and GLU
+#  LIBXML2_LIBRARIES - the libraries needed to use LibXml2
 #  LIBXML2_DEFINITIONS - Compiler switches required for using LibXml2
 #
 # use pkg-config to get the directories and then use these values
@@ -15,24 +15,31 @@ INCLUDE(UsePkgConfig)
 PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags)
 
 SET(LIBXML2_DEFINITIONS ${_LibXml2Cflags})
-

-# this is a hack dealing with lists in CMAKE_INCLUDE_PATH
-foreach(incDir ${CMAKE_INCLUDE_PATH})
-	FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h
-		${incDir}/libxml2
-	  ${_LibXml2IncDir}/libxml2
-	  /usr/include/libxml2
-	  /usr/local/include/libxml2
-	)
-endforeach(incDir ${CMAKE_INCLUDE_PATH})
-
-IF(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARY)
+
+FIND_PACKAGE(GNUWIN32)
+
+FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h
+ ${_LibXml2IncDir}/libxml2
+  /usr/include/libxml2
+  /usr/local/include/libxml2
+  ${GNUWIN32_DIR}/include/libxml2
+)
+
+FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2
+  PATHS
+  ${_LibXml2LinkDir}
+  /usr/lib
+  /usr/local/lib
+  ${GNUWIN32_DIR}/lib
+)
+
+IF(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
    SET(LIBXML2_FOUND TRUE)
-ENDIF(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARY)
+ENDIF(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
 
 IF(LIBXML2_FOUND)
   IF(NOT LibXml2_FIND_QUIETLY)
-    MESSAGE(STATUS "Found LibXml2: ${LIBXML2_LIBRARY}")
+    MESSAGE(STATUS "Found LibXml2: ${LIBXML2_LIBRARIES}")
   ENDIF(NOT LibXml2_FIND_QUIETLY)
 ELSE(LIBXML2_FOUND)
   IF(LibXml2_FIND_REQUIRED)
@@ -40,3 +47,4 @@ ELSE(LIBXML2_FOUND)
   ENDIF(LibXml2_FIND_REQUIRED)
 ENDIF(LIBXML2_FOUND)
 
+MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES)
\ No newline at end of file
diff --git a/modules/FindLibXslt.cmake b/modules/FindLibXslt.cmake
index 6f120cbb..0df7e855 100644
--- a/modules/FindLibXslt.cmake
+++ b/modules/FindLibXslt.cmake
@@ -3,7 +3,7 @@
 #
 #  LIBXSLT_FOUND - system has LibXslt
 #  LIBXSLT_INCLUDE_DIR - the LibXslt include directory
-#  LIBXSLT_LIBRARY - Link these to use OpenGL and GLU
+#  LIBXSLT_LIBRARIES - Link these to LibXslt
 #  LIBXSLT_DEFINITIONS - Compiler switches required for using LibXslt
 #
 
@@ -22,20 +22,20 @@ FIND_PATH(LIBXSLT_INCLUDE_DIR libxslt/xslt.h
   /usr/local/include
 )
 
-FIND_LIBRARY(LIBXSLT_LIBRARY NAMES xslt libxslt
+FIND_LIBRARY(LIBXSLT_LIBRARIES NAMES xslt libxslt
   PATHS
   ${_LibXsltLinkDir}
   /usr/lib
   /usr/local/lib
 )
 
-IF(LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARY)
+IF(LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES)
    SET(LIBXSLT_FOUND TRUE)
-ENDIF(LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARY)
+ENDIF(LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES)
 
 IF(LIBXSLT_FOUND)
   IF(NOT LibXslt_FIND_QUIETLY)
-    MESSAGE(STATUS "Found LibXslt: ${LIBXSLT_LIBRARY}")
+    MESSAGE(STATUS "Found LibXslt: ${LIBXSLT_LIBRARIES}")
   ENDIF(NOT LibXslt_FIND_QUIETLY)
 ELSE(LIBXSLT_FOUND)
   IF(LibXslt_FIND_REQUIRED)
@@ -43,3 +43,5 @@ ELSE(LIBXSLT_FOUND)
   ENDIF(LibXslt_FIND_REQUIRED)
 ENDIF(LIBXSLT_FOUND)
 
+MARK_AS_ADVANCED(LIBXSLT_INCLUDE_DIR LIBXSLT_LIBRARIES)
+
diff --git a/modules/FindOpenSSL.cmake b/modules/FindOpenSSL.cmake
index e5240905..93625b4f 100644
--- a/modules/FindOpenSSL.cmake
+++ b/modules/FindOpenSSL.cmake
@@ -1,26 +1,35 @@
+# - Try to find the OpenSSL encryption library
+# Once done this will define
+#
+#  OPENSSL_FOUND - system has the OpenSSL library
+#  OPENSSL_INCLUDE_DIR - the OpenSSL include directory
+#  OPENSSL_LIBRARIES - The libraries needed to use OpenSSL
 
 FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h
-/usr/include/
-/usr/local/include/
+   /usr/include/
+   /usr/local/include/
 )
 
-FIND_LIBRARY(OPENSSL_LIBRARY NAMES ssl ssleay32
-PATHS
-/usr/lib
-/usr/local/lib
+FIND_LIBRARY(OPENSSL_LIBRARIES NAMES ssl ssleay32
+   PATHS
+   /usr/lib
+   /usr/local/lib
 )
 
-IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARY)
+IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
    SET(OPENSSL_FOUND TRUE)
-ENDIF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARY)
+ENDIF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
 
 
 IF(OPENSSL_FOUND)
    IF(NOT OpenSSL_FIND_QUIETLY)
-      MESSAGE(STATUS "Found OpenSSL: ${OPENSSL_LIBRARY}")
+      MESSAGE(STATUS "Found OpenSSL: ${OPENSSL_LIBRARIES}")
    ENDIF(NOT OpenSSL_FIND_QUIETLY)
 ELSE(OPENSSL_FOUND)
    IF(OpenSSL_FIND_REQUIRED)
       MESSAGE(FATAL_ERROR "Could not find OpenSSL")
    ENDIF(OpenSSL_FIND_REQUIRED)
 ENDIF(OPENSSL_FOUND)
+
+MARK_AS_ADVANCED(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES)
+
diff --git a/modules/FindPCRE.cmake b/modules/FindPCRE.cmake
index fa61a430..5a78c6c1 100644
--- a/modules/FindPCRE.cmake
+++ b/modules/FindPCRE.cmake
@@ -1,34 +1,52 @@
+# - Try to find the PCRE regular expression library
+# Once done this will define
+#
+#  PCRE_FOUND - system has the PCRE library
+#  PCRE_INCLUDE_DIR - the PCRE include directory
+#  PCRE_LIBRARIES - The libraries needed to use PCRE
+# under Windows this also checks in the GNUWIN32 directory, so make
+# sure that the GNUWIN32 directory gets found if you use the GNUWIN32 version of PCRE
+#
+
+
+# under windows, try to find the base gnuwin32 directory, do nothing under UNIX
+FIND_PACKAGE(GNUWIN32)
 
 FIND_PATH(PCRE_INCLUDE_DIR pcre.h
-/usr/include/
-/usr/local/include/
+   /usr/include/
+   /usr/local/include/
+   ${GNUWIN32_DIR}/include
 )
 
 FIND_LIBRARY(PCRE_PCRE_LIBRARY NAMES pcre
-PATHS
-/usr/lib
-/usr/local/lib
+   PATHS
+   /usr/lib
+   /usr/local/lib
+   ${GNUWIN32_DIR}/lib
 )
 
 FIND_LIBRARY(PCRE_PCREPOSIX_LIBRARY NAMES pcreposix
-PATHS
-/usr/lib
-/usr/local/lib
+   PATHS
+   /usr/lib
+   /usr/local/lib
+   ${GNUWIN32_DIR}/lib
 )
 
-SET(PCRE_LIBRARY ${PCRE_PCRE_LIBRARY} ${PCRE_PCREPOSIX_LIBRARY})
+SET(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} ${PCRE_PCREPOSIX_LIBRARY} CACHE STRING "The libraries needed to use PCRE")
 
-IF(PCRE_INCLUDE_DIR AND PCRE_LIBRARY)
+IF(PCRE_INCLUDE_DIR AND PCRE_LIBRARIES)
    SET(PCRE_FOUND TRUE)
-ENDIF(PCRE_INCLUDE_DIR AND PCRE_LIBRARY)
+ENDIF(PCRE_INCLUDE_DIR AND PCRE_LIBRARIES)
 
 
 IF(PCRE_FOUND)
    IF(NOT PCRE_FIND_QUIETLY)
-      MESSAGE(STATUS "Found PCRE: ${PCRE_LIBRARY}")
+      MESSAGE(STATUS "Found PCRE: ${PCRE_LIBRARIES}")
    ENDIF(NOT PCRE_FIND_QUIETLY)
 ELSE(PCRE_FOUND)
    IF(PCRE_FIND_REQUIRED)
       MESSAGE(FATAL_ERROR "Could not find PCRE")
    ENDIF(PCRE_FIND_REQUIRED)
 ENDIF(PCRE_FOUND)
+
+MARK_AS_ADVANCED(PCRE_INCLUDE_DIR PCRE_LIBRARIES PCRE_PCREPOSIX_LIBRARY PCRE_PCRE_LIBRARY)
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake
index b7273684..c968951c 100644
--- a/modules/FindQt4.cmake
+++ b/modules/FindQt4.cmake
@@ -127,14 +127,15 @@ ENDIF(WIN32)
 
 FILE(GLOB GLOB_TEMP_VAR /usr/local/Trolltech/Qt-4*/)
 SET(GLOB_TEMP_VAR)
-IF(GLOB_TEMP_VAR)
+IF (GLOB_TEMP_VAR)
   SET(QT4_PATHS ${QT4_PATHS} ${GLOB_TEMP_VAR})
-ENDIF(GLOB_TEMP_VAR)
+ENDIF (GLOB_TEMP_VAR)
 SET(GLOB_TEMP_VAR)
 FILE(GLOB GLOB_TEMP_VAR /usr/local/qt-x11-commercial-4*/bin/)
-IF(GLOB_TEMP_VAR)
-  SET(QT4_PATHS ${QT4_PATHS} ${GLOB_TEMP_VAR})
-ENDIF(GLOB_TEMP_VAR)
+IF (GLOB_TEMP_VAR)
+   SET(QT4_PATHS ${QT4_PATHS} ${GLOB_TEMP_VAR})
+ENDIF (GLOB_TEMP_VAR)
+
 # check for qmake
 FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake PATHS
   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
@@ -144,39 +145,39 @@ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake PATHS
   NO_SYSTEM_PATH
 )
 
-IF(NOT QT_QMAKE_EXECUTABLE)
+IF (NOT QT_QMAKE_EXECUTABLE)
    FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake)
-ENDIF(NOT QT_QMAKE_EXECUTABLE)
+ENDIF (NOT QT_QMAKE_EXECUTABLE)
 
-IF(QT_QMAKE_EXECUTABLE)
-  EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_VERSION"
-    OUTPUT_VARIABLE QTVERSION)
-  IF(QTVERSION MATCHES "4.*")
-    SET(QT4_QMAKE_FOUND TRUE)
-  ENDIF(QTVERSION MATCHES "4.*")
-ENDIF(QT_QMAKE_EXECUTABLE)
+IF (QT_QMAKE_EXECUTABLE)
+   EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_VERSION"
+      OUTPUT_VARIABLE QTVERSION)
+   IF(QTVERSION MATCHES "4.*")
+      SET(QT4_QMAKE_FOUND TRUE)
+   ENDIF(QTVERSION MATCHES "4.*")
+ENDIF (QT_QMAKE_EXECUTABLE)
 
 IF(QT4_QMAKE_FOUND)
   # Set QT_LIBRARY_DIR
   IF(NOT QT_LIBRARY_DIR)
     EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
-      ARGS "-query QT_INSTALL_LIBS"
-      OUTPUT_VARIABLE QT_LIBRARY_DIR_TMP )
+       ARGS "-query QT_INSTALL_LIBS"
+       OUTPUT_VARIABLE QT_LIBRARY_DIR_TMP )
     IF(EXISTS "${QT_LIBRARY_DIR_TMP}")
-      SET(QT_LIBRARY_DIR ${QT_LIBRARY_DIR_TMP} CACHE PATH "Qt library dir")
+       SET(QT_LIBRARY_DIR ${QT_LIBRARY_DIR_TMP} CACHE PATH "Qt library dir")
     ELSE(EXISTS "${QT_LIBRARY_DIR_TMP}")
-      MESSAGE("Warning: QT_QMAKE_EXECUTABLE reported QT_INSTALL_LIBS as ${QT_LIBRARY_DIR_TMP}")
-      MESSAGE("Warning: ${QT_LIBRARY_DIR_TMP} does not exist, Qt must not be installed correctly.")
+       MESSAGE("Warning: QT_QMAKE_EXECUTABLE reported QT_INSTALL_LIBS as ${QT_LIBRARY_DIR_TMP}")
+       MESSAGE("Warning: ${QT_LIBRARY_DIR_TMP} does not exist, Qt must not be installed correctly.")
     ENDIF(EXISTS "${QT_LIBRARY_DIR_TMP}")
   ENDIF(NOT QT_LIBRARY_DIR)
 
   IF (APPLE)
     IF (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
       SET(QT_USE_FRAMEWORKS ON
-        CACHE BOOL "Set to ON if Qt build uses frameworks.")
+         CACHE BOOL "Set to ON if Qt build uses frameworks.")
     ELSE (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
-      SET(QT_USE_FRAMEWORKS OFF
-        CACHE BOOL "Set to ON if Qt build uses frameworks.")
+       SET(QT_USE_FRAMEWORKS OFF
+         CACHE BOOL "Set to ON if Qt build uses frameworks.")
     ENDIF (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
 
     MARK_AS_ADVANCED(QT_USE_FRAMEWORKS)
@@ -196,6 +197,7 @@ IF(QT4_QMAKE_FOUND)
       SET(QT_HEADERS_DIR ${qt_headers} CACHE INTERNAL "")
     ENDIF(QT_QMAKE_EXECUTABLE)
   ENDIF (NOT QT_HEADERS_DIR)
+  
   FILE(GLOB GLOB_TEMP_VAR /usr/local/qt-x11-commercial-3*/include/Qt/)
   SET(QT_PATH_INCLUDE ${GLOB_TEMP_VAR})
   FILE(GLOB GLOB_TEMP_VAR /usr/local/Trolltech/Qt-4*/include/Qt/)
@@ -242,9 +244,7 @@ IF(QT4_QMAKE_FOUND)
   )
 
   IF (QT_USE_FRAMEWORKS)
-    SET(QT_DEFINITIONS ${QT_DEFINITIONS}
-      -F${QT_LIBRARY_DIR} -L${QT_LIBRARY_DIR}
-      )
+    SET(QT_DEFINITIONS ${QT_DEFINITIONS} -F${QT_LIBRARY_DIR} -L${QT_LIBRARY_DIR} )
   ENDIF (QT_USE_FRAMEWORKS)
 
   # Set QT_QT3SUPPORT_INCLUDE_DIR
@@ -340,43 +340,43 @@ IF(QT4_QMAKE_FOUND)
     # If FIND_LIBRARY found libraries in Apple frameworks, we would not have
     # to jump through these hoops.
     SET(QT_QTCORE_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtCore"
-      CACHE STRING "The QtCore library.")
+       CACHE STRING "The QtCore library.")
     SET(QT_QTCORE_LIBRARY_DEBUG "-F${QT_LIBRARY_DIR} -framework QtCore"
-      CACHE STRING "The QtCore library.")
+       CACHE STRING "The QtCore library.")
     SET(QT_QT3SUPPORT_LIBRARY "-framework Qt3Support"
-      CACHE STRING "The Qt3Support library.")
+       CACHE STRING "The Qt3Support library.")
     SET(QT_QT3SUPPORT_LIBRARY_DEBUG "-framework Qt3Support"
-      CACHE STRING "The Qt3Support library.")
+       CACHE STRING "The Qt3Support library.")
     SET(QT_QTGUI_LIBRARY "-framework QtGui"
-      CACHE STRING "The QtGui library.")
+       CACHE STRING "The QtGui library.")
     SET(QT_QTGUI_LIBRARY_DEBUG "-framework QtGui"
-      CACHE STRING "The QtGui library.")
+       CACHE STRING "The QtGui library.")
     SET(QT_QTNETWORK_LIBRARY "-framework QtNetwork"
-      CACHE STRING "The QtNetwork library.")
+       CACHE STRING "The QtNetwork library.")
     SET(QT_QTNETWORK_LIBRARY_DEBUG "-framework QtNetwork"
-      CACHE STRING "The QtNetwork library.")
+       CACHE STRING "The QtNetwork library.")
     SET(QT_QTOPENGL_LIBRARY "-framework QtOpenGL"
-      CACHE STRING "The QtOpenGL library.")
+       CACHE STRING "The QtOpenGL library.")
     SET(QT_QTOPENGL_LIBRARY_DEBUG "-framework QtOpenGL"
-      CACHE STRING "The QtOpenGL library.")
+       CACHE STRING "The QtOpenGL library.")
     SET(QT_QTSQL_LIBRARY "-framework QtSql"
-      CACHE STRING "The QtSql library.")
+       CACHE STRING "The QtSql library.")
     SET(QT_QTSQL_LIBRARY_DEBUG "-framework QtSql"
-      CACHE STRING "The QtSql library.")
+       CACHE STRING "The QtSql library.")
     SET(QT_QTXML_LIBRARY "-framework QtXml"
-      CACHE STRING "The QtXml library.")
+       CACHE STRING "The QtXml library.")
     SET(QT_QTXML_LIBRARY_DEBUG "-framework QtXml"
-      CACHE STRING "The QtXml library.")
+       CACHE STRING "The QtXml library.")
     SET(QT_QTSVG_LIBRARY "-framework QtSvg"
-      CACHE STRING "The QtSvg library.")
+       CACHE STRING "The QtSvg library.")
     SET(QT_QTSVG_LIBRARY_DEBUG "-framework QtSvg"
-      CACHE STRING "The QtSvg library.")
+       CACHE STRING "The QtSvg library.")
 
     # WTF?  why don't we have frameworks?  :P
     SET(QT_QTTEST_LIBRARY "-L${QT_LIBRARY_DIR} -lQtTest"
-      CACHE STRING "The QtTest library.")
+       CACHE STRING "The QtTest library.")
     SET(QT_QTTEST_LIBRARY_DEBUG "-L${QT_LIBRARY_DIR} -lQtTest"
-      CACHE STRING "The QtTest library.")
+       CACHE STRING "The QtTest library.")
 
   ELSE (QT_USE_FRAMEWORKS)
 
@@ -512,10 +512,10 @@ IF(QT4_QMAKE_FOUND)
   #
   #######################################
   IF (NOT QT_BINARY_DIR)
-    EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
-      ARGS "-query QT_INSTALL_BINS"
-      OUTPUT_VARIABLE qt_bins )
-    SET(QT_BINARY_DIR ${qt_bins} CACHE INTERNAL "")
+     EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
+        ARGS "-query QT_INSTALL_BINS"
+        OUTPUT_VARIABLE qt_bins )
+     SET(QT_BINARY_DIR ${qt_bins} CACHE INTERNAL "")
   ENDIF (NOT QT_BINARY_DIR)
 
   # at first without the system paths, in order to prefer e.g. ${QTDIR}/bin/qmake over /usr/bin/qmake,
@@ -536,13 +536,13 @@ IF(QT4_QMAKE_FOUND)
     )
 
   # if qmake wasn't found in the specific dirs, now check the system path
-  IF(NOT QT_MOC_EXECUTABLE)
-    FIND_PROGRAM(QT_MOC_EXECUTABLE NAMES moc )
-  ENDIF(NOT QT_MOC_EXECUTABLE)
+  IF (NOT QT_MOC_EXECUTABLE)
+     FIND_PROGRAM(QT_MOC_EXECUTABLE NAMES moc )
+  ENDIF (NOT QT_MOC_EXECUTABLE)
 
-  IF(QT_MOC_EXECUTABLE)
-    SET ( QT_WRAP_CPP "YES")
-  ENDIF(QT_MOC_EXECUTABLE)
+  IF (QT_MOC_EXECUTABLE)
+     SET ( QT_WRAP_CPP "YES")
+  ENDIF (QT_MOC_EXECUTABLE)
 
   FIND_PROGRAM(QT_UIC3_EXECUTABLE
     NAMES uic3
@@ -574,13 +574,13 @@ IF(QT4_QMAKE_FOUND)
     NO_SYSTEM_PATH
     )
 
-  IF(NOT QT_UIC_EXECUTABLE)
-    FIND_PROGRAM(QT_UIC_EXECUTABLE NAMES uic )
-  ENDIF(NOT QT_UIC_EXECUTABLE)
+  IF (NOT QT_UIC_EXECUTABLE)
+     FIND_PROGRAM(QT_UIC_EXECUTABLE NAMES uic )
+  ENDIF (NOT QT_UIC_EXECUTABLE)
 
-  IF(QT_UIC_EXECUTABLE)
-    SET ( QT_WRAP_UI "YES")
-  ENDIF(QT_UIC_EXECUTABLE)
+  IF (QT_UIC_EXECUTABLE)
+     SET ( QT_WRAP_UI "YES")
+  ENDIF (QT_UIC_EXECUTABLE)
 
   FIND_PROGRAM(QT_RCC_EXECUTABLE
     NAMES rcc
@@ -613,20 +613,20 @@ IF(QT4_QMAKE_FOUND)
      GET_DIRECTORY_PROPERTY(_inc_DIRS INCLUDE_DIRECTORIES)
 
      FOREACH(_current ${_inc_DIRS})
-         SET(${_moc_INC_DIRS} ${${_moc_INC_DIRS}} "-I" ${_current})
+        SET(${_moc_INC_DIRS} ${${_moc_INC_DIRS}} "-I" ${_current})
      ENDFOREACH(_current ${_inc_DIRS})
   ENDMACRO(QT4_GET_MOC_INC_DIRS)
 
   MACRO(QT4_GENERATE_MOC infile outfile )
   # get include dirs
-    QT4_GET_MOC_INC_DIRS(moc_includes)
+     QT4_GET_MOC_INC_DIRS(moc_includes)
 
-    GET_FILENAME_COMPONENT(infile ${infile} ABSOLUTE)
+     GET_FILENAME_COMPONENT(infile ${infile} ABSOLUTE)
     
-    ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
-      COMMAND ${QT_MOC_EXECUTABLE}
-      ARGS ${moc_includes} -o ${outfile} ${infile}
-      MAIN_DEPENDENCY ${infile})
+     ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
+        COMMAND ${QT_MOC_EXECUTABLE}
+        ARGS ${moc_includes} -o ${outfile} ${infile}
+        MAIN_DEPENDENCY ${infile})
   ENDMACRO(QT4_GENERATE_MOC)
 
 
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake
index 61c6dc97..cd8af459 100644
--- a/modules/KDE4Macros.cmake
+++ b/modules/KDE4Macros.cmake
@@ -109,12 +109,19 @@ MACRO(KDE4_ADD_KCFG_FILES _sources)
 
       SET(_src_FILE    ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp)
       SET(_header_FILE ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h)
+      SET(_moc_FILE    ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc)
 
       ADD_CUSTOM_COMMAND(OUTPUT ${_src_FILE}
          COMMAND ${KDE4_KCFGC_EXECUTABLE}
          ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${_kcfg_FILE} ${_tmp_FILE}
          DEPENDS ${_tmp_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/${_kcfg_FILE} ${_KDE4_KCONFIG_COMPILER_DEP} )
 
+
+      SET_SOURCE_FILES_PROPERTIES(${_header_FILE} PROPERTIES GENERATED TRUE)
+      QT4_GENERATE_MOC(${_header_FILE} ${_moc_FILE} )
+
+      MACRO_ADD_FILE_DEPENDENCIES(${_src_FILE} ${_moc_FILE} )
+
       SET(${_sources} ${${_sources}} ${_src_FILE})
 
    ENDFOREACH (_current_FILE)
diff --git a/modules/MacroGetenvWinPath.cmake b/modules/MacroGetenvWinPath.cmake
new file mode 100644
index 00000000..9c8efaf3
--- /dev/null
+++ b/modules/MacroGetenvWinPath.cmake
@@ -0,0 +1,5 @@
+
+MACRO(MACRO_GETENV_WIN_PATH var name)
+   SET(${var} $ENV{${name}})
+   STRING( REGEX REPLACE "\\\\" "/" ${var} "${${var}}" )
+ENDMACRO(MACRO_GETENV_WIN_PATH var name)
diff --git a/modules/MacroLibrary.cmake b/modules/MacroLibrary.cmake
index f82a5db8..7da67217 100644
--- a/modules/MacroLibrary.cmake
+++ b/modules/MacroLibrary.cmake
@@ -4,6 +4,5 @@
 INCLUDE (MacroOptionalFindPackage)
 INCLUDE (MacroAdditionalCleanFiles)
 INCLUDE (MacroAddFileDependencies)
-#INCLUDE (MacroAppendDirectoryProperties)
-#INCLUDE (MacroAppendSourceFilesProperties)
+INCLUDE (MacroGetenvWinPath)
 
diff --git a/modules/UsePkgConfig.cmake b/modules/UsePkgConfig.cmake
index 898fb706..0990dc20 100644
--- a/modules/UsePkgConfig.cmake
+++ b/modules/UsePkgConfig.cmake
@@ -37,3 +37,4 @@ MACRO(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags)
 
 ENDMACRO(PKGCONFIG _include_DIR _link_DIR _link_FLAGS _cflags)
 
+MARK_AS_ADVANCED(PKGCONFIG_EXECUTABLE)
\ No newline at end of file