From 4a14a050b4f31c142b4efdc2d96a112ef5e945b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20K=C3=BCmmel?= <syntheticpp@gmx.net>
Date: Mon, 14 Aug 2006 11:10:43 +0000
Subject: [PATCH] use module to find support libraries, also search for
 win32libs(
 http://www.kdelibs.com/wiki/index.php/3rd-party_libraries_required_for_KDElibs_4
 )

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14668 a592a061-630c-0410-9148-cb99ea01b6c8
---
 development/cmake/modules/FindGNUWIN32.cmake | 4 +++-
 development/cmake/modules/LyXPaths.cmake     | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/development/cmake/modules/FindGNUWIN32.cmake b/development/cmake/modules/FindGNUWIN32.cmake
index 8b1b15a673..3fe83dbcd1 100644
--- a/development/cmake/modules/FindGNUWIN32.cmake
+++ b/development/cmake/modules/FindGNUWIN32.cmake
@@ -2,11 +2,13 @@ if (WIN32)
 
 file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _progFiles)
 
-find_file(GNUWIN32_DIR gnuwin32
+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)
diff --git a/development/cmake/modules/LyXPaths.cmake b/development/cmake/modules/LyXPaths.cmake
index ce8c1d89fa..f95897fb71 100644
--- a/development/cmake/modules/LyXPaths.cmake
+++ b/development/cmake/modules/LyXPaths.cmake
@@ -1,10 +1,13 @@
 if(WIN32)
 
+find_package(GNUWIN32 REQUIRED)
+
 file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _prog_path)
 
 set(_zlib_path ${_prog_path}/zlib)
 set(_iconv_path ${_prog_path}/iconv)
-set(_gnuwin32_dir ${_prog_path}/gnuwin32)
+
+set(_gnuwin32_dir ${GNUWIN32_DIR})
 
 set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} 
 	${_gnuwin32_dir}/include