summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Andrea Pappacoda2022-08-01 12:31:31 +0200
committerGravatar Andrea Pappacoda2022-08-01 12:31:31 +0200
commitadc8c03fe463c9c0aaa2cfcbc502bc65dc7b99b6 (patch)
treefcfa229ec1ace9288611d04c84508594becb763c
parentbuild: simplify find modules (diff)
downloadyuzu-adc8c03fe463c9c0aaa2cfcbc502bc65dc7b99b6.tar.gz
yuzu-adc8c03fe463c9c0aaa2cfcbc502bc65dc7b99b6.tar.xz
yuzu-adc8c03fe463c9c0aaa2cfcbc502bc65dc7b99b6.zip
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.
Diffstat (limited to '')
-rw-r--r--externals/CMakeLists.txt2
-rw-r--r--externals/find-modules/FindOpus.cmake (renamed from externals/find-modules/Findopus.cmake)4
-rw-r--r--externals/opus/CMakeLists.txt2
-rw-r--r--src/core/CMakeLists.txt2
4 files changed, 5 insertions, 5 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 6d04ace1d..eea70fc27 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -128,7 +128,7 @@ endif()
128if (YUZU_USE_BUNDLED_OPUS) 128if (YUZU_USE_BUNDLED_OPUS)
129 add_subdirectory(opus EXCLUDE_FROM_ALL) 129 add_subdirectory(opus EXCLUDE_FROM_ALL)
130else() 130else()
131 find_package(opus 1.3 REQUIRED) 131 find_package(Opus 1.3 REQUIRED)
132endif() 132endif()
133 133
134# FFMpeg 134# FFMpeg
diff --git a/externals/find-modules/Findopus.cmake b/externals/find-modules/FindOpus.cmake
index 4ebf9ef7b..b68a6046b 100644
--- a/externals/find-modules/Findopus.cmake
+++ b/externals/find-modules/FindOpus.cmake
@@ -6,12 +6,12 @@ find_package(PkgConfig)
6if (PKG_CONFIG_FOUND) 6if (PKG_CONFIG_FOUND)
7 pkg_search_module(opus IMPORTED_TARGET GLOBAL opus) 7 pkg_search_module(opus IMPORTED_TARGET GLOBAL opus)
8 if (opus_FOUND) 8 if (opus_FOUND)
9 add_library(Opus::Opus ALIAS PkgConfig::opus) 9 add_library(Opus::opus ALIAS PkgConfig::opus)
10 endif() 10 endif()
11endif() 11endif()
12 12
13include(FindPackageHandleStandardArgs) 13include(FindPackageHandleStandardArgs)
14find_package_handle_standard_args(opus 14find_package_handle_standard_args(Opus
15 REQUIRED_VARS 15 REQUIRED_VARS
16 opus_LINK_LIBRARIES 16 opus_LINK_LIBRARIES
17 opus_FOUND 17 opus_FOUND
diff --git a/externals/opus/CMakeLists.txt b/externals/opus/CMakeLists.txt
index a92ffbd69..410ff7c08 100644
--- a/externals/opus/CMakeLists.txt
+++ b/externals/opus/CMakeLists.txt
@@ -256,4 +256,4 @@ PRIVATE
256 opus/src 256 opus/src
257) 257)
258 258
259add_library(Opus::Opus ALIAS opus) 259add_library(Opus::opus ALIAS opus)
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 40b1ea4a2..0d3286d58 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -787,7 +787,7 @@ endif()
787create_target_directory_groups(core) 787create_target_directory_groups(core)
788 788
789target_link_libraries(core PUBLIC common PRIVATE audio_core network video_core) 789target_link_libraries(core PUBLIC common PRIVATE audio_core network video_core)
790target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls Opus::Opus) 790target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls Opus::opus)
791if (MINGW) 791if (MINGW)
792 target_link_libraries(core PRIVATE ${MSWSOCK_LIBRARY}) 792 target_link_libraries(core PRIVATE ${MSWSOCK_LIBRARY})
793endif() 793endif()