From 518003131363ae40377110eb53c96b16807437d5 Mon Sep 17 00:00:00 2001 From: crueter Date: Tue, 19 Aug 2025 21:29:36 +0200 Subject: [ci, cmake] openssl updates, fix drpc and ci scripts (#283) - Add bundled OpenSSL libs for Solaris, FreeBSD, Linux - Fix CPMUtil default on msvc - Update CI scripts (thanks dravee) - PLATFORM_ helpers for non-ANDROID UNIX Co-authored-by: Caio Oliveira Signed-off-by: crueter Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/283 Reviewed-by: Lizzie Co-authored-by: crueter Co-committed-by: crueter --- CMakeModules/CPMUtil.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'CMakeModules') diff --git a/CMakeModules/CPMUtil.cmake b/CMakeModules/CPMUtil.cmake index bd0155f8fb..07393d6ccd 100644 --- a/CMakeModules/CPMUtil.cmake +++ b/CMakeModules/CPMUtil.cmake @@ -6,8 +6,14 @@ # and some cmake magic to allow for runtime viewing of dependency versions include(CMakeDependentOption) +if (MSVC OR ANDROID) + set(SYSTEM_DEFAULT OFF) +else() + set(SYSTEM_DEFAULT ON) +endif() + CMAKE_DEPENDENT_OPTION(CPMUTIL_DEFAULT_SYSTEM - "Allow usage of system packages for CPM dependencies" ON + "Allow usage of system packages for CPM dependencies" ${SYSTEM_DEFAULT} "NOT ANDROID" OFF) cmake_minimum_required(VERSION 3.22) -- cgit v1.2.3