lz4 cmake fixes

AdmiralCurtiss · Oct 2, 2023 · 8f82639 · 8f82639
1 parent 02b4ca8
commit 8f82639
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 23 deletions.
diff --git a/CMake/FindLZ4.cmake b/CMake/FindLZ4.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -682,7 +682,7 @@ dolphin_find_optional_system_library_pkgconfig(MINIZIP minizip>=3.0.0 minizip::m
 
 dolphin_find_optional_system_library(LZO Externals/LZO)
 
-dolphin_find_optional_system_library(LZ4 Externals/lz4)
+dolphin_find_optional_system_library_pkgconfig(lz4 liblz4>=1.8 LZ4::LZ4 Externals/lz4)
 
 dolphin_find_optional_system_library_pkgconfig(SPNG spng spng::spng Externals/libspng)
 

diff --git a/Externals/lz4/CMakeLists.txt b/Externals/lz4/CMakeLists.txt
@@ -1,9 +1,10 @@
-# Disable CLI building, which breaks for Android due to lack of 64-bit support
-SET(LZ4_BUILD_CLI OFF CACHE BOOL "Build lz4 program")
-SET(LZ4_BUILD_LEGACY_LZ4C OFF CACHE BOOL "Build lz4c program with legacy argument support")
+# We only want the static library, nothing else.
+set(LZ4_BUILD_CLI OFF)
+set(LZ4_BUILD_LEGACY_LZ4C OFF)
+set(LZ4_BUNDLED_MODE ON)
 
 add_subdirectory(lz4/build/cmake)
 
-target_include_directories(lz4_static PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
+dolphin_disable_warnings_msvc(lz4_static)
+add_library(LZ4::LZ4 ALIAS lz4_static)
 
-add_library(LZ4::LZ4 ALIAS lz4_static)
diff --git a/Externals/lz4/exports.props b/Externals/lz4/exports.props
@@ -2,7 +2,7 @@
 <Project>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ExternalsDir)LZ4;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)lz4\lz4\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>

diff --git a/Source/Core/Core/State.cpp b/Source/Core/Core/State.cpp
@@ -16,7 +16,7 @@
 
 #include <fmt/format.h>
 
-#include <lz4/lib/lz4.h>
+#include <lz4.h>
 
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"