kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'FindPNG-1.6' 

96fa4a2 FindPNG: Add versioned library names for 1.6 (#14289)
This commit is contained in:
Brad King 2013-07-16 13:59:27 -04:00 committed by CMake Topic Stage
parent 9c119b829d 96fa4a2e43
commit 567440ce36
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/FindPNG.cmake
View File

@ -38,7 +38,10 @@ if(ZLIB_FOUND)
/usr/local/include/libpng # OpenBSD
)
set(PNG_NAMES ${PNG_NAMES} png libpng png15 libpng15 png15d libpng15d png14 libpng14 png14d libpng14d png12 libpng12 png12d libpng12d)
list(APPEND PNG_NAMES png libpng)
foreach(v 16 15 14 12)
list(APPEND PNG_NAMES png${v} libpng${v} png${v}d libpng${v}d)
endforeach()
find_library(PNG_LIBRARY NAMES ${PNG_NAMES} )
if (PNG_LIBRARY AND PNG_PNG_INCLUDE_DIR)