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

diff --git a/development/cmake/modules/FindZLIB.cmake b/development/cmake/modules/FindZLIB.cmake
index 8eef79d904..9821a6d92d 100644
--- a/development/cmake/modules/FindZLIB.cmake
+++ b/development/cmake/modules/FindZLIB.cmake
@@ -1,7 +1,10 @@
+#
+#  based on cmake file
+#
 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
@@ -11,24 +14,25 @@ FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
 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)
+   set(ZLIB_FOUND TRUE)
+endif()
 
 IF (ZLIB_FOUND)
    IF (NOT ZLIB_FIND_QUIETLY)
-      MESSAGE(STATUS "Found Z: ${ZLIB_LIBRARY}")
-   ENDIF (NOT ZLIB_FIND_QUIETLY)
-ELSE (ZLIB_FOUND)
+      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 (ZLIB_FIND_REQUIRED)
-ENDIF (ZLIB_FOUND)
+      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)