diff options
| author | David Cole <david.cole@kitware.com> | 2011-01-14 17:28:10 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2011-01-14 17:28:10 (GMT) |
| commit | 30e19b79ddb00932097ec6f5b54478a0b9b33b38 (patch) | |
| tree | 8bf0d25d329b22795d479689daa14e7a1b1b5277 | |
| parent | 3a7230afe94ccec600100e2c7ea6106b4e078b08 (diff) | |
| download | CMake-30e19b79ddb00932097ec6f5b54478a0b9b33b38.zip CMake-30e19b79ddb00932097ec6f5b54478a0b9b33b38.tar.gz CMake-30e19b79ddb00932097ec6f5b54478a0b9b33b38.tar.bz2 | |
Add new names for PNG and ZLIB libraries
Thanks to Pau Garcia i Quiles for the patch on the CMake
mailing list.
| -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} |