RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 02:32:36 +01:00
Code Issues Releases Wiki Activity

CMake fixes

Browse Source 
Thanks to @RipleyTom

Co-Authored-By: RipleyTom <RipleyTom@users.noreply.github.com>
This commit is contained in:
Elad Ashkenazi 2024-05-14 18:52:33 +03:00
parent 6d8575d0d0
commit 6bceebbb1a
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
3rdparty/zstd/CMakeLists.txt vendored
View File

@ -1,9 +1,7 @@
option(ZSTD_BUILD_PROGRAMS "BUILD PROGRAMS" OFF)
project(3rdparty_zstd) option(ZSTD_BUILD_SHARED "BUILD SHARED LIBRARIES" OFF)
option(ZSTD_BUILD_STATIC "BUILD STATIC LIBRARIES" ON)
add_library(3rdparty_zstd INTERFACE)
add_subdirectory(zstd/build/cmake EXLUDE_FROM_ALL) add_subdirectory(zstd/build/cmake EXLUDE_FROM_ALL)
add_library(3rdparty_zstd INTERFACE)
target_include_directories(3rdparty_zstd INTERFACE zstd zstd/lib) target_link_libraries(3rdparty_zstd INTERFACE libzstd_static)

2
CMakeLists.txt
View File

@ -114,8 +114,6 @@ if(MSVC)
add_compile_options(/wd4530 /utf-8) # C++ exception handler used, but unwind semantics are not enabled add_compile_options(/wd4530 /utf-8) # C++ exception handler used, but unwind semantics are not enabled
endif() endif()
set(ALLOW_DUPLICATE_CUSTOM_TARGETS TRUE)
add_subdirectory(3rdparty) add_subdirectory(3rdparty)
if (DISABLE_LTO) if (DISABLE_LTO)

2
rpcs3/Emu/CMakeLists.txt
View File

@ -25,7 +25,7 @@ endif()
target_link_libraries(rpcs3_emu target_link_libraries(rpcs3_emu
PRIVATE PRIVATE
3rdparty::zlib 3rdparty::yaml-cpp 3rdparty::zlib 3rdparty::yaml-cpp 3rdparty::zstd
PUBLIC PUBLIC
3rdparty::libevdev 3rdparty::flatbuffers) 3rdparty::libevdev 3rdparty::flatbuffers)

2
rpcs3/util/serialization_ext.cpp
View File

@ -10,7 +10,7 @@
#include "serialization_ext.hpp" #include "serialization_ext.hpp"
#include <zlib.h> #include <zlib.h>
#include <3rdparty/zstd/zstd/lib/zstd.h> #include <zstd.h>
LOG_CHANNEL(sys_log, "SYS"); LOG_CHANNEL(sys_log, "SYS");