Merge branch 'make_libarchive_use_cmzlib'
This commit is contained in:
commit
ba95a1f0bd
|
@ -271,6 +271,7 @@ MACRO (CMAKE_BUILD_UTILITIES)
|
|||
SET(HAVE_ZLIB_H 1)
|
||||
SET(ZLIB_INCLUDE_DIR ${CMAKE_ZLIB_INCLUDES})
|
||||
SET(ZLIB_LIBRARIES ${CMAKE_ZLIB_LIBRARIES})
|
||||
SET(ZLIB_LIBRARY ${CMAKE_ZLIB_LIBRARIES})
|
||||
SET(BUILD_ARCHIVE_WITHIN_CMAKE TRUE)
|
||||
ADD_DEFINITIONS(-DLIBARCHIVE_STATIC)
|
||||
ADD_SUBDIRECTORY(Utilities/cmlibarchive)
|
||||
|
|
Loading…
Reference in New Issue