franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Andrea Pappacoda 2022-08-01 12:31:31 +02:00
parent 064625ef58
commit adc8c03fe4
No known key found for this signature in database
GPG Key ID: 4A9208A2455077A7
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
externals/CMakeLists.txt vendored
View File

@ -128,7 +128,7 @@ endif()
if (YUZU_USE_BUNDLED_OPUS) if (YUZU_USE_BUNDLED_OPUS)
add_subdirectory(opus EXCLUDE_FROM_ALL) add_subdirectory(opus EXCLUDE_FROM_ALL)
else() else()
find_package(opus 1.3 REQUIRED) find_package(Opus 1.3 REQUIRED)
endif() endif()
# FFMpeg # FFMpeg

4
externals/find-modules/Findopus.cmake → externals/find-modules/FindOpus.cmake vendored
View File

@ -6,12 +6,12 @@ find_package(PkgConfig)
if (PKG_CONFIG_FOUND) if (PKG_CONFIG_FOUND)
pkg_search_module(opus IMPORTED_TARGET GLOBAL opus) pkg_search_module(opus IMPORTED_TARGET GLOBAL opus)
if (opus_FOUND) if (opus_FOUND)
add_library(Opus::Opus ALIAS PkgConfig::opus) add_library(Opus::opus ALIAS PkgConfig::opus)
endif() endif()
endif() endif()
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(opus find_package_handle_standard_args(Opus
REQUIRED_VARS REQUIRED_VARS
opus_LINK_LIBRARIES opus_LINK_LIBRARIES
opus_FOUND opus_FOUND

2
externals/opus/CMakeLists.txt vendored
View File

@ -256,4 +256,4 @@ PRIVATE
opus/src opus/src
) )
add_library(Opus::Opus ALIAS opus) add_library(Opus::opus ALIAS opus)

2
src/core/CMakeLists.txt
View File

@ -787,7 +787,7 @@ endif()
create_target_directory_groups(core) create_target_directory_groups(core)
target_link_libraries(core PUBLIC common PRIVATE audio_core network video_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) if (MINGW)
target_link_libraries(core PRIVATE ${MSWSOCK_LIBRARY}) target_link_libraries(core PRIVATE ${MSWSOCK_LIBRARY})
endif() endif()