Update xxhash to v0.8.2

Switches to using upstream cmake files.
FEX-Emu · Feb 27, 2024 · 78a3625 · 78a3625
1 parent 8c0d5c6
commit 78a3625
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -41,7 +41,7 @@
 	url = https://github.com/FEX-Emu/drm-headers.git
 [submodule "External/xxhash"]
 	path = External/xxhash
-	url = https://github.com/FEX-Emu/xxHash.git
+	url = https://github.com/Cyan4973/xxHash.git
 [submodule "External/Catch2"]
 	path = External/Catch2
 	url = https://github.com/catchorg/Catch2.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -237,8 +237,10 @@ endif()
 find_package(PkgConfig REQUIRED)
 find_package(Python 3.0 REQUIRED COMPONENTS Interpreter)
 
-add_subdirectory(External/xxhash/)
-include_directories(External/xxhash/)
+set(XXHASH_BUNDLED_MODE TRUE)
+set(XXHASH_BUILD_XXHSUM FALSE)
+set(BUILD_SHARED_LIBS OFF)
+add_subdirectory(External/xxhash/cmake_unofficial/)
 
 add_definitions(-Wno-trigraphs)
 add_definitions(-DGLOBAL_DATA_DIRECTORY="${DATA_DIRECTORY}/")

diff --git a/External/xxhash b/External/xxhash
diff --git a/FEXCore/Source/CMakeLists.txt b/FEXCore/Source/CMakeLists.txt
@@ -194,7 +194,7 @@ endif()
 # Some defines for the softfloat library
 list(APPEND DEFINES "-DSOFTFLOAT_BUILTIN_CLZ")
 
-set (LIBS fmt::fmt vixl xxhash FEXHeaderUtils)
+set (LIBS fmt::fmt vixl xxHash::xxhash FEXHeaderUtils)
 
 if (NOT MINGW_BUILD)
   list (APPEND LIBS dl)

diff --git a/Source/Tools/FEXRootFSFetcher/CMakeLists.txt b/Source/Tools/FEXRootFSFetcher/CMakeLists.txt
@@ -3,7 +3,7 @@ set(SRCS Main.cpp
   XXFileHash.cpp)
 
 add_executable(${NAME} ${SRCS})
-list(APPEND LIBS FEXCore Common)
+list(APPEND LIBS FEXCore Common xxHash::xxhash)
 
 target_include_directories(${NAME} PRIVATE ${CMAKE_SOURCE_DIR}/Source/)
+7 −0		.github/dependabot.yml
+243 −52		.github/workflows/ci.yml
+5 −0		.gitignore
+24 −0		CHANGELOG
+0 −4		CMakeLists.txt
+9 −4		Doxyfile
+63 −0		Doxyfile-internal
+1 −1		LICENSE
+114 −20		Makefile
+35 −18		README.md
+13 −0		SECURITY.md
+3 −0		cli/.tipi/deps
+0 −0		cli/.tipi/opts
+24 −8		cli/xsum_arch.h
+13 −1		cli/xsum_bench.c
+30 −4		cli/xsum_os_specific.c
+1 −1		cli/xsum_os_specific.h
+2 −1		cli/xsum_output.c
+1 −1		cli/xsum_output.h
+30 −28		cli/xsum_sanity_check.c
+1 −1		cli/xsum_sanity_check.h
+31 −17		cli/xxhsum.1
+33 −27		cli/xxhsum.1.md
+229 −22		cli/xxhsum.c
+49 −11		cmake_unofficial/CMakeLists.txt
+23 −0		cmake_unofficial/JoinPaths.cmake
+1 −0		cmake_unofficial/README.md
+474 −5		doc/xxhash_spec.md
+3 −3		libxxhash.pc.in
+25 −2		tests/Makefile
+1 −1		tests/bench/Makefile
+3 −1		tests/bench/benchHash.c
+1 −1		tests/bench/benchHash.h
+2 −1		tests/bench/benchfn.c
+1 −1		tests/bench/benchfn.h
+1 −1		tests/bench/bhDisplay.c
+1 −1		tests/bench/bhDisplay.h
+1 −1		tests/bench/hashes.h
+1 −1		tests/bench/main.c
+1 −1		tests/bench/timefn.c
+1 −1		tests/bench/timefn.h
+32 −0		tests/cli-comment-line.sh
+51 −0		tests/cli-ignore-missing.sh
+1 −1		tests/collisions/Makefile
+1 −1		tests/collisions/hashes.h
+2 −2		tests/collisions/main.c
+1 −1		tests/collisions/pool.c
+1 −1		tests/collisions/pool.h
+1 −1		tests/collisions/sort.cc
+1 −1		tests/collisions/sort.hh
+21 −0		tests/filename-escape.sh
+763 −0		tests/sanity_test.c
+45,832 −0		tests/sanity_test_vectors.h
+464 −0		tests/sanity_test_vectors_generator.c
+1 −1		xxh3.h
+145 −70		xxh_x86dispatch.c
+9 −10		xxh_x86dispatch.h
+1 −1		xxhash.c
+2,108 −915		xxhash.h