Browse Source
build(externals): rename Findopus to FindOpus
This better matches upstream's FindOpus.cmake file, and it will make
using upstream's FindOpus.cmake file easier.
pull/15/merge
Andrea Pappacoda
3 years ago
No known key found for this signature in database
GPG Key ID: 4A9208A2455077A7
4 changed files with
5 additions and
5 deletions
-
externals/CMakeLists.txt
-
externals/find-modules/FindOpus.cmake
-
externals/opus/CMakeLists.txt
-
src/core/CMakeLists.txt
|
|
|
@ -128,7 +128,7 @@ endif() |
|
|
|
if (YUZU_USE_BUNDLED_OPUS) |
|
|
|
add_subdirectory(opus EXCLUDE_FROM_ALL) |
|
|
|
else() |
|
|
|
find_package(opus 1.3 REQUIRED) |
|
|
|
find_package(Opus 1.3 REQUIRED) |
|
|
|
endif() |
|
|
|
|
|
|
|
# FFMpeg |
|
|
|
|
|
|
|
@ -6,12 +6,12 @@ find_package(PkgConfig) |
|
|
|
if (PKG_CONFIG_FOUND) |
|
|
|
pkg_search_module(opus IMPORTED_TARGET GLOBAL opus) |
|
|
|
if (opus_FOUND) |
|
|
|
add_library(Opus::Opus ALIAS PkgConfig::opus) |
|
|
|
add_library(Opus::opus ALIAS PkgConfig::opus) |
|
|
|
endif() |
|
|
|
endif() |
|
|
|
|
|
|
|
include(FindPackageHandleStandardArgs) |
|
|
|
find_package_handle_standard_args(opus |
|
|
|
find_package_handle_standard_args(Opus |
|
|
|
REQUIRED_VARS |
|
|
|
opus_LINK_LIBRARIES |
|
|
|
opus_FOUND |
|
|
|
@ -256,4 +256,4 @@ PRIVATE |
|
|
|
opus/src |
|
|
|
) |
|
|
|
|
|
|
|
add_library(Opus::Opus ALIAS opus) |
|
|
|
add_library(Opus::opus ALIAS opus) |
|
|
|
@ -787,7 +787,7 @@ endif() |
|
|
|
create_target_directory_groups(core) |
|
|
|
|
|
|
|
target_link_libraries(core PUBLIC common PRIVATE audio_core network video_core) |
|
|
|
target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls Opus::Opus) |
|
|
|
target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls Opus::opus) |
|
|
|
if (MINGW) |
|
|
|
target_link_libraries(core PRIVATE ${MSWSOCK_LIBRARY}) |
|
|
|
endif() |
|
|
|
|
