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 61d85c18d2ee3df1ede5ac0f7a0d8b8ff6b83ee9..251e9a214ac4f0820a3f3a3a8ec7bfcd050f09be 100644 (file)
--- a/development/cmake/modules/FindZLIB.cmake
+++ b/development/cmake/modules/FindZLIB.cmake
@@ -1,38 +1,50 @@
 #
 #  based on cmake file
 #
+
+set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
+
 if (ZLIB_INCLUDE_DIR)
   # Already in cache, be silent
   set(ZLIB_FIND_QUIETLY TRUE)
-endif (ZLIB_INCLUDE_DIR)
+endif()
 
-FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
+find_path(ZLIB_INCLUDE_DIR zlib.h PATHS
  /usr/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
-)
-
-IF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY)
-   SET(ZLIB_FOUND TRUE)
-ENDIF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY)
-
-IF (ZLIB_FOUND)
-   IF (NOT ZLIB_FIND_QUIETLY)
-      MESSAGE(STATUS "Found Z: ${ZLIB_LIBRARY}")
-   ENDIF (NOT ZLIB_FIND_QUIETLY)
-ELSE (ZLIB_FOUND)
-   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")
-   ENDIF (ZLIB_FIND_REQUIRED)
-ENDIF (ZLIB_FOUND)
-
-MARK_AS_ADVANCED(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
+
+find_library(ZLIB_LIBRARY NAMES ${POTENTIAL_Z_LIBS}
+       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)
+endif()
+
+if(ZLIB_FOUND)
+   if(NOT ZLIB_FIND_QUIETLY)
+      message(STATUS "Found Z: ${ZLIB_LIBRARY}")
+   endif()
+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, set GNUWIN32_DIR to dir containing /include and /bin folders: -DGNUWIN32_DIR=...")
+   endif()
+endif()
+
+mark_as_advanced(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)