diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2009-11-09 19:42:23 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2009-11-09 19:42:23 (GMT) |
| commit | 0106b490dea8c5df7ea529da8851e0059aef6c92 (patch) | |
| tree | 589e77b805cd2d225d2a64859ccc327ff1454095 /CMakeLists.txt | |
| parent | b4ed21c305525a2d06a7a338cd84ac13d6145986 (diff) | |
| download | CMake-0106b490dea8c5df7ea529da8851e0059aef6c92.zip CMake-0106b490dea8c5df7ea529da8851e0059aef6c92.tar.gz CMake-0106b490dea8c5df7ea529da8851e0059aef6c92.tar.bz2 | |
keep libarchive from using a system zlib unless cmake uses one
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3306011..34fdf1e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -253,6 +253,8 @@ MACRO (CMAKE_BUILD_UTILITIES) ELSE(CMAKE_USE_SYSTEM_LIBARCHIVE) SET(HAVE_LIBZ 1) SET(HAVE_ZLIB_H 1) + SET(ZLIB_INCLUDE_DIR ${CMAKE_ZLIB_INCLUDES}) + SET(ZLIB_LIBRARIES ${CMAKE_ZLIB_LIBRARIES}) SET(BUILD_ARCHIVE_WITHIN_CMAKE TRUE) ADD_DEFINITIONS(-DLIBARCHIVE_STATIC) SUBDIRS(Utilities/cmlibarchive) |