From 004d908c2baba3a1d546fb603fa14d61dbdc4fa8 Mon Sep 17 00:00:00 2001 From: crueter Date: Tue, 23 Jun 2026 22:55:40 -0400 Subject: [PATCH] huh Signed-off-by: crueter --- CMakeLists.txt | 1 + CMakeModules/CPMUtil.cmake | 2 +- cpmfile.json | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 87122e07b0..00a3b39281 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,6 +63,7 @@ if (YUZU_STATIC_ROOM) set(Boost_USE_STATIC_LIBS ON) set(CMAKE_FIND_LIBRARY_SUFFIXES ".a") set(OPENSSL_USE_STATIC_LIBS ON) + set(OpenSSL_FORCE_SYSTEM ON) set(zstd_FORCE_BUNDLED ON) set(fmt_FORCE_BUNDLED ON) diff --git a/CMakeModules/CPMUtil.cmake b/CMakeModules/CPMUtil.cmake index 0e8d4662be..0bd5078a10 100644 --- a/CMakeModules/CPMUtil.cmake +++ b/CMakeModules/CPMUtil.cmake @@ -667,7 +667,7 @@ function(AddCIPackage) set(archname universal) elseif((WIN32 OR LINUX) AND CPMUTIL_AMD64) set(archname amd64) - elseif(WIN32 and CPMUTIL_ARM64) + elseif(WIN32 AND CPMUTIL_ARM64) set(archname arm64) elseif((IOS OR LINUX OR ANDROID) AND CPMUTIL_ARM64) set(archname aarch64) diff --git a/cpmfile.json b/cpmfile.json index e6b51d35e9..5bfb7ebb63 100644 --- a/cpmfile.json +++ b/cpmfile.json @@ -204,7 +204,7 @@ }, "openssl": { "hash": "29002ce50cb95a4f4f1d0e9d3f684401fbd4eac34203dc2eef3b6334af5d44aa46bf788b63a6f5c139c383eafb7269ae87a58a9a3ad5912903b9773e545ccc0a", - "min_version": "3", + "min_version": "3.0.0", "package": "OpenSSL", "patches": [ "0001-add-bundled-cert.patch" @@ -215,7 +215,7 @@ }, "openssl-ci": { "ci": true, - "min_version": "3", + "min_version": "3.0.0", "name": "openssl", "package": "OpenSSL", "repo": "crueter-ci/OpenSSL",