From 4fac21536df85e4f6065dea3831c215c0f143289 Mon Sep 17 00:00:00 2001 From: lizzie Date: Wed, 23 Jul 2025 08:31:43 +0100 Subject: [PATCH] [cmake] patches from debian upstream --- CMakeLists.txt | 4 ++-- externals/CMakeLists.txt | 2 +- src/core/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 124a5ac80a..0489ead4cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -346,7 +346,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) # Enforce the search mode of non-required packages for better and shorter failure messages find_package(enet 1.3 MODULE) 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(nlohmann_json 3.8 REQUIRED) find_package(Opus 1.3 MODULE) @@ -414,7 +414,7 @@ if(ENABLE_OPENSSL) find_package(OpenSSL 1.1.1 REQUIRED) endif() -if (UNIX AND NOT APPLE) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux") find_package(gamemode 1.7 MODULE) endif() diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 7dacba23b6..3668193071 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -211,7 +211,7 @@ if (ANDROID) 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) target_include_directories(gamemode INTERFACE gamemode) add_library(gamemode::headers ALIAS gamemode) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index d830cc381d..86f17f1af0 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -1211,7 +1211,7 @@ if (HAS_NCE) arm/nce/patcher.h arm/nce/visitor_base.h ) - target_link_libraries(core PRIVATE merry::mcl merry::oaknut) + target_link_libraries(core PRIVATE merry::oaknut) endif() if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)