diff options
author | Brad King <brad.king@kitware.com> | 2019-07-16 11:23:44 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2019-07-16 11:24:14 (GMT) |
commit | 79a21ba6804ea501365386ee2616441c9660f3ed (patch) | |
tree | 0d089273ff99d95d4bc4bb2526fc412eb617f622 | |
parent | e0d45ddab55ac73bad80a95bdd80df711c0255d8 (diff) | |
parent | 95f8b0aec750031ddecccea46012257528feb518 (diff) | |
download | CMake-79a21ba6804ea501365386ee2616441c9660f3ed.zip CMake-79a21ba6804ea501365386ee2616441c9660f3ed.tar.gz CMake-79a21ba6804ea501365386ee2616441c9660f3ed.tar.bz2 |
Merge topic 'FindPNG-msvc-static'
95f8b0aec7 FindPNG: Add static libpng names for MSVC
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3552
-rw-r--r-- | Modules/FindPNG.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindPNG.cmake b/Modules/FindPNG.cmake index a7908c5..bd400c7 100644 --- a/Modules/FindPNG.cmake +++ b/Modules/FindPNG.cmake @@ -69,8 +69,8 @@ if(ZLIB_FOUND) unset(_PNG_VERSION_SUFFIX_MIN) endif () foreach(v IN LISTS _PNG_VERSION_SUFFIXES) - list(APPEND PNG_NAMES png${v} libpng${v}) - list(APPEND PNG_NAMES_DEBUG png${v}d libpng${v}d) + list(APPEND PNG_NAMES png${v} libpng${v} libpng${v}_static) + list(APPEND PNG_NAMES_DEBUG png${v}d libpng${v}d libpng${v}_staticd) endforeach() unset(_PNG_VERSION_SUFFIXES) # For compatibility with versions prior to this multi-config search, honor |