cmake: -Dhelp=1 lists all options

[lyx.git] / development / cmake / modules / FindZLIB.cmake

diff --git a/development/cmake/modules/FindZLIB.cmake b/development/cmake/modules/FindZLIB.cmake
index 5f01b9d362b3ce9c04acc28bd42df98a21ff7f1b..96fb7b6644553ce18ab3edd3de9aad66632df277 100644 (file)
--- 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)
@@ -31,7 +34,7 @@ else()
    if(ZLIB_FIND_REQUIRED)
       message(STATUS "Looked for Z libraries named ${POTENTIAL_Z_LIBS}.")
       message(STATUS "Found no acceptable Z library. This is fatal.")
-      message(FATAL_ERROR "Could NOT find z library")
+      message(FATAL_ERROR "Could NOT find z library, set GNUWIN32_DIR to dir containing /include and /bin folders: -DGNUWIN32_DIR=...")
    endif()
 endif()