Merge pull request #1149 from Sonicadvance1/enable_local_xxhash

Use externals xxhash if not found installed
FEX-Emu · Jul 6, 2021 · 0a8ee43 · 0a8ee43
2 parents 1a64c90 + 728e9fc
commit 0a8ee43
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -39,3 +39,6 @@
 [submodule "External/drm-headers"]
 	path = External/drm-headers
 	url = https://github.com/FEX-Emu/drm-headers.git
+[submodule "External/xxhash"]
+	path = External/xxhash
+	url = https://github.com/FEX-Emu/xxHash.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -105,7 +105,13 @@ endif()
 
 find_package(PkgConfig REQUIRED)
 find_package(Python 3.0 REQUIRED COMPONENTS Interpreter)
-pkg_check_modules(XXHASH libxxhash REQUIRED)
+pkg_check_modules(XXHASH libxxhash>=0.8.0 QUIET)
+
+if (NOT XXHASH_FOUND)
+  message(STATUS "xxHash not found. Using Externals")
+  add_subdirectory(External/xxhash/)
+  include_directories(External/xxhash/)
+endif()
 
 add_definitions(-Wno-trigraphs)
 add_definitions(-DGLOBAL_DATA_DIRECTORY="${DATA_DIRECTORY}/")

diff --git a/External/FEXCore/Source/Interface/Core/Core.cpp b/External/FEXCore/Source/Interface/Core/Core.cpp
@@ -33,7 +33,7 @@ desc: Glues Frontend, OpDispatcher and IR Opts & Compilation, LookupCache, Dispa
 #include "Interface/HLE/Thunks/Thunks.h"
 #include "FEXCore/Utils/Allocator.h"
 
-#include <xxh3.h>
+#include <xxhash.h>
 #include <fstream>
 #include <unistd.h>
 #include <filesystem>

diff --git a/External/xxhash b/External/xxhash