using GNUWIN32_DIR requires detecting of gnuwin32 package dir before

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

6 files changed, 12 insertions, 1 deletions

diff --git a/modules/FindBZip2.cmake b/modules/FindBZip2.cmake
index 0dd14f3c..4a6fae71 100644
--- a/modules/FindBZip2.cmake
+++ b/modules/FindBZip2.cmake
@@ -7,17 +7,19 @@
 #  BZIP2_DEFINITIONS - Compiler switches required for using BZip2
 #  BZIP2_NEED_PREFIX - this is set if the functions are prefixed with BZ2_
 #
-
+FIND_PACKAGE(GNUWIN32)
 
 FIND_PATH(BZIP2_INCLUDE_DIR bzlib.h
   /usr/include
   /usr/local/include
+  ${GNUWIN32_DIR}/include
 )
 
 FIND_LIBRARY(BZIP2_LIBRARIES NAMES bz2 bzip2
   PATHS
   /usr/lib
   /usr/local/lib
+  ${GNUWIN32_DIR}/lib
 )
 
 if(BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
diff --git a/modules/FindGIF.cmake b/modules/FindGIF.cmake
index d26c942b..b7bb1b8b 100644
--- a/modules/FindGIF.cmake
+++ b/modules/FindGIF.cmake
@@ -6,6 +6,7 @@
 #  GIF_LIBRARIES - Libraries needed to use GIF
 #  GIF_DEFINITIONS - Compiler switches required for using GIF
 #
+FIND_PACKAGE(GNUWIN32)
 
 
 FIND_PATH(GIF_INCLUDE_DIR gif_lib.h
diff --git a/modules/FindJPEG.cmake b/modules/FindJPEG.cmake
index ba3d4f0b..63111377 100644
--- a/modules/FindJPEG.cmake
+++ b/modules/FindJPEG.cmake
@@ -7,6 +7,10 @@
 # also defined, but not for general use are
 #  JPEG_LIBRARY, where to find the JPEG library.
 
+# under windows, try to find the base gnuwin32 directory, do nothing under UNIX
+FIND_PACKAGE(GNUWIN32)
+
+
 FIND_PATH(JPEG_INCLUDE_DIR jpeglib.h
 /usr/local/include
 /usr/include
diff --git a/modules/FindLibXslt.cmake b/modules/FindLibXslt.cmake
index 67f3ea24..4abb6f9f 100644
--- a/modules/FindLibXslt.cmake
+++ b/modules/FindLibXslt.cmake
@@ -16,6 +16,8 @@ PKGCONFIG(libxslt _LibXsltIncDir _LibXsltLinkDir _LibXsltLinkFlags _LibXsltCflag
 
 set(LIBXSLT_DEFINITIONS ${_LibXsltCflags})
 
+FIND_PACKAGE(GNUWIN32)
+
 FIND_PATH(LIBXSLT_INCLUDE_DIR libxslt/xslt.h
   ${_LibXsltIncDir}
   /usr/include
diff --git a/modules/FindOpenSSL.cmake b/modules/FindOpenSSL.cmake
index 9192924a..952d4c20 100644
--- a/modules/FindOpenSSL.cmake
+++ b/modules/FindOpenSSL.cmake
@@ -4,6 +4,7 @@
 #  OPENSSL_FOUND - system has the OpenSSL library
 #  OPENSSL_INCLUDE_DIR - the OpenSSL include directory
 #  OPENSSL_LIBRARIES - The libraries needed to use OpenSSL
+FIND_PACKAGE(GNUWIN32)
 
 FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h
    /usr/include/
diff --git a/modules/FindZLIB.cmake b/modules/FindZLIB.cmake
index 7fb8f25f..e114d450 100644
--- a/modules/FindZLIB.cmake
+++ b/modules/FindZLIB.cmake
@@ -1,3 +1,4 @@
+FIND_PACKAGE(GNUWIN32)
 
 FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
 /usr/include