Cmake build: Add combo-values to the list of displayed lyx options

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

diff --git a/development/cmake/modules/FindZLIB.cmake b/development/cmake/modules/FindZLIB.cmake
index 9534d5ec95ef24826bc06074a85494da6565bad4..a46a936ceb8ef7d07e42eac54df61a9781000030 100644 (file)
--- a/development/cmake/modules/FindZLIB.cmake
+++ b/development/cmake/modules/FindZLIB.cmake
@@ -1,37 +1,56 @@
 #
 #  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
- /usr/include
- /usr/local/include
-)
+set(zlibsearch "/usr/include" "/usr/local/include")
+if (GNUWIN32_DIR)
+  list(APPEND zlibsearch "${GNUWIN32_DIR}/include")
+endif()
 
+find_path(ZLIB_INCLUDE_DIR zlib.h PATHS ${zlibsearch})
+
+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
- /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)
+       
+
+set(zlibsearch "C:\\Programme\\Microsoft Visual Studio 8\\VC\\lib")
+if(SYSTEM_LIB_DIRS)
+  list(APPEND zlibsearch ${SYSTEM_LIB_DIRS})
+endif()
+if(GNUWIN32_DIR)
+  list(APPEND zlibsearch "${GNUWIN32_DIR}/lib")
+endif()
+find_library(ZLIB_LIBRARY NAMES ${POTENTIAL_Z_LIBS}
+       PATHS ${zlibsearch})
+
+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)