X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2Fmodules%2FFindZLIB.cmake;h=a46a936ceb8ef7d07e42eac54df61a9781000030;hb=2a0ae2e7392cd80b633bdaf70ef6824725c38c22;hp=251e9a214ac4f0820a3f3a3a8ec7bfcd050f09be;hpb=f2e437f6b823574170f0bafd8738dcb3c72b5e14;p=lyx.git

diff --git a/development/cmake/modules/FindZLIB.cmake b/development/cmake/modules/FindZLIB.cmake
index 251e9a214a..a46a936ceb 100644
--- a/development/cmake/modules/FindZLIB.cmake
+++ b/development/cmake/modules/FindZLIB.cmake
@@ -9,10 +9,12 @@ if (ZLIB_INCLUDE_DIR)
   set(ZLIB_FIND_QUIETLY TRUE)
 endif()
 
-find_path(ZLIB_INCLUDE_DIR zlib.h PATHS
- /usr/include
- /usr/local/include
- "${GNUWIN32_DIR}"/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)
@@ -25,11 +27,15 @@ find_library(ZLIB_LIBRARY NAMES ${POTENTIAL_Z_LIBS}
 	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 
-	"C:\\Programme\\Microsoft Visual Studio 8\\VC\\lib"
-	${SYSTEM_LIB_DIRS}
-	"${GNUWIN32_DIR}"/lib)
+	PATHS ${zlibsearch})
 
 if(ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY)
    set(ZLIB_FOUND TRUE)