[Cmake-commits] CMake branch, next, updated. v2.8.5-1797-gb2c81e9

[David Cole]

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  b2c81e96786d0ece8ce67d6884efc3314ec5d0ce (commit)
       via  e7f53ccbcf26c336c7935c3317cdd8167faac90e (commit)
      from  461a75f813c220948beb9b8ff2f5aa9b8509dabd (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=b2c81e96786d0ece8ce67d6884efc3314ec5d0ce
commit b2c81e96786d0ece8ce67d6884efc3314ec5d0ce
Merge: 461a75f e7f53cc
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Sep 2 09:52:43 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 2 09:52:43 2011 -0400

    Merge topic 'fix-asn_zlib_fixes' into next
    
    e7f53cc Modules: Fix typo in FindZLIB.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e7f53ccbcf26c336c7935c3317cdd8167faac90e
commit e7f53ccbcf26c336c7935c3317cdd8167faac90e
Author:     Andreas Schneider <asn at cryptomilk.org>
AuthorDate: Fri Sep 2 14:14:15 2011 +0200
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Sep 2 09:49:59 2011 -0400

    Modules: Fix typo in FindZLIB.

diff --git a/Modules/FindZLIB.cmake b/Modules/FindZLIB.cmake
index c5637fb..26344ac 100644
--- a/Modules/FindZLIB.cmake
+++ b/Modules/FindZLIB.cmake
@@ -41,8 +41,8 @@ SET(_ZLIB_ROOT_PATHS
 )
 
 SET(_ZLIB_ROOT_HINTS_AND_PATHS
-    HINTS ${_OPENSSL_ROOT_HINTS}
-    PATHS ${_OPENSSL_ROOT_PATHS}
+    HINTS ${_ZLIB_ROOT_HINTS}
+    PATHS ${_ZLIB_ROOT_PATHS}
 )
 
 FIND_PATH(ZLIB_ROOT_DIR

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

Summary of changes:
 Modules/FindZLIB.cmake |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake