cmake: Add xxHash support

https://github.com/Cyan4973/xxHash Signed-off-by: sekaiacg <[email protected]>
sekaiacg · Jan 26, 2025 · 1ea9d92 · 1ea9d92
1 parent 18cfc34
commit 1ea9d92
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 1 deletion.
diff --git a/.gitmodules b/.gitmodules
@@ -43,3 +43,7 @@
 [submodule "src/winfsp"]
 	path = src/winfsp
 	url = https://github.com/winfsp/winfsp
+[submodule "src/xxHash"]
+	path = src/xxHash
+	url = https://github.com/Cyan4973/xxHash.git
+	branch = dev
diff --git a/build/cmake/erofs-tools/erofs_tools.cmake b/build/cmake/erofs-tools/erofs_tools.cmake
@@ -31,6 +31,7 @@ set(common_static_link_lib
 	z_static
 	libzstd_static
 	pcre2
+	xxhash
 	${ld_end_group}
 )
 

diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt
@@ -18,6 +18,12 @@ elseif (CMAKE_SYSTEM_NAME MATCHES "Darwin|CYGWIN")
 	include(libext2_uuid.cmake)
 endif ()
 
+#XXHASH
+set(BUILD_SHARED_LIBS OFF)
+set(XXHASH_BUILD_ENABLE_INLINE_API ON)
+set(XXHASH_BUILD_XXHSUM OFF)
+add_subdirectory("${LIB_DIR}/xxHash/cmake_unofficial" "xxHash")
+
 # LZ4
 set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 set(LZ4_BUILD_CLI OFF)

diff --git a/build/cmake/lib/liberofs.cmake b/build/cmake/lib/liberofs.cmake
@@ -73,6 +73,8 @@ set(LIBEROFS_STATIC_DEFAULTS_CFLAGS
 	"-DHAVE_LIBZSTD"
 	"-DWITH_ANDROID"
 	"-DEROFS_MT_ENABLED"
+	"-DHAVE_XXHASH_H"
+	"-DHAVE_XXHASH"
 	"${DARWIN_CFLAGS}"
 	CACHE INTERNAL "liberofs_static_defaults_cflags"
 )
@@ -101,7 +103,6 @@ set(liberofs_srcs
 	"${TARGET_SRC_DIR}/uuid.c"
 	"${TARGET_SRC_DIR}/tar.c"
 	"${TARGET_SRC_DIR}/block_list.c"
-	"${TARGET_SRC_DIR}/xxhash.c"
 	"${TARGET_SRC_DIR}/rebuild.c"
 	"${TARGET_SRC_DIR}/diskbuf.c"
 	"${TARGET_SRC_DIR}/uuid_unparse.c"

diff --git a/src/xxHash b/src/xxHash
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,6 +31,7 @@ set(common_static_link_lib @@
     	z_static
     	libzstd_static
     	pcre2
+    	xxhash
     	${ld_end_group}
     )
@@ Expand Down @@