From 73b5a0a6f2adbb6f3afc75d02618a7f193e077eb Mon Sep 17 00:00:00 2001 From: crueter Date: Sun, 3 Aug 2025 11:32:28 -0400 Subject: [PATCH] [cmake] options for system Opus and httplib Signed-off-by: crueter --- CMakeLists.txt | 4 ++++ externals/CMakeLists.txt | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 112341ad09..029ead92d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,6 +78,10 @@ else() option(YUZU_USE_EXTERNAL_VULKAN_SPIRV_TOOLS "Use SPIRV-Tools from externals" ON) endif() +option(YUZU_USE_SYSTEM_OPUS "Use the system Opus library if available" ON) + +option(YUZU_USE_SYSTEM_HTTPLIB "Use the system cpp-httplib if available" ON) + option(YUZU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera" OFF) option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index b0bce136d3..dc69f19acd 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -240,7 +240,7 @@ CPMAddPackage( # httplib if ((ENABLE_WEB_SERVICE OR ENABLE_QT_UPDATE_CHECKER)) - set(CPM_USE_LOCAL_PACKAGES ON) + set(CPM_USE_LOCAL_PACKAGES ${YUZU_USE_SYSTEM_HTTPLIB}) # TODO(crueter): fix local package (gentoo?) CPMAddPackage( @@ -274,7 +274,8 @@ if (ENABLE_WEB_SERVICE) endif() # Opus -set(CPM_USE_LOCAL_PACKAGES ON) +set(CPM_USE_LOCAL_PACKAGES ${YUZU_USE_SYSTEM_OPUS}) + CPMAddPackage( NAME Opus VERSION 1.3 @@ -287,7 +288,6 @@ CPMAddPackage( "OPUS_INSTALL_PKG_CONFIG_MODULE OFF" "OPUS_INSTALL_CMAKE_CONFIG_MODULE OFF" CUSTOM_CACHE_KEY "5ded" - ) # FFMpeg