X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2Fmodules%2FFindGNUWIN32.cmake;h=93afaef7502db52f19daafb09623969a4d8fd8e0;hb=f2e437f6b823574170f0bafd8738dcb3c72b5e14;hp=8b1b15a6738d20b23248eb55fbf38aec404f5486;hpb=330db5cce1e21125298d3d618d10268d43116637;p=lyx.git

diff --git a/development/cmake/modules/FindGNUWIN32.cmake b/development/cmake/modules/FindGNUWIN32.cmake
index 8b1b15a673..93afaef750 100644
--- a/development/cmake/modules/FindGNUWIN32.cmake
+++ b/development/cmake/modules/FindGNUWIN32.cmake
@@ -1,32 +1,48 @@
-if (WIN32)
+#
+#  from kdelibs
+#
 
-file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _progFiles)
+if(WIN32)
 
-find_file(GNUWIN32_DIR gnuwin32
-   ${_progFiles}
-   "C:/"
-)
+	# check if GNUWIN32_DIR is already set 
+	# (e.g. by command line argument or the calling script)
+	if(NOT GNUWIN32_DIR)
+		# 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:/" "D:/" "E:/" "F:/" "G:/"
+			)
+		endif()
+	endif()
 
-if (GNUWIN32_DIR)
-   set(GNUWIN32_INCLUDE_DIR ${GNUWIN32_DIR}/include)
-   set(GNUWIN32_LIBRARY_DIR ${GNUWIN32_DIR}/lib)
-   set(GNUWIN32_BINARY_DIR  ${GNUWIN32_DIR}/bin)
-   set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} ${GNUWIN32_INCLUDE_DIR})
-   set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${GNUWIN32_LIBRARY_DIR})
-   set(GNUWIN32_FOUND TRUE)
-else (GNUWIN32_DIR)
-   set(GNUWIN32_FOUND)
-endif (GNUWIN32_DIR)
+	if(GNUWIN32_DIR)
+		 set(GNUWIN32_INCLUDE_DIR ${GNUWIN32_DIR}/include)
+		 set(GNUWIN32_LIBRARY_DIR ${GNUWIN32_DIR}/lib)
+		 set(GNUWIN32_BINARY_DIR  ${GNUWIN32_DIR}/bin)
+		 set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} ${GNUWIN32_INCLUDE_DIR})
+		 set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${GNUWIN32_LIBRARY_DIR})
+		 set(GNUWIN32_FOUND TRUE)
+	else()
+		 set(GNUWIN32_FOUND)
+	endif()
 
-if (GNUWIN32_FOUND)
-  if (NOT GNUWIN32_FIND_QUIETLY)
-    message(STATUS "Found GNUWIN32: ${GNUWIN32_DIR}")
-  endif (NOT GNUWIN32_FIND_QUIETLY)
-else (GNUWIN32_FOUND)
-  if (GNUWIN32_FIND_REQUIRED)
-    message(SEND_ERROR "Could NOT find GNUWIN32")
-  endif (GNUWIN32_FIND_REQUIRED)
-endif (GNUWIN32_FOUND)
+	if(GNUWIN32_FOUND)
+		if (NOT GNUWIN32_FIND_QUIETLY)
+			message(STATUS "Found GNUWIN32: ${GNUWIN32_DIR}")
+		endif()
+	else()
+		if (GNUWIN32_FIND_REQUIRED)
+			set(GNUWIN32_DIR CACHE PATH FORCE)
+			message(STATUS "ERROR: Could NOT find GNUWIN32, please set GNUWIN32_DIR")
+			message(STATUS "ERROR: or let cmake download all required files by using -DLYX_DEPENDENCIES_DOWNLOAD=1")
+			message(FATAL_ERROR)
+		endif()
+	endif()
 
-endif (WIN32)
+endif()