[Cmake-commits] CMake branch, next, updated. v2.8.6-1949-g75b9d46

[Alexander Neundorf]

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  75b9d46db36db77a3ff58dcaeaad08de78091e84 (commit)
       via  df0f302485c6f93a473e1958830b69b9c165b01a (commit)
      from  baf2b0f91863f8831fdea6ac4430088f680b31a8 (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=75b9d46db36db77a3ff58dcaeaad08de78091e84
commit 75b9d46db36db77a3ff58dcaeaad08de78091e84
Merge: baf2b0f df0f302
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Fri Nov 18 13:24:14 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 18 13:24:14 2011 -0500

    Merge topic 'FindPNG_Provide_PNG_INCLUDE_DIRS_Variable' into next
    
    df0f302 FindPNG: provide PNG_INCLUDE_DIRS, as the readme.txt says (#11312)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df0f302485c6f93a473e1958830b69b9c165b01a
commit df0f302485c6f93a473e1958830b69b9c165b01a
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Fri Nov 18 19:20:07 2011 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Fri Nov 18 19:20:07 2011 +0100

    FindPNG: provide PNG_INCLUDE_DIRS, as the readme.txt says (#11312)
    
    Also improve the documentation a bit.
    
    Alex

diff --git a/Modules/FindPNG.cmake b/Modules/FindPNG.cmake
index f607dc6..f616973 100644
--- a/Modules/FindPNG.cmake
+++ b/Modules/FindPNG.cmake
@@ -1,14 +1,18 @@
 # - Find the native PNG includes and library
 #
-# This module defines
-#  PNG_INCLUDE_DIR, where to find png.h, etc.
+# This module searches libpng, the library for working with PNG images.
+#
+# It defines the following variables
+#  PNG_INCLUDE_DIRS, where to find png.h, etc.
 #  PNG_LIBRARIES, the libraries to link against to use PNG.
 #  PNG_DEFINITIONS - You should add_definitons(${PNG_DEFINITIONS}) before compiling code that includes png library files.
 #  PNG_FOUND, If false, do not try to use PNG.
-# also defined, but not for general use are
+# Also defined, but not for general use are
 #  PNG_LIBRARY, where to find the PNG library.
-# None of the above will be defined unles zlib can be found.
-# PNG depends on Zlib
+# For backward compatiblity the variable PNG_INCLUDE_DIR is also set. It has the same value as PNG_INCLUDE_DIRS.
+#
+# Since PNG depends on the ZLib compression library, none of the above will be
+# defined unless ZLib can be found.
 
 #=============================================================================
 # Copyright 2002-2009 Kitware, Inc.
@@ -38,7 +42,8 @@ if(ZLIB_FOUND)
 
   if (PNG_LIBRARY AND PNG_PNG_INCLUDE_DIR)
       # png.h includes zlib.h. Sigh.
-      SET(PNG_INCLUDE_DIR ${PNG_PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
+      SET(PNG_INCLUDE_DIRS ${PNG_PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
+      SET(PNG_INCLUDE_DIR ${PNG_INCLUDE_DIRS} ) # for backward compatiblity
       SET(PNG_LIBRARIES ${PNG_LIBRARY} ${ZLIB_LIBRARY})
 
       if (CYGWIN)

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

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


hooks/post-receive
-- 
CMake