diff options
| author | Brad King <brad.king@kitware.com> | 2013-07-16 17:59:27 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-07-16 17:59:27 (GMT) |
| commit | 567440ce36c2a91d80f507e0cf431b7c8805d77b (patch) | |
| tree | dcf28c3d3e5e7e27b4cc55e0e927b5205ca0bcc5 | |
| parent | 9c119b829dc0189c1ba5c4ae928b671340c7a085 (diff) | |
| parent | 96fa4a2e43024eb81b9f37ba33432c14db4264c0 (diff) | |
| download | CMake-567440ce36c2a91d80f507e0cf431b7c8805d77b.zip CMake-567440ce36c2a91d80f507e0cf431b7c8805d77b.tar.gz CMake-567440ce36c2a91d80f507e0cf431b7c8805d77b.tar.bz2 | |
Merge topic 'FindPNG-1.6'
96fa4a2 FindPNG: Add versioned library names for 1.6 (#14289)
| -rw-r--r-- | Modules/FindPNG.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/FindPNG.cmake b/Modules/FindPNG.cmake index d96d2cc..fef4669 100644 --- a/Modules/FindPNG.cmake +++ b/Modules/FindPNG.cmake @@ -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) |