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

[cmake] options for system Opus and httplib
All checks were successful
eden-license / license-header (pull_request) Successful in 21s
Details

Browse source 
Signed-off-by: crueter <crueter@eden-emu.dev>
This commit is contained in:
crueter 2025-08-03 11:32:28 -04:00
parent 3a8d01ac9d
commit 73b5a0a6f2
Signed by: crueter
GPG key ID: 425ACD2D4830EBC6
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -78,6 +78,10 @@ else()
option(YUZU_USE_EXTERNAL_VULKAN_SPIRV_TOOLS "Use SPIRV-Tools from externals" ON) option(YUZU_USE_EXTERNAL_VULKAN_SPIRV_TOOLS "Use SPIRV-Tools from externals" ON)
endif() 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_MULTIMEDIA "Use QtMultimedia for Camera" OFF)
option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF) option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF)

6
externals/CMakeLists.txt vendored
View file

@ -240,7 +240,7 @@ CPMAddPackage(
# httplib # httplib
if ((ENABLE_WEB_SERVICE OR ENABLE_QT_UPDATE_CHECKER)) 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?) # TODO(crueter): fix local package (gentoo?)
CPMAddPackage( CPMAddPackage(
@ -274,7 +274,8 @@ if (ENABLE_WEB_SERVICE)
endif() endif()
# Opus # Opus
set(CPM_USE_LOCAL_PACKAGES ON) set(CPM_USE_LOCAL_PACKAGES ${YUZU_USE_SYSTEM_OPUS})
CPMAddPackage( CPMAddPackage(
NAME Opus NAME Opus
VERSION 1.3 VERSION 1.3
@ -287,7 +288,6 @@ CPMAddPackage(
"OPUS_INSTALL_PKG_CONFIG_MODULE OFF" "OPUS_INSTALL_PKG_CONFIG_MODULE OFF"
"OPUS_INSTALL_CMAKE_CONFIG_MODULE OFF" "OPUS_INSTALL_CMAKE_CONFIG_MODULE OFF"
CUSTOM_CACHE_KEY "5ded" CUSTOM_CACHE_KEY "5ded"
) )
# FFMpeg # FFMpeg