CMake fixes

Thanks to @RipleyTom Co-Authored-By: RipleyTom <RipleyTom@users.noreply.github.com>
kd-11 · May 14, 2024 · 6bceebb · 6bceebb
1 parent 6d8575d
commit 6bceebb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/3rdparty/zstd/CMakeLists.txt b/3rdparty/zstd/CMakeLists.txt
@@ -1,9 +1,7 @@
-
-project(3rdparty_zstd)
-
-add_library(3rdparty_zstd INTERFACE)
+option(ZSTD_BUILD_PROGRAMS "BUILD PROGRAMS" OFF)
+option(ZSTD_BUILD_SHARED "BUILD SHARED LIBRARIES" OFF)
+option(ZSTD_BUILD_STATIC "BUILD STATIC LIBRARIES" ON)
 
 add_subdirectory(zstd/build/cmake EXLUDE_FROM_ALL)
-
-target_include_directories(3rdparty_zstd INTERFACE zstd zstd/lib)
-
+add_library(3rdparty_zstd INTERFACE)
+target_link_libraries(3rdparty_zstd INTERFACE libzstd_static)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -114,8 +114,6 @@ if(MSVC)
     add_compile_options(/wd4530 /utf-8) # C++ exception handler used, but unwind semantics are not enabled
 endif()
 
-set(ALLOW_DUPLICATE_CUSTOM_TARGETS TRUE)
-
 add_subdirectory(3rdparty)
 
 if (DISABLE_LTO)

diff --git a/rpcs3/Emu/CMakeLists.txt b/rpcs3/Emu/CMakeLists.txt
@@ -25,7 +25,7 @@ endif()
 
 target_link_libraries(rpcs3_emu
     PRIVATE
-        3rdparty::zlib 3rdparty::yaml-cpp
+        3rdparty::zlib 3rdparty::yaml-cpp 3rdparty::zstd
     PUBLIC
         3rdparty::libevdev 3rdparty::flatbuffers)
 

diff --git a/rpcs3/util/serialization_ext.cpp b/rpcs3/util/serialization_ext.cpp
@@ -10,7 +10,7 @@
 #include "serialization_ext.hpp"
 
 #include <zlib.h>
-#include <3rdparty/zstd/zstd/lib/zstd.h>
+#include <zstd.h>
 
 LOG_CHANNEL(sys_log, "SYS");