X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2Fmodules%2FFindZLIB.cmake;h=9821a6d92d9c60f53bf07b1dbf39d6230bcffd43;hb=6040a5faf6e6ca8fb88315984a6f3c09c8fcef80;hp=4ebf5fa49e56c027a4ab8d2b7c99106c77468fe2;hpb=7c00f14cc1297317273c28f481e304690c616848;p=lyx.git

diff --git a/development/cmake/modules/FindZLIB.cmake b/development/cmake/modules/FindZLIB.cmake
old mode 100755
new mode 100644
index 4ebf5fa49e..9821a6d92d
--- a/development/cmake/modules/FindZLIB.cmake
+++ b/development/cmake/modules/FindZLIB.cmake
@@ -1,34 +1,38 @@
-if (ZLIB_INCLUDE_DIR)
-  # Already in cache, be silent
-  set(ZLIB_FIND_QUIETLY TRUE)
-endif (ZLIB_INCLUDE_DIR)
-
-FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
- /usr/include
- /usr/local/include
-)
-
-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)
+#
+#  based on cmake file
+#
+if (ZLIB_INCLUDE_DIR)
+  # Already in cache, be silent
+  set(ZLIB_FIND_QUIETLY TRUE)
+endif()
+
+FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
+ /usr/include
+ /usr/local/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
+)
+
+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")
+   endif()
+endif()
+
+MARK_AS_ADVANCED(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)