[Cmake-commits] CMake branch, next, updated. v2.8.6-2075-g78e759f

[Brad King]

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  78e759fa4a544007c6b1ddcfab4bf48c5f1e092a (commit)
       via  c549d1d9f598a924504e885ed7f383e9d1faf274 (commit)
      from  b752048f5b03dfdd75c9a82bbdb588758937bbca (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=78e759fa4a544007c6b1ddcfab4bf48c5f1e092a
commit 78e759fa4a544007c6b1ddcfab4bf48c5f1e092a
Merge: b752048 c549d1d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 30 13:22:40 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 30 13:22:40 2011 -0500

    Merge topic 'fix-asn_zlib_fixes' into next
    
    c549d1d Revert topic 'fix-asn_zlib_fixes'


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c549d1d9f598a924504e885ed7f383e9d1faf274
commit c549d1d9f598a924504e885ed7f383e9d1faf274
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 30 13:21:17 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 30 13:21:37 2011 -0500

    Revert topic 'fix-asn_zlib_fixes'
    
    We will replace it with a topic taking a different approach.

diff --git a/Modules/FindZLIB.cmake b/Modules/FindZLIB.cmake
index 26344ac..77f9fda 100644
--- a/Modules/FindZLIB.cmake
+++ b/Modules/FindZLIB.cmake
@@ -20,7 +20,6 @@
 
 #=============================================================================
 # Copyright 2001-2009 Kitware, Inc.
-# Copyright 2011      Andreas Schneider <asn at cryptomilk.org>
 #
 # Distributed under the OSI-approved BSD License (the "License");
 # see accompanying file Copyright.txt for details.
@@ -32,46 +31,18 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-SET(_ZLIB_ROOT_HINTS
+FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
     "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]/include"
 )
 
-SET(_ZLIB_ROOT_PATHS
-    "$ENV{PROGRAMFILES}/zlib"
-)
-
-SET(_ZLIB_ROOT_HINTS_AND_PATHS
-    HINTS ${_ZLIB_ROOT_HINTS}
-    PATHS ${_ZLIB_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
-        ${ZLIB_ROOT_DIR}/lib
+        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]/lib"
 )
-MARK_AS_ADVANCED(ZLIB_LIBRARY)
+MARK_AS_ADVANCED(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
 
 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 +++--------------------------------
 1 files changed, 3 insertions(+), 32 deletions(-)


hooks/post-receive
-- 
CMake