find libraries in previously detected gnuwin32 package location

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

5 files changed, 71 insertions, 0 deletions

diff --git a/modules/FindGIF.cmake b/modules/FindGIF.cmake
index 17097160..d26c942b 100644
--- a/modules/FindGIF.cmake
+++ b/modules/FindGIF.cmake
@@ -11,12 +11,14 @@
 FIND_PATH(GIF_INCLUDE_DIR gif_lib.h
   /usr/include
   /usr/local/include
+ ${GNUWIN32_DIR}/include
 )
 
 FIND_LIBRARY(GIF_LIBRARIES NAMES gif libgif ungif libungif giflib
   PATHS
   /usr/lib
   /usr/local/lib
+ ${GNUWIN32_DIR}/lib
 )
 
 if(GIF_INCLUDE_DIR AND GIF_LIBRARIES)
diff --git a/modules/FindJPEG.cmake b/modules/FindJPEG.cmake
new file mode 100644
index 00000000..ba3d4f0b
--- /dev/null
+++ b/modules/FindJPEG.cmake
@@ -0,0 +1,36 @@
+# - Find JPEG
+# Find the native JPEG includes and library
+# This module defines
+#  JPEG_INCLUDE_DIR, where to find jpeglib.h, etc.
+#  JPEG_LIBRARIES, the libraries needed to use JPEG.
+#  JPEG_FOUND, If false, do not try to use JPEG.
+# also defined, but not for general use are
+#  JPEG_LIBRARY, where to find the JPEG library.
+
+FIND_PATH(JPEG_INCLUDE_DIR jpeglib.h
+/usr/local/include
+/usr/include
+${GNUWIN32_DIR}/include
+)
+
+SET(JPEG_NAMES ${JPEG_NAMES} jpeg)
+FIND_LIBRARY(JPEG_LIBRARY
+  NAMES ${JPEG_NAMES}
+  PATHS /usr/lib /usr/local/lib ${GNUWIN32_DIR}/lib
+  )
+
+IF (JPEG_LIBRARY)
+  IF (JPEG_INCLUDE_DIR)
+    SET(JPEG_LIBRARIES ${JPEG_LIBRARY})
+    SET(JPEG_FOUND "YES")
+  ENDIF (JPEG_INCLUDE_DIR)
+ENDIF (JPEG_LIBRARY)
+
+# Deprecated declarations.
+SET (NATIVE_JPEG_INCLUDE_PATH ${JPEG_INCLUDE_DIR} )
+GET_FILENAME_COMPONENT (NATIVE_JPEG_LIB_PATH ${JPEG_LIBRARY} PATH)
+
+MARK_AS_ADVANCED(
+  JPEG_LIBRARY
+  JPEG_INCLUDE_DIR
+  )
diff --git a/modules/FindLibXslt.cmake b/modules/FindLibXslt.cmake
index 44d24605..67f3ea24 100644
--- a/modules/FindLibXslt.cmake
+++ b/modules/FindLibXslt.cmake
@@ -20,6 +20,7 @@ FIND_PATH(LIBXSLT_INCLUDE_DIR libxslt/xslt.h
   ${_LibXsltIncDir}
   /usr/include
   /usr/local/include
+  ${GNUWIN32_DIR}/include
 )
 
 FIND_LIBRARY(LIBXSLT_LIBRARIES NAMES xslt libxslt
@@ -27,6 +28,7 @@ FIND_LIBRARY(LIBXSLT_LIBRARIES NAMES xslt libxslt
   ${_LibXsltLinkDir}
   /usr/lib
   /usr/local/lib
+  ${GNUWIN32_DIR}/lib
 )
 
 if(LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES)
diff --git a/modules/FindOpenSSL.cmake b/modules/FindOpenSSL.cmake
index 7b9f7d55..9192924a 100644
--- a/modules/FindOpenSSL.cmake
+++ b/modules/FindOpenSSL.cmake
@@ -8,12 +8,14 @@
 FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h
    /usr/include/
    /usr/local/include/
+   ${GNUWIN32_DIR}/include
 )
 
 FIND_LIBRARY(OPENSSL_LIBRARIES NAMES ssl ssleay32
    PATHS
    /usr/lib
    /usr/local/lib
+   ${GNUWIN32_DIR}/lib
 )
 
 if(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
diff --git a/modules/FindZLIB.cmake b/modules/FindZLIB.cmake
new file mode 100644
index 00000000..7fb8f25f
--- /dev/null
+++ b/modules/FindZLIB.cmake
@@ -0,0 +1,29 @@
+
+FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
+/usr/include
+/usr/local/include
+${GNUWIN32_DIR}/include
+)
+
+FIND_LIBRARY(ZLIB_LIBRARY NAMES z zlib
+PATHS
+/usr/lib
+/usr/local/lib
+${GNUWIN32_DIR}/lib
+)
+
+
+IF(ZLIB_INCLUDE_DIR)
+   SET(ZLIB_FOUND TRUE)
+ENDIF(ZLIB_INCLUDE_DIR)
+
+
+IF(ZLIB_FOUND)
+   IF(NOT ZLIB_FIND_QUIETLY)
+      MESSAGE(STATUS "Found Z: ${ZLIB_LIBRARY}")
+   ENDIF(NOT ZLIB_FIND_QUIETLY)
+ELSE(ZLIB_FOUND)
+   IF(ZLIB_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find z library")
+   ENDIF(ZLIB_FIND_REQUIRED)
+ENDIF(ZLIB_FOUND)