[Cmake-commits] CMake branch, next, updated. v2.8.2-354-g21390d9

[Kovarththanan Rajaratnam]

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  21390d9bdd181fca7faee159116f1da21901ce5b (commit)
       via  5f183caa7c4aaa49cf352df9e6d2db5ab10c9f11 (commit)
       via  a42a44a5acd694fbf5a278758723bf7c96ce9ea3 (commit)
      from  080e054007465ab8817f6c1f574c37aa34e1e25f (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=21390d9bdd181fca7faee159116f1da21901ce5b
commit 21390d9bdd181fca7faee159116f1da21901ce5b
Merge: 080e054 5f183ca
Author:     Kovarththanan Rajaratnam <kovarththanan.rajaratnam at gmail.com>
AuthorDate: Wed Aug 4 08:19:57 2010 +0200
Commit:     Kovarththanan Rajaratnam <kovarththanan.rajaratnam at gmail.com>
CommitDate: Wed Aug 4 08:19:57 2010 +0200

    Merge branch 'findzlib_use_fphsa' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f183caa7c4aaa49cf352df9e6d2db5ab10c9f11
commit 5f183caa7c4aaa49cf352df9e6d2db5ab10c9f11
Author:     Kovarththanan Rajaratnam <kovarththanan.rajaratnam at gmail.com>
AuthorDate: Wed Aug 4 08:18:05 2010 +0200
Commit:     Kovarththanan Rajaratnam <kovarththanan.rajaratnam at gmail.com>
CommitDate: Wed Aug 4 08:18:05 2010 +0200

    FindZLIB: use the FPHSA version mode
    
    Remove our implementation of version checking and instead use FPHSA()

diff --git a/Modules/FindZLIB.cmake b/Modules/FindZLIB.cmake
index fa991f1..3891be4 100644
--- a/Modules/FindZLIB.cmake
+++ b/Modules/FindZLIB.cmake
@@ -62,21 +62,8 @@ ENDIF()
 # 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_INCLUDE_DIR ZLIB_LIBRARY)
-
-# handle the VERSION provided in find_package() command
-if(ZLIB_FIND_VERSION)
-    if(ZLIB_FIND_VERSION_EXACT AND NOT ${ZLIB_VERSION_STRING} VERSION_EQUAL ${ZLIB_FIND_VERSION})
-        message(FATAL_ERROR "ZLIB version found (${ZLIB_VERSION_STRING}) does not match the required one (${ZLIB_FIND_VERSION}), aborting.")
-    elseif(${ZLIB_VERSION_STRING} VERSION_LESS ${ZLIB_FIND_VERSION})
-        if(ZLIB_FIND_REQUIRED)
-            message(FATAL_ERROR "ZLIB version found (${ZLIB_VERSION_STRING}) is less then the minimum required (${ZLIB_FIND_VERSION}), aborting.")
-        else(ZLIB_FIND_REQUIRED)
-            message("ZLIB version found (${ZLIB_VERSION_STRING}) is less then the minimum required (${ZLIB_FIND_VERSION}), continue without ZLIB support.")
-            set(ZLIB_FOUND FALSE)
-        endif(ZLIB_FIND_REQUIRED)
-    endif()
-endif(ZLIB_FIND_VERSION)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB REQUIRED_VARS ZLIB_INCLUDE_DIR ZLIB_LIBRARY
+                                       VERSION_VAR ZLIB_VERSION_STRING)
 
 IF(ZLIB_FOUND)
     SET(ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR})

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

Summary of changes:
 Modules/FindZLIB.cmake            |   17 ++---------------
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 2 files changed, 3 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
CMake