Merge branch 'master' of git.lyx.org:lyx

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

diff --git a/development/cmake/modules/FindZLIB.cmake b/development/cmake/modules/FindZLIB.cmake
index 5f01b9d362b3ce9c04acc28bd42df98a21ff7f1b..251e9a214ac4f0820a3f3a3a8ec7bfcd050f09be 100644 (file)
--- a/development/cmake/modules/FindZLIB.cmake
+++ b/development/cmake/modules/FindZLIB.cmake
@@ -9,15 +9,27 @@ if (ZLIB_INCLUDE_DIR)
   set(ZLIB_FIND_QUIETLY TRUE)
 endif()
 
-find_path(ZLIB_INCLUDE_DIR zlib.h
+find_path(ZLIB_INCLUDE_DIR zlib.h PATHS
  /usr/include
- /usr/local/include)
+ /usr/local/include
+ "${GNUWIN32_DIR}"/include)
 
+find_file(ZLIB_HEADER zlib.h
+       PATHS ${ZLIB_INCLUDE_DIR} NO_DEFAULT_PATH)
+       
 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
+       ${ICONV_RELATIVE_TO_LIBINTL}
+       NO_DEFAULT_PATH)
+       
+
+find_library(ZLIB_LIBRARY NAMES ${POTENTIAL_Z_LIBS}
+       PATHS 
+       "C:\\Programme\\Microsoft Visual Studio 8\\VC\\lib"
+       ${SYSTEM_LIB_DIRS}
+       "${GNUWIN32_DIR}"/lib)
 
 if(ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY)
    set(ZLIB_FOUND TRUE)
@@ -31,7 +43,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()