From 98a478f0f1e65a23f933541565b50dcfbac2e91f Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Tue, 18 Oct 2022 01:36:36 -0400 Subject: [PATCH] vendor mfu-ified xxhash fixed cmake for vendored xxhash Signed-off-by: Andrew Robbins andrew@robbinsa.me --- .gitmodules | 4 ++++ CMakeLists.txt | 4 ++-- xxhash | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .gitmodules create mode 160000 xxhash diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..d4493f8b --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "xxhash"] + path = xxhash + url = https://github.com/theAeon/xxhash + branch = xxhash-mfu diff --git a/CMakeLists.txt b/CMakeLists.txt index f7ca3f20..6d6643d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -148,8 +148,7 @@ IF(LibCap_FOUND) ENDIF(LibCap_FOUND) ## XXHASH for ddup -find_package(xxHash REQUIRED) -INCLUDE_DIRECTORIES(${xxHash_INCLUDE_DIRS}) +INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/xxhash/cmake_unofficial) # Setup Installation @@ -199,3 +198,4 @@ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/src/common) ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(test) ADD_SUBDIRECTORY(man) + diff --git a/xxhash b/xxhash new file mode 160000 index 00000000..a0a74511 --- /dev/null +++ b/xxhash @@ -0,0 +1 @@ +Subproject commit a0a74511bab50b8c0b644d1f263dbb8e43df05d7