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 e422c4d27a302cd2a0b535112584a8000733fadd (commit) via 72c731fd406aa70f353b12d2688e54e90dd3e98f (commit) via ec4e4ce6956f5dd8b65d1cab900109f62217da5a (commit) from ad06fe1175ae0e9f45290411fd5069c5dc96a819 (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=e422c4d27a302cd2a0b535112584a8000733fadd commit e422c4d27a302cd2a0b535112584a8000733fadd Merge: ad06fe1 72c731f Author: Andreas Schneider <a...@cryptomilk.org> AuthorDate: Fri Aug 5 10:27:28 2011 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Aug 5 10:27:28 2011 -0400 Merge topic 'asn_zlib_fixes' into next 72c731f Modules: Improve ZLIB module. ec4e4ce KWSys Nightly Date Stamp http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=72c731fd406aa70f353b12d2688e54e90dd3e98f commit 72c731fd406aa70f353b12d2688e54e90dd3e98f Author: Andreas Schneider <a...@cryptomilk.org> AuthorDate: Fri Aug 5 16:20:35 2011 +0200 Commit: Andreas Schneider <a...@cryptomilk.org> CommitDate: Fri Aug 5 16:20:35 2011 +0200 Modules: Improve ZLIB module. This adds a ZLIB_ROOT_DIR variable and adds default windows paths. diff --git a/Modules/FindZLIB.cmake b/Modules/FindZLIB.cmake index 77f9fda..c5637fb 100644 --- a/Modules/FindZLIB.cmake +++ b/Modules/FindZLIB.cmake @@ -20,6 +20,7 @@ #============================================================================= # Copyright 2001-2009 Kitware, Inc. +# Copyright 2011 Andreas Schneider <a...@cryptomilk.org> # # Distributed under the OSI-approved BSD License (the "License"); # see accompanying file Copyright.txt for details. @@ -31,18 +32,46 @@ # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) -FIND_PATH(ZLIB_INCLUDE_DIR zlib.h +SET(_ZLIB_ROOT_HINTS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]/include" ) +SET(_ZLIB_ROOT_PATHS + "$ENV{PROGRAMFILES}/zlib" +) + +SET(_ZLIB_ROOT_HINTS_AND_PATHS + HINTS ${_OPENSSL_ROOT_HINTS} + PATHS ${_OPENSSL_ROOT_PATHS} +) + +FIND_PATH(ZLIB_ROOT_DIR + NAMES + include/zlib.h + HINTS + ${_ZLIB_ROOT_HINTS} + PATHS + ${_ZLIB_ROOT_PATHS} +) +MARK_AS_ADVANCED(ZLIB_ROOT_DIR) + +FIND_PATH(ZLIB_INCLUDE_DIR + NAMES + zlib.h + HINTS + ${_ZLIB_ROOT_HINTS_AND_PATHS} + PATH_SUFFIXES + include +) + SET(ZLIB_NAMES z zlib zdll zlib1 zlibd zlibd1) FIND_LIBRARY(ZLIB_LIBRARY NAMES ${ZLIB_NAMES} PATHS - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]/lib" + ${ZLIB_ROOT_DIR}/lib ) -MARK_AS_ADVANCED(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) +MARK_AS_ADVANCED(ZLIB_LIBRARY) IF(ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_INCLUDE_DIR}/zlib.h") FILE(STRINGS "${ZLIB_INCLUDE_DIR}/zlib.h" ZLIB_H REGEX "^#define ZLIB_VERSION \"[^\"]*\"$") ----------------------------------------------------------------------- Summary of changes: Modules/FindZLIB.cmake | 35 ++++++++++++++++++++++++++++++++--- Source/kwsys/kwsysDateStamp.cmake | 2 +- 2 files changed, 33 insertions(+), 4 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits