[Cmake-commits] CMake branch, next, updated. v2.8.3-1357-gbed4cc4

[David Cole]

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  bed4cc4b0372d2f0b572f78ad447cd6124cfe9ee (commit)
       via  30e19b79ddb00932097ec6f5b54478a0b9b33b38 (commit)
      from  a612959338b8c67f8aab903bf77432713aab1bf3 (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=bed4cc4b0372d2f0b572f78ad447cd6124cfe9ee
commit bed4cc4b0372d2f0b572f78ad447cd6124cfe9ee
Merge: a612959 30e19b7
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Jan 14 12:31:09 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 14 12:31:09 2011 -0500

    Merge topic 'fix-find-png-zlib' into next
    
    30e19b7 Add new names for PNG and ZLIB libraries


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30e19b79ddb00932097ec6f5b54478a0b9b33b38
commit 30e19b79ddb00932097ec6f5b54478a0b9b33b38
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Jan 14 12:28:10 2011 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Jan 14 12:28:10 2011 -0500

    Add new names for PNG and ZLIB libraries
    
    Thanks to Pau Garcia i Quiles for the patch on the CMake
    mailing list.

diff --git a/Modules/FindPNG.cmake b/Modules/FindPNG.cmake
index 4fb218b..6d5dd98 100644
--- a/Modules/FindPNG.cmake
+++ b/Modules/FindPNG.cmake
@@ -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)
diff --git a/Modules/FindZLIB.cmake b/Modules/FindZLIB.cmake
index 1ac6c2c..3de5829 100644
--- a/Modules/FindZLIB.cmake
+++ b/Modules/FindZLIB.cmake
@@ -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}

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

Summary of changes:
 Modules/FindPNG.cmake  |    2 +-
 Modules/FindZLIB.cmake |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake