optimized gnuwin32 detection on windows

- find gnuwin32 package location very early 
- removed GNUWIN32_INCLUDE_DIR/GNUWIN32_LIBRARY_DIR macros, because FindGNUWIN32.cmake 
  sets now CMAKE_INCLUDE_PATH and CMAKE_LIBRARY_PATH
- don't use pkgconfig on windows

  

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

9 files changed, 14 insertions, 63 deletions

diff --git a/modules/FindBZip2.cmake b/modules/FindBZip2.cmake
index 3bcc1748..a51662b8 100644
--- a/modules/FindBZip2.cmake
+++ b/modules/FindBZip2.cmake
@@ -7,19 +7,16 @@
 #  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 f8b40d48..e3ffdaf1 100644
--- a/modules/FindGIF.cmake
+++ b/modules/FindGIF.cmake
@@ -6,20 +6,16 @@
 #  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
   /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
index 9113df28..7d624b30 100644
--- a/modules/FindJPEG.cmake
+++ b/modules/FindJPEG.cmake
@@ -7,20 +7,15 @@
 # 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
-${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
+  PATHS /usr/lib /usr/local/lib
   )
 
 IF (JPEG_LIBRARY)
diff --git a/modules/FindLibArt.cmake b/modules/FindLibArt.cmake
index 05d278b1..c1528bb3 100644
--- a/modules/FindLibArt.cmake
+++ b/modules/FindLibArt.cmake
@@ -4,27 +4,19 @@
 #  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
-# in the FIND_PATH() and FIND_LIBRARY() calls
-PKGCONFIG(libart-2.0 _libArtIncDir _libArtLinkDir _libArtLinkFlags _libArtCflags)
-
-set(LIBART_DEFINITIONS ${_libArtCflags})
-
-# under windows, try to find the base gnuwin32 directory, do nothing under UNIX
-FIND_PACKAGE(GNUWIN32)
+IF (NOT WIN32)
+	INCLUDE(UsePkgConfig)
+	# use pkg-config to get the directories and then use these values
+	# in the FIND_PATH() and FIND_LIBRARY() calls
+	PKGCONFIG(libart-2.0 _libArtIncDir _libArtLinkDir _libArtLinkFlags _libArtCflags)
+	set(LIBART_DEFINITIONS ${_libArtCflags})
+ENDIF (NOT WIN32)
 
 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_LIBRARIES NAMES art_lgpl_2
@@ -32,7 +24,6 @@ FIND_LIBRARY(LIBART_LIBRARIES NAMES art_lgpl_2
    ${_libArtLinkDir}
    /usr/lib
    /usr/local/lib
-   ${GNUWIN32_DIR}/lib
 )
 
 
diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake
index a5d8ab17..deb09c65 100644
--- a/modules/FindLibXml2.cmake
+++ b/modules/FindLibXml2.cmake
@@ -7,18 +7,13 @@
 #  LIBXML2_DEFINITIONS - Compiler switches required for using LibXml2
 #
 
-IF (WIN32)
-	FIND_PACKAGE(GNUWIN32)
-	SET(_LibXml2IncDir  ${GNUWIN32_DIR}/include)
-	SET(_LibXml2LinkDir ${GNUWIN32_DIR}/lib)
-ELSE (WIN32)
+IF (NOT WIN32)
 	# use pkg-config to get the directories and then use these values
 	# in the FIND_PATH() and FIND_LIBRARY() calls
 	INCLUDE(UsePkgConfig)
 	PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags)
-ENDIF (WIN32)
-
-set(LIBXML2_DEFINITIONS ${_LibXml2Cflags})
+	set(LIBXML2_DEFINITIONS ${_LibXml2Cflags})
+ENDIF (NOT WIN32)
 
 FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h
   PATHS
diff --git a/modules/FindLibXslt.cmake b/modules/FindLibXslt.cmake
index aae6310d..d33fca26 100644
--- a/modules/FindLibXslt.cmake
+++ b/modules/FindLibXslt.cmake
@@ -7,19 +7,13 @@
 #  LIBXSLT_DEFINITIONS - Compiler switches required for using LibXslt
 #
 
-IF (WIN32)
-	FIND_PACKAGE(GNUWIN32)
-	SET(_LibXsltIncDir  ${GNUWIN32_DIR}/include)
-	SET(_LibXsltLinkDir ${GNUWIN32_DIR}/lib)
-ELSE (WIN32)
+IF (NOT WIN32)
 	# use pkg-config to get the directories and then use these values
 	# in the FIND_PATH() and FIND_LIBRARY() calls
 	INCLUDE(UsePkgConfig)
 	PKGCONFIG(libxslt _LibXsltIncDir _LibXsltLinkDir _LibXsltLinkFlags _LibXsltCflags)
-ENDIF (WIN32)
-
-set(LIBXSLT_DEFINITIONS ${_LibXsltCflags})
-
+	set(LIBXSLT_DEFINITIONS ${_LibXsltCflags})
+ENDIF (NOT WIN32)
 
 FIND_PATH(LIBXSLT_INCLUDE_DIR libxslt/xslt.h
   ${_LibXsltIncDir}
diff --git a/modules/FindOpenSSL.cmake b/modules/FindOpenSSL.cmake
index ada33cf0..5449f1f6 100644
--- a/modules/FindOpenSSL.cmake
+++ b/modules/FindOpenSSL.cmake
@@ -4,19 +4,16 @@
 #  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/
    /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/FindPCRE.cmake b/modules/FindPCRE.cmake
index d3a84023..c5301316 100644
--- a/modules/FindPCRE.cmake
+++ b/modules/FindPCRE.cmake
@@ -4,32 +4,22 @@
 #  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/
-   ${GNUWIN32_DIR}/include
 )
 
 FIND_LIBRARY(PCRE_PCRE_LIBRARY NAMES pcre
    PATHS
    /usr/lib
    /usr/local/lib
-   ${GNUWIN32_DIR}/lib
 )
 
 FIND_LIBRARY(PCRE_PCREPOSIX_LIBRARY NAMES pcreposix
    PATHS
    /usr/lib
    /usr/local/lib
-   ${GNUWIN32_DIR}/lib
 )
 
 set(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} ${PCRE_PCREPOSIX_LIBRARY} CACHE STRING "The libraries needed to use PCRE")
diff --git a/modules/FindZLIB.cmake b/modules/FindZLIB.cmake
index 1e01a4da..b3df2bae 100644
--- a/modules/FindZLIB.cmake
+++ b/modules/FindZLIB.cmake
@@ -1,19 +1,15 @@
-FIND_PACKAGE(GNUWIN32)
 
 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)