[Cmake-commits] CMake branch, next, updated. v2.8.2-238-gf4b5f86

[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  f4b5f860c1911f9a410e3d4d8b303d07ae6c5037 (commit)
       via  6a24bdfc4e040af52e4aef95d5c934ecc836a8b8 (commit)
      from  d91ac8ba22ae933737e9dfb96d701b6d7c479673 (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=f4b5f860c1911f9a410e3d4d8b303d07ae6c5037
commit f4b5f860c1911f9a410e3d4d8b303d07ae6c5037
Merge: d91ac8b 6a24bdf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 13 10:48:52 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 13 10:48:52 2010 -0400

    Merge topic 'use-system-bzip2' into next
    
    6a24bdf Optionally use system bzip2 library (#10932)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a24bdfc4e040af52e4aef95d5c934ecc836a8b8
commit 6a24bdfc4e040af52e4aef95d5c934ecc836a8b8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 13 10:43:41 2010 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 13 10:43:41 2010 -0400

    Optionally use system bzip2 library (#10932)
    
    Add option CMAKE_USE_SYSTEM_BZIP2 and enable it automatically when
    CMAKE_USE_SYSTEM_LIBRARIES is on.  While we're at it, remove XMLRPC from
    the list of system library options because we no longer provide it in
    source.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d77c377..3fda8e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,6 +69,8 @@ MACRO(CMAKE_HANDLE_SYSTEM_LIBRARIES)
       CACHE BOOL "Use system-installed expat" FORCE)
     SET(CMAKE_USE_SYSTEM_ZLIB "${CMAKE_USE_SYSTEM_LIBRARIES}"
       CACHE BOOL "Use system-installed zlib" FORCE)
+    SET(CMAKE_USE_SYSTEM_BZIP2 "${CMAKE_USE_SYSTEM_LIBRARIES}"
+      CACHE BOOL "Use system-installed bzip2" FORCE)
   ENDIF(CMAKE_USE_SYSTEM_LIBRARIES_USER)
 
   # Optionally use system utility libraries.
@@ -78,9 +80,10 @@ MACRO(CMAKE_HANDLE_SYSTEM_LIBRARIES)
     ${CMAKE_USE_SYSTEM_LIBRARIES} "NOT CTEST_USE_XMLRPC" ON)
   CMAKE_DEPENDENT_OPTION(CMAKE_USE_SYSTEM_ZLIB "Use system-installed zlib"
     ${CMAKE_USE_SYSTEM_LIBRARIES} "NOT CMAKE_USE_SYSTEM_CURL" ON)
+  OPTION(CMAKE_USE_SYSTEM_BZIP2 "Use system-installed bzip2" OFF)
 
   # Mention to the user what system libraries are being used.
-  FOREACH(util CURL EXPAT XMLRPC ZLIB)
+  FOREACH(util BZIP2 CURL EXPAT ZLIB)
     IF(CMAKE_USE_SYSTEM_${util})
       MESSAGE(STATUS "Using system-installed ${util}")
     ENDIF(CMAKE_USE_SYSTEM_${util})

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

Summary of changes:
 CMakeLists.txt |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake