Make sure libarchive uses cmzlib and not the system libz if found.
This commit is contained in:
parent
b9e3c243d4
commit
c74556bdfc
|
@ -271,6 +271,7 @@ MACRO (CMAKE_BUILD_UTILITIES)
|
||||||
SET(HAVE_ZLIB_H 1)
|
SET(HAVE_ZLIB_H 1)
|
||||||
SET(ZLIB_INCLUDE_DIR ${CMAKE_ZLIB_INCLUDES})
|
SET(ZLIB_INCLUDE_DIR ${CMAKE_ZLIB_INCLUDES})
|
||||||
SET(ZLIB_LIBRARIES ${CMAKE_ZLIB_LIBRARIES})
|
SET(ZLIB_LIBRARIES ${CMAKE_ZLIB_LIBRARIES})
|
||||||
|
SET(ZLIB_LIBRARY ${CMAKE_ZLIB_LIBRARIES})
|
||||||
SET(BUILD_ARCHIVE_WITHIN_CMAKE TRUE)
|
SET(BUILD_ARCHIVE_WITHIN_CMAKE TRUE)
|
||||||
ADD_DEFINITIONS(-DLIBARCHIVE_STATIC)
|
ADD_DEFINITIONS(-DLIBARCHIVE_STATIC)
|
||||||
ADD_SUBDIRECTORY(Utilities/cmlibarchive)
|
ADD_SUBDIRECTORY(Utilities/cmlibarchive)
|
||||||
|
|
Loading…
Reference in New Issue