[Cmake-commits] CMake branch, next, updated. v2.8.1-1383-g1ef2dc0

[Bill Hoffman]

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  1ef2dc01af9212c955ae3b15d642073598091573 (commit)
       via  c74556bdfc9cf657619583a9e070aaea65a0b525 (commit)
       via  b9e3c243d476efa04479d253cfc4f76ecbdb6fe3 (commit)
      from  5524d73287289456a37aa4fdb6e97bb9a041d9c3 (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=1ef2dc01af9212c955ae3b15d642073598091573
commit 1ef2dc01af9212c955ae3b15d642073598091573
Merge: 5524d73 c74556b
Author: Bill Hoffman <bill.hoffman at kitware.com>
Date:   Fri Jun 11 13:49:16 2010 -0400

    Merge branch 'make_libarchive_use_cmzlib' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c74556bdfc9cf657619583a9e070aaea65a0b525
commit c74556bdfc9cf657619583a9e070aaea65a0b525
Author: Bill Hoffman <bill.hoffman at kitware.com>
Date:   Fri Jun 11 13:48:23 2010 -0400

    Make sure libarchive uses cmzlib and not the system libz if found.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69b45a4..ff31dd0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -271,6 +271,7 @@ MACRO (CMAKE_BUILD_UTILITIES)
     SET(HAVE_ZLIB_H 1)
     SET(ZLIB_INCLUDE_DIR ${CMAKE_ZLIB_INCLUDES})
     SET(ZLIB_LIBRARIES ${CMAKE_ZLIB_LIBRARIES})
+    SET(ZLIB_LIBRARY ${CMAKE_ZLIB_LIBRARIES})
     SET(BUILD_ARCHIVE_WITHIN_CMAKE TRUE)
     ADD_DEFINITIONS(-DLIBARCHIVE_STATIC)
     ADD_SUBDIRECTORY(Utilities/cmlibarchive)

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

Summary of changes:
 CMakeLists.txt              |    1 +
 Source/kwsys/ProcessUNIX.c  |    8 ++++++++
 Source/kwsys/ProcessWin32.c |    8 ++++++++
 3 files changed, 17 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake