From e633c4c45e83b2febd1ddb115d5b64e59c1c99b5 Mon Sep 17 00:00:00 2001 From: JackBoosY <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 6 Jun 2019 02:15:11 +0800 Subject: [PATCH] [lz4]Fix conflict file xxhash.h (#6735) * [lz4]Fix conflict file xxhash.h * [lz4]Use xxhash dependency to install xxhash.h --- ports/lz4/CMakeLists.txt | 1 + ports/lz4/CONTROL | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/lz4/CMakeLists.txt b/ports/lz4/CMakeLists.txt index 8f94cbeb6..b36a3574e 100644 --- a/ports/lz4/CMakeLists.txt +++ b/ports/lz4/CMakeLists.txt @@ -36,6 +36,7 @@ install(TARGETS lz4 ) FILE(GLOB lz4h "${CMAKE_CURRENT_LIST_DIR}/lib/*.h") +list(REMOVE_ITEM lz4h "${CMAKE_CURRENT_LIST_DIR}/lib/xxhash.h") INSTALL(FILES ${lz4h} DESTINATION "${INSTALL_INCLUDE_DIR}") install(EXPORT lz4Config diff --git a/ports/lz4/CONTROL b/ports/lz4/CONTROL index cdfb882ae..2e69cbd25 100644 --- a/ports/lz4/CONTROL +++ b/ports/lz4/CONTROL @@ -1,3 +1,4 @@ Source: lz4 -Version: 1.9.1-1 +Version: 1.9.1-2 Description: Lossless compression algorithm, providing compression speed at 400 MB/s per core. +Build-Depends: xxhash \ No newline at end of file