From 001efa59610d550b93d8a95324d25ae597febf28 Mon Sep 17 00:00:00 2001 From: Kovarththanan Rajaratnam Date: Sat, 10 Apr 2010 08:33:22 +0200 Subject: FindZLIB: add support for GnuWin32 (fixes #5588) --- Modules/FindZLIB.cmake | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Modules/FindZLIB.cmake b/Modules/FindZLIB.cmake index 9f3b50e..f592646 100644 --- a/Modules/FindZLIB.cmake +++ b/Modules/FindZLIB.cmake @@ -18,10 +18,17 @@ # (To distributed this file outside of CMake, substitute the full # License text for the above reference.) -FIND_PATH(ZLIB_INCLUDE_DIR zlib.h) +FIND_PATH(ZLIB_INCLUDE_DIR zlib.h + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]/include" +) SET(ZLIB_NAMES z zlib zdll) -FIND_LIBRARY(ZLIB_LIBRARY NAMES ${ZLIB_NAMES}) +FIND_LIBRARY(ZLIB_LIBRARY + NAMES + ${ZLIB_NAMES} + PATHS + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]/lib" +) MARK_AS_ADVANCED(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) # Per-recommendation -- cgit v0.12