diff --git a/INSTALL.cmake b/INSTALL.cmake index e96e792762..cc281d80d8 100644 --- a/INSTALL.cmake +++ b/INSTALL.cmake @@ -27,7 +27,8 @@ Windows only * as described in INSTALL.scons * install win32libs with the 'KDE on Windows' installer http://download.cegit.de/kde-windows/installer/ - (there are also Qt packages for msvc and mingw) + - use the msvc packages + - a release version of Qt is also available by the installer If cmake couldn't find these modules set GNUWIN32_DIR, eg. -DGNUWIN32_DIR=c:\gnuwin32. By default cmake searches in your diff --git a/development/cmake/modules/FindGNUWIN32.cmake b/development/cmake/modules/FindGNUWIN32.cmake index c083600286..97617a3245 100644 --- a/development/cmake/modules/FindGNUWIN32.cmake +++ b/development/cmake/modules/FindGNUWIN32.cmake @@ -42,7 +42,7 @@ if(WIN32) endif() else() if (GNUWIN32_FIND_REQUIRED) - message(SEND_ERROR "Could NOT find GNUWIN32") + message(SEND_ERROR "Could NOT find GNUWIN32, please set GNUWIN32_DIR") endif() endif() diff --git a/development/cmake/modules/FindZLIB.cmake b/development/cmake/modules/FindZLIB.cmake index 5f01b9d362..64cc8d0f81 100644 --- a/development/cmake/modules/FindZLIB.cmake +++ b/development/cmake/modules/FindZLIB.cmake @@ -11,13 +11,16 @@ endif() find_path(ZLIB_INCLUDE_DIR zlib.h /usr/include - /usr/local/include) + /usr/local/include + "${GNUWIN32_DIR}"/include) set(POTENTIAL_Z_LIBS z zlib zdll) find_library(ZLIB_LIBRARY NAMES ${POTENTIAL_Z_LIBS} - PATHS "C:\\Programme\\Microsoft Visual Studio 8\\VC\\lib" - /usr/lib /usr/local/lib) + PATHS + "C:\\Programme\\Microsoft Visual Studio 8\\VC\\lib" + /usr/lib /usr/local/lib + "${GNUWIN32_DIR}"/lib) if(ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY) set(ZLIB_FOUND TRUE)