From: Peter Kümmel <syntheticpp@gmx.net>
Date: Sun, 3 Sep 2006 10:51:20 +0000 (+0000)
Subject: also check vor env. variable GNUWIN32_DIR
X-Git-Tag: 1.6.10~12661
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=8f8f58131636754854cdfa666ff30acb58d65694;p=features.git

also check vor env. variable GNUWIN32_DIR

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14874 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/development/cmake/modules/FindGNUWIN32.cmake b/development/cmake/modules/FindGNUWIN32.cmake
index 30bb7d224d..7f81048193 100644
--- a/development/cmake/modules/FindGNUWIN32.cmake
+++ b/development/cmake/modules/FindGNUWIN32.cmake
@@ -1,16 +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:/"
-)
-
-
 if (GNUWIN32_DIR)
    set(GNUWIN32_INCLUDE_DIR ${GNUWIN32_DIR}/include)
    set(GNUWIN32_LIBRARY_DIR ${GNUWIN32_DIR}/lib)