From 39512cce47a7db826139e69d4c68c946e8c2a41a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20K=C3=BCmmel?= <syntheticpp@gmx.net>
Date: Sun, 3 Sep 2006 11:09:05 +0000
Subject:  change search order:  1. command line option GNUWIN32_DIR  2.
 GNUWIN32_DIR enviroment variable  3. default programm install folder

svn path=/trunk/KDE/kdelibs/; revision=580362
---
 modules/FindGNUWIN32.cmake | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/modules/FindGNUWIN32.cmake b/modules/FindGNUWIN32.cmake
index c5128dd5..7f810481 100644
--- a/modules/FindGNUWIN32.cmake
+++ b/modules/FindGNUWIN32.cmake
@@ -1,15 +1,21 @@
 if (WIN32)
 
+# check if GNUWIN32_DIR is already set 
+# (e.g. by command line argument or the calling script)
 if(NOT GNUWIN32_DIR)
-   file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _progFiles)
+	# check for enviroment variable
+	file(TO_CMAKE_PATH "$ENV{GNUWIN32_DIR}" GNUWIN32_DIR)
+	if(NOT GNUWIN32_DIR)
+		# search in the default program install folder
+		file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _progFiles)
+		find_file(GNUWIN32_DIR gnuwin32 win32libs 
+   			PATHS
+   			"${_progFiles}"
+   			"C:/"
+		)
+	endif(NOT GNUWIN32_DIR)
 endif(NOT GNUWIN32_DIR)
 
-find_file(GNUWIN32_DIR gnuwin32 win32libs 
-   PATHS
-   "${_progFiles}"
-   "C:/" "D:/" "E:/" "F:/" "G:/"
-)
-
 if (GNUWIN32_DIR)
    set(GNUWIN32_INCLUDE_DIR ${GNUWIN32_DIR}/include)
    set(GNUWIN32_LIBRARY_DIR ${GNUWIN32_DIR}/lib)
-- 
cgit v1.2.1