[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.165 1.166

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake
In directory public:/mounts/ram/cvs-serv6031

Modified Files:
	CMakeLists.txt 
Log Message:
keep libarchive from using a system zlib unless cmake uses one


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.165
retrieving revision 1.166
diff -C 2 -d -r1.165 -r1.166
*** CMakeLists.txt	30 Oct 2009 17:08:20 -0000	1.165
--- CMakeLists.txt	9 Nov 2009 19:42:23 -0000	1.166
***************
*** 254,257 ****
--- 254,259 ----
      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)