[Cmake-commits] CMake branch, next, updated. v2.8.7-1949-gaf18e76

[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  af18e7643ed2be76678080b9e543a575bafd32fa (commit)
       via  6781a099406d7864f21ccbbf11c1995f8700b159 (commit)
      from  0da55e05a9e6aabcf806f2fb0c79465c5ffbf5e7 (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=af18e7643ed2be76678080b9e543a575bafd32fa
commit af18e7643ed2be76678080b9e543a575bafd32fa
Merge: 0da55e0 6781a09
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 3 18:38:24 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 3 18:38:24 2012 -0500

    Merge topic 'update-libarchive' into next
    
    6781a09 libarchive: Cleanup after ZLIB_WINAPI check


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6781a099406d7864f21ccbbf11c1995f8700b159
commit 6781a099406d7864f21ccbbf11c1995f8700b159
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 3 18:32:35 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 3 18:34:19 2012 -0500

    libarchive: Cleanup after ZLIB_WINAPI check
    
    Clear CMAKE_REQUIRED_(INCLUDES|LIBRARIES) so that the rest of the checks
    after this one do not try to link zlib.

diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
index 100c12f..9689b28 100644
--- a/Utilities/cmlibarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/CMakeLists.txt
@@ -174,6 +174,8 @@ IF(ZLIB_FOUND)
     CHECK_C_SOURCE_Runs(
       "#ifndef ZLIB_WINAPI\n#define ZLIB_WINAPI\n#endif\n#include <zlib.h>\nint main() {uLong f = zlibCompileFlags(); return (f&(1U<<10))?0:-1; }"
       ZLIB_WINAPI)
+    SET(CMAKE_REQUIRED_INCLUDES)
+    SET(CMAKE_REQUIRED_LIBRARIES)
   ENDIF(WIN32 AND NOT CYGWIN)
 ELSE(ZLIB_FOUND)
   MESSAGE(FATAL_ERROR "CMake requires zlib to be available to libarchive")

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

Summary of changes:
 Utilities/cmlibarchive/CMakeLists.txt |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake