[cmake] refactor: Use CPM over submodules #143
2 changed files with 7 additions and 3 deletions
|
@ -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
6
externals/CMakeLists.txt
vendored
|
@ -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
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue