eden-emu/eden
24
3
Fork 15
Code Issues 138 Pull requests 56 Projects 1 Releases Packages Wiki Activity Actions

[cmake] patches from debian upstream (#99)
Some checks are pending
eden-build / windows (msvc) (push) Waiting to run
Details
eden-build / linux (push) Waiting to run
Details
eden-build / android (push) Waiting to run
Details
eden-build / source (push) Successful in 4m12s
Details

Browse source 
Reviewed-on: #99
Co-authored-by: lizzie <lizzie@eden-emu.dev>
Co-committed-by: lizzie <lizzie@eden-emu.dev>
This commit is contained in:
lizzie 2025-07-23 09:54:26 +02:00 • committed by crueter
parent fb459c75d9
commit 23c77a0d4f
Signed by: crueter
GPG key ID: 425ACD2D4830EBC6
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -347,7 +347,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
# Enforce the search mode of non-required packages for better and shorter failure messages # Enforce the search mode of non-required packages for better and shorter failure messages
find_package(enet 1.3 MODULE) find_package(enet 1.3 MODULE)
find_package(fmt 8 REQUIRED) find_package(fmt 8 REQUIRED)
find_package(LLVM 17.0.2 MODULE COMPONENTS Demangle) find_package(LLVM MODULE COMPONENTS Demangle)
find_package(lz4 REQUIRED) find_package(lz4 REQUIRED)
find_package(nlohmann_json 3.8 REQUIRED) find_package(nlohmann_json 3.8 REQUIRED)
find_package(Opus 1.3 MODULE) find_package(Opus 1.3 MODULE)
@ -415,7 +415,7 @@ if(ENABLE_OPENSSL)
find_package(OpenSSL 1.1.1 REQUIRED) find_package(OpenSSL 1.1.1 REQUIRED)
endif() endif()
if (UNIX AND NOT APPLE) if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
find_package(gamemode 1.7 MODULE) find_package(gamemode 1.7 MODULE)
endif() endif()

2
externals/CMakeLists.txt vendored
View file

@ -211,7 +211,7 @@ if (ANDROID)
endif() endif()
endif() endif()
if (UNIX AND NOT APPLE AND NOT TARGET gamemode::headers) if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT TARGET gamemode::headers)
add_library(gamemode INTERFACE) add_library(gamemode INTERFACE)
target_include_directories(gamemode INTERFACE gamemode) target_include_directories(gamemode INTERFACE gamemode)
add_library(gamemode::headers ALIAS gamemode) add_library(gamemode::headers ALIAS gamemode)

2
src/core/CMakeLists.txt
View file

@ -1212,7 +1212,7 @@ if (HAS_NCE)
arm/nce/patcher.h arm/nce/patcher.h
arm/nce/visitor_base.h arm/nce/visitor_base.h
) )
target_link_libraries(core PRIVATE merry::mcl merry::oaknut) target_link_libraries(core PRIVATE merry::oaknut)
endif() endif()
if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)