use module to find support libraries, also search for win32libs( http://www.kdelibs...

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

diff --git a/development/cmake/modules/FindGNUWIN32.cmake b/development/cmake/modules/FindGNUWIN32.cmake
index 8b1b15a6738d20b23248eb55fbf38aec404f5486..3fe83dbcd12bb6522cca47782857ed8cfe5e1005 100644 (file)
--- 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 ce8c1d89fa2452891c72fe8e397720387227bf93..f95897fb712a6fece31b0b6d13c13b66f710288f 100644 (file)
--- 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