diff options
| author | Brad King <brad.king@kitware.com> | 2010-07-20 20:00:52 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-07-20 20:00:52 (GMT) |
| commit | c35bfaa0f7273db7ab7fed8e18e13d8fdb242511 (patch) | |
| tree | f07fb84571ad4fd2b8527c6617a836af2ec8cc2f /CMakeLists.txt | |
| parent | e1a4c02bac67f9420be0796712cc1da5985f7177 (diff) | |
| parent | 6a24bdfc4e040af52e4aef95d5c934ecc836a8b8 (diff) | |
| download | CMake-c35bfaa0f7273db7ab7fed8e18e13d8fdb242511.zip CMake-c35bfaa0f7273db7ab7fed8e18e13d8fdb242511.tar.gz CMake-c35bfaa0f7273db7ab7fed8e18e13d8fdb242511.tar.bz2 | |
Merge topic 'use-system-bzip2'
6a24bdf Optionally use system bzip2 library (#10932)
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fc1f4a9..b25f694 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}) |