[Cmake-commits] [cmake-commits] malaterre committed FindZLIB.cmake 1.12 1.13

[cmake-commits at cmake.org]

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

Modified Files:
	FindZLIB.cmake 
Log Message:
STYLE: respect convention (while being backward compat)


Index: FindZLIB.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindZLIB.cmake,v
retrieving revision 1.12
retrieving revision 1.13
diff -C 2 -d -r1.12 -r1.13
*** FindZLIB.cmake	28 Sep 2009 15:45:50 -0000	1.12
--- FindZLIB.cmake	30 Oct 2009 16:17:25 -0000	1.13
***************
*** 2,8 ****
  # Find the native ZLIB includes and library
  #
! #  ZLIB_INCLUDE_DIR - where to find zlib.h, etc.
! #  ZLIB_LIBRARIES   - List of libraries when using zlib.
! #  ZLIB_FOUND       - True if zlib found.
  
  #=============================================================================
--- 2,8 ----
  # Find the native ZLIB includes and library
  #
! #  ZLIB_INCLUDE_DIRS - where to find zlib.h, etc.
! #  ZLIB_LIBRARIES    - List of libraries when using zlib.
! #  ZLIB_FOUND        - True if zlib found.
  
  #=============================================================================
***************
*** 28,42 ****
  SET(ZLIB_NAMES z zlib zdll)
  FIND_LIBRARY(ZLIB_LIBRARY NAMES ${ZLIB_NAMES} )
  
  # handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if 
  # all listed variables are TRUE
  INCLUDE(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB DEFAULT_MSG ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
! 
! IF(ZLIB_FOUND)
!   SET( ZLIB_LIBRARIES ${ZLIB_LIBRARY} )
! ELSE(ZLIB_FOUND)
!   SET( ZLIB_LIBRARIES )
! ENDIF(ZLIB_FOUND)
  
- MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
--- 28,40 ----
  SET(ZLIB_NAMES z zlib zdll)
  FIND_LIBRARY(ZLIB_LIBRARY NAMES ${ZLIB_NAMES} )
+ MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
+ 
+ # Per-recommendation
+ SET(ZLIB_INCLUDE_DIRS "${ZLIB_INCLUDE_DIR}")
+ SET(ZLIB_LIBRARIES    "${ZLIB_LIBRARY}")
  
  # handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if 
  # all listed variables are TRUE
  INCLUDE(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB DEFAULT_MSG ZLIB_LIBRARIES ZLIB_INCLUDE_DIRS)