summaryrefslogtreecommitdiffstats
path: root/Modules/FindZLIB.cmake
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2011-01-19 19:28:29 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2011-01-19 19:28:29 (GMT)
commit863c7dfd881148da8a8ef6b24a5fee23ae8b3b8b (patch)
tree739830b6696c91f2d7a0b5fada5d21b8d0f05dae /Modules/FindZLIB.cmake
parentd9fb64088b8bbf2ab0ac8f6e50cd6188affeef8a (diff)
parent30e19b79ddb00932097ec6f5b54478a0b9b33b38 (diff)
downloadCMake-863c7dfd881148da8a8ef6b24a5fee23ae8b3b8b.zip
CMake-863c7dfd881148da8a8ef6b24a5fee23ae8b3b8b.tar.gz
CMake-863c7dfd881148da8a8ef6b24a5fee23ae8b3b8b.tar.bz2
Merge topic 'fix-find-png-zlib'
30e19b7 Add new names for PNG and ZLIB libraries
Diffstat (limited to 'Modules/FindZLIB.cmake')
-rw-r--r--Modules/FindZLIB.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindZLIB.cmake b/Modules/FindZLIB.cmake
index 1ac6c2c..3de5829 100644
--- a/Modules/FindZLIB.cmake
+++ b/Modules/FindZLIB.cmake
@@ -35,7 +35,7 @@ FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]/include"
)
-SET(ZLIB_NAMES z zlib zdll)
+SET(ZLIB_NAMES z zlib zdll zlib1 zlibd zlibd1)
FIND_LIBRARY(ZLIB_LIBRARY
NAMES
${ZLIB_NAMES}