diff options
| author | Brad King <brad.king@kitware.com> | 2011-01-19 19:28:29 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-01-19 19:28:29 (GMT) |
| commit | 863c7dfd881148da8a8ef6b24a5fee23ae8b3b8b (patch) | |
| tree | 739830b6696c91f2d7a0b5fada5d21b8d0f05dae /Modules | |
| parent | d9fb64088b8bbf2ab0ac8f6e50cd6188affeef8a (diff) | |
| parent | 30e19b79ddb00932097ec6f5b54478a0b9b33b38 (diff) | |
| download | CMake-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')
| -rw-r--r-- | Modules/FindPNG.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindZLIB.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindPNG.cmake b/Modules/FindPNG.cmake index 4fb218b..6d5dd98 100644 --- a/Modules/FindPNG.cmake +++ b/Modules/FindPNG.cmake @@ -33,7 +33,7 @@ if(ZLIB_FOUND) /usr/local/include/libpng # OpenBSD ) - set(PNG_NAMES ${PNG_NAMES} png libpng png14 libpng14 png14d libpng14d png12 libpng12 png12d libpng12d) + set(PNG_NAMES ${PNG_NAMES} png libpng png15 libpng15 png15d libpng15d png14 libpng14 png14d libpng14d png12 libpng12 png12d libpng12d) find_library(PNG_LIBRARY NAMES ${PNG_NAMES} ) if (PNG_LIBRARY AND PNG_PNG_INCLUDE_DIR) 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} |