mirror of
https://gitlab.kitware.com/cmake/cmake.git
synced 2026-10-04 04:03:22 +03:00
Add new names for PNG and ZLIB libraries
Thanks to Pau Garcia i Quiles for the patch on the CMake mailing list.
This commit is contained in:
1 parent
3a7230afe9
commit
30e19b79dd
2 files changed
+2
-2
No files matched your search
@@ -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)
|
||||
|
||||
@@ -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}
|
||||
|
||||
Reference in new issue
Block a user