[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3118-g0971efa

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  0971efa6496d6ccaad07134ee6d27bb14b2a90a1 (commit)
       via  96fa4a2e43024eb81b9f37ba33432c14db4264c0 (commit)
      from  16eae14adce69876ce549b9d0695dccbe70e55f7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0971efa6496d6ccaad07134ee6d27bb14b2a90a1
commit 0971efa6496d6ccaad07134ee6d27bb14b2a90a1
Merge: 16eae14 96fa4a2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 15 09:57:18 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 15 09:57:18 2013 -0400

    Merge topic 'FindPNG-1.6' into next
    
    96fa4a2 FindPNG: Add versioned library names for 1.6 (#14289)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96fa4a2e43024eb81b9f37ba33432c14db4264c0
commit 96fa4a2e43024eb81b9f37ba33432c14db4264c0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 15 09:51:50 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 15 09:52:53 2013 -0400

    FindPNG: Add versioned library names for 1.6 (#14289)
    
    While at it, refactor the versioned library name list generation to
    reduce duplication.

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)

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindPNG.cmake |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake