summaryrefslogtreecommitdiffstats
path: root/Modules/FindPNG.cmake
diff options
context:
space:
mode:
authorAlex Neundorf <neundorf@kde.org>2011-11-18 18:20:07 (GMT)
committerAlex Neundorf <neundorf@kde.org>2011-11-18 18:20:07 (GMT)
commitdf0f302485c6f93a473e1958830b69b9c165b01a (patch)
treed8c31af1ae6b6e07f98213e65e4729d53e5a0f18 /Modules/FindPNG.cmake
parent8e1bbee4d948025dfb1888e0a8b0365d7bd360c8 (diff)
downloadCMake-df0f302485c6f93a473e1958830b69b9c165b01a.zip
CMake-df0f302485c6f93a473e1958830b69b9c165b01a.tar.gz
CMake-df0f302485c6f93a473e1958830b69b9c165b01a.tar.bz2
FindPNG: provide PNG_INCLUDE_DIRS, as the readme.txt says (#11312)
Also improve the documentation a bit. Alex
Diffstat (limited to 'Modules/FindPNG.cmake')
-rw-r--r--Modules/FindPNG.cmake17
1 files changed, 11 insertions, 6 deletions
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)