Add support for linking against system opus

This commit is contained in:
Andrew Udvare 2021-12-20 19:20:26 -05:00
parent e242f16986
commit 78759d98dc
No known key found for this signature in database
GPG key ID: 1AFD9AFC120C26DD
2 changed files with 5 additions and 3 deletions

View file

@ -33,6 +33,8 @@ option(ENABLE_CUBEB "Enables the cubeb audio backend" ON)
option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF) option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF)
option(YUZU_USE_BUNDLED_OPUS "Compile bundled opus" ON)
# Default to a Release build # Default to a Release build
get_property(IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) get_property(IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
if (NOT IS_MULTI_CONFIG AND NOT CMAKE_BUILD_TYPE) if (NOT IS_MULTI_CONFIG AND NOT CMAKE_BUILD_TYPE)

View file

@ -116,8 +116,8 @@ if (ENABLE_WEB_SERVICE)
endif() endif()
# Opus # Opus
find_package(opus 1.3) if (YUZU_USE_BUNDLED_OPUS)
if (NOT opus_FOUND)
message(STATUS "opus 1.3 or newer not found, falling back to externals")
add_subdirectory(opus EXCLUDE_FROM_ALL) add_subdirectory(opus EXCLUDE_FROM_ALL)
else()
find_package(opus 1.3 REQUIRED)
endif() endif()