[Cmake-commits] [cmake-commits] martink committed FindPNG.cmake 1.18 1.19

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Jul 21 12:45:40 EDT 2009


Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv16862

Modified Files:
	FindPNG.cmake 
Log Message:
ENH: just converted case to lower for the book


Index: FindPNG.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPNG.cmake,v
retrieving revision 1.18
retrieving revision 1.19
diff -C 2 -d -r1.18 -r1.19
*** FindPNG.cmake	16 Aug 2008 11:10:09 -0000	1.18
--- FindPNG.cmake	21 Jul 2009 16:45:37 -0000	1.19
***************
*** 4,8 ****
  #  PNG_INCLUDE_DIR, 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
--- 4,8 ----
  #  PNG_INCLUDE_DIR, 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
***************
*** 10,44 ****
  # None of the above will be defined unles zlib can be found.
  # PNG depends on Zlib
! INCLUDE(FindZLIB)
  
! IF(ZLIB_FOUND)
!   FIND_PATH(PNG_PNG_INCLUDE_DIR png.h
    /usr/local/include/libpng             # OpenBSD
    )
  
!   SET(PNG_NAMES ${PNG_NAMES} png libpng png12 libpng12)
!   FIND_LIBRARY(PNG_LIBRARY NAMES ${PNG_NAMES} )
  
!   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_LIBRARIES ${PNG_LIBRARY} ${ZLIB_LIBRARY})
  
!       IF (CYGWIN)
!         IF(BUILD_SHARED_LIBS)
             # No need to define PNG_USE_DLL here, because it's default for Cygwin.
!         ELSE(BUILD_SHARED_LIBS)
            SET (PNG_DEFINITIONS -DPNG_STATIC)
!         ENDIF(BUILD_SHARED_LIBS)
!       ENDIF (CYGWIN)
  
!   ENDIF (PNG_LIBRARY AND PNG_PNG_INCLUDE_DIR)
  
! ENDIF(ZLIB_FOUND)
  
! # handle the QUIETLY and REQUIRED arguments and set PNG_FOUND to TRUE if 
  # all listed variables are TRUE
! INCLUDE(FindPackageHandleStandardArgs)
  FIND_PACKAGE_HANDLE_STANDARD_ARGS(PNG DEFAULT_MSG PNG_LIBRARY PNG_PNG_INCLUDE_DIR)
  
! MARK_AS_ADVANCED(PNG_PNG_INCLUDE_DIR PNG_LIBRARY )
--- 10,44 ----
  # None of the above will be defined unles zlib can be found.
  # PNG depends on Zlib
! include(FindZLIB)
  
! if(ZLIB_FOUND)
!   find_path(PNG_PNG_INCLUDE_DIR png.h
    /usr/local/include/libpng             # OpenBSD
    )
  
!   set(PNG_NAMES ${PNG_NAMES} png libpng png12 libpng12)
!   find_library(PNG_LIBRARY NAMES ${PNG_NAMES} )
  
!   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_LIBRARIES ${PNG_LIBRARY} ${ZLIB_LIBRARY})
  
!       if (CYGWIN)
!         if(BUILD_SHARED_LIBS)
             # No need to define PNG_USE_DLL here, because it's default for Cygwin.
!         else(BUILD_SHARED_LIBS)
            SET (PNG_DEFINITIONS -DPNG_STATIC)
!         endif(BUILD_SHARED_LIBS)
!       endif (CYGWIN)
  
!   endif (PNG_LIBRARY AND PNG_PNG_INCLUDE_DIR)
  
! endif(ZLIB_FOUND)
  
! # handle the QUIETLY and REQUIRED arguments and set PNG_FOUND to TRUE if
  # all listed variables are TRUE
! include(FindPackageHandleStandardArgs)
  FIND_PACKAGE_HANDLE_STANDARD_ARGS(PNG DEFAULT_MSG PNG_LIBRARY PNG_PNG_INCLUDE_DIR)
  
! mark_as_advanced(PNG_PNG_INCLUDE_DIR PNG_LIBRARY )



More information about the Cmake-commits mailing list